From b94b91c14b0cf5365b2c20d149a5cc1a9d546dbe Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 May 2011 09:25:18 +0200
Subject: [PATCH 01/15] Update gfx

---
 .../src/main/scala/akka/util/AkkaLoader.scala | 68 ++++++++++++-------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
index 164f2da095..e6ebc28c3d 100644
--- a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
+++ b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
@@ -43,30 +43,50 @@ class AkkaLoader {
   }
 
   private def printBanner() {
-    println("==================================================")
-    println("                       t")
-    println("             t       t t")
-    println("            t       t tt   t")
-    println("        tt  t   t  tt       t")
-    println("       t ttttttt  t      ttt t")
-    println("      t   tt ttt t       ttt  t")
-    println("     t     t ttt    t    ttt   t      t")
-    println("    tt    t  ttt         ttt    ttt    t")
-    println("   t     t   ttt         ttt     t tt  t")
-    println("   t         ttt         ttt      t     t")
-    println(" tt          ttt         ttt              t")
-    println("             ttt         ttt")
-    println("   tttttttt  ttt    ttt  ttt    ttt  tttttttt")
-    println("  ttt    tt  ttt    ttt  ttt    ttt ttt    ttt")
-    println("  ttt    ttt ttt    ttt  ttt    ttt ttt    ttt")
-    println("  ttt    ttt ttt    ttt  ttt    tt  ttt    ttt")
-    println("        tttt ttttttttt   tttttttt         tttt")
-    println("   ttttttttt ttt    ttt  ttt   ttt   ttttttttt")
-    println("  ttt    ttt ttt    ttt  ttt    ttt ttt    ttt")
-    println("  ttt    ttt ttt    ttt  ttt    ttt ttt    ttt")
-    println("  ttt    tt  ttt    ttt  ttt    ttt ttt    ttt")
-    println("   tttttttt  ttt    ttt  ttt    ttt  tttttttt")
-    println("==================================================")
+    println("""
+==============================================================================
+
+                                                   ZZ:
+                                                  ZZZZ
+                                                 ZZZZZZ
+                                                ZZZ' ZZZ
+                                       ~7      7ZZ'   ZZZ
+                                      :ZZZ:   IZZ'     ZZZ
+                                     ,OZZZZ.~ZZ?        ZZZ
+                                    ZZZZ' 'ZZZ$          ZZZ
+                           .       $ZZZ   ~ZZ$            ZZZ
+                         .=Z?.   .ZZZO   ~ZZ7              OZZ
+                        .ZZZZ7..:ZZZ~   7ZZZ                ZZZ~
+                      .$ZZZ$Z+.ZZZZ    ZZZ:                  ZZZ$
+                   .,ZZZZ?'  =ZZO=   .OZZ                     'ZZZ
+                 .$ZZZZ+   .ZZZZ    IZZZ                        ZZZ$
+               .ZZZZZ'   .ZZZZ'   .ZZZ$                          ?ZZZ
+            .ZZZZZZ'   .OZZZ?    ?ZZZ                             'ZZZ$
+        .?ZZZZZZ'    .ZZZZ?    .ZZZ?                                'ZZZO
+    .+ZZZZZZ?'    .7ZZZZ'    .ZZZZ                                    :ZZZZ
+ .ZZZZZZ$'     .?ZZZZZ'   .~ZZZZ                                        'ZZZZ.
+                                                                                
+                                                                                
+                      NNNNN              $NNNN+                                 
+                      NNNNN              $NNNN+                                 
+                      NNNNN              $NNNN+                                 
+                      NNNNN              $NNNN+                                 
+                      NNNNN              $NNNN+                                 
+    =NNNNNNNNND$      NNNNN     DDDDDD:  $NNNN+     DDDDDN     NDDNNNNNNNN,     
+   NNNNNNNNNNNNND     NNNNN    DNNNNN    $NNNN+   8NNNNN=    :NNNNNNNNNNNNNN    
+  NNNNN$    DNNNNN    NNNNN  $NNNNN~     $NNNN+  NNNNNN      NNNNN,   :NNNNN+   
+   ?DN~      NNNNN    NNNNN MNNNNN       $NNNN+:NNNNN7        $ND      =NNNNN   
+            DNNNNN    NNNNNDNNNN$        $NNNNDNNNNN                  :DNNNNN   
+     ZNDNNNNNNNNND    NNNNNNNNNND,       $NNNNNNNNNNN           DNDNNNNNNNNNN   
+   NNNNNNNDDINNNNN    NNNNNNNNNNND       $NNNNNNNNNNND       ONNNNNNND8+NNNNN   
+ :NNNND      NNNNN    NNNNNN  DNNNN,     $NNNNNO 7NNNND     NNNNNO     :NNNNN   
+ DNNNN       NNNNN    NNNNN    DNNNN     $NNNN+   8NNNNN    NNNNN      $NNNNN   
+ DNNNNO     NNNNNN    NNNNN     NNNNN    $NNNN+    NNNNN$   NNNND,    ,NNNNND   
+  NNNNNNDDNNNNNNNN    NNNNN     =NNNNN   $NNNN+     DNNNN?  DNNNNNNDNNNNNNNND   
+   NNNNNNNNN  NNNN$   NNNNN      8NNNND  $NNNN+      NNNNN=  ,DNNNNNNND NNNNN$
+
+==============================================================================
+""")
     println("            Running version " + Config.VERSION)
     println("==================================================")
   }

From 44fb8bff7d91e9b15c4daa68f83624ede0655b35 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Mon, 9 May 2011 21:26:17 +1200
Subject: [PATCH 02/15] Rework dist yet again

---
 project/build/AkkaDistProject.scala  | 227 +++++++++++++++++++++++++++
 project/build/AkkaProject.scala      |  30 +++-
 project/build/DocParentProject.scala |   4 +
 3 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 project/build/AkkaDistProject.scala

diff --git a/project/build/AkkaDistProject.scala b/project/build/AkkaDistProject.scala
new file mode 100644
index 0000000000..440d337f86
--- /dev/null
+++ b/project/build/AkkaDistProject.scala
@@ -0,0 +1,227 @@
+/**
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
+import sbt._
+
+trait AkkaDistBaseProject extends DefaultProject {
+  def distOutputPath: Path
+  def distLibPath: Path
+  def distSrcPath: Path
+  def distDocPath: Path
+  def dist: Task
+}
+
+trait AkkaDistProject extends AkkaDistBaseProject {
+  def distName: String
+
+  val distFullName = distName + "-" + version
+  val distOutputBasePath = outputPath / "dist"
+  val distOutputPath = (distOutputBasePath ##) / distFullName
+  val distScalaLibPath = distOutputPath / "lib"
+  val distBinPath = distOutputPath / "bin"
+  val distConfigPath = distOutputPath / "config"
+  val distDeployPath = distOutputPath / "deploy"
+  val distLibPath = distOutputPath / "lib" / "akka"
+  val distSrcPath = distOutputPath / "src" / "akka"
+  val distDocPath = distOutputPath / "doc" / "akka"
+  val distDocJarsPath = distDocPath / "api" / "jars"
+  val distSharePath = Path.userHome / ".ivy2" / "dist" / distFullName
+  val distArchiveName = distFullName + ".zip"
+  val distArchive = (distOutputBasePath ##) / distArchiveName
+
+  def distConfigSources = info.projectPath / "config" * "*"
+  def distScriptSources = info.projectPath / "scripts" * "*"
+
+  lazy val distExclusiveProperty = systemOptional[Boolean]("dist.exclusive", false)
+
+  def distExclusive = distExclusiveProperty.value
+
+  def scalaDependency = if (distExclusive) Path.emptyPathFinder else buildLibraryJar
+
+  def allProjectDependencies = topologicalSort.dropRight(1)
+
+  def distDependencies = {
+    allProjectDependencies.flatMap( p => p match {
+      case adp: AkkaDistBaseProject => Some(adp)
+      case _ => None
+    })
+  }
+
+  def distDependencyJarNames = {
+    val jarNames = distDependencies.flatMap { dist =>
+      (dist.distLibPath ** "*.jar").get.map(_.name) ++
+      (dist.distSrcPath ** "*.jar").get.map(_.name) ++
+      (dist.distDocPath ** "*.jar").get.map(_.name)
+    }
+    Set(jarNames: _*)
+  }
+
+  def distClasspath = runClasspath
+
+  def filterOutExcludes(paths: PathFinder) = {
+    if (distExclusive) {
+      val exclude = distDependencyJarNames
+      def include(path: Path) = !exclude(path.name)
+      paths.filter(include)
+    } else paths
+  }
+
+  def dependencyJars(filter: Path => Boolean) = distClasspath.filter(filter)
+
+  def isJar(path: Path) = path.name.endsWith(".jar")
+
+  def isSrcJar(path: Path) = isJar(path) && path.name.contains("-sources")
+
+  def isDocJar(path: Path) = isJar(path) && path.name.contains("-docs")
+
+  def isClassJar(path: Path) = isJar(path) && !isSrcJar(path) && !isDocJar(path)
+
+  def projectDependencies = allProjectDependencies -- distDependencies
+
+  def projectDependencyJars(f: PackagePaths => Path) = {
+    Path.lazyPathFinder {
+      projectDependencies.flatMap( p => p match {
+        case pp: PackagePaths => Some(f(pp))
+        case _ => None
+      })
+    }
+  }
+
+  def distLibs = filterOutExcludes(dependencyJars(isClassJar) +++ projectDependencyJars(_.jarPath))
+
+  def distSrcJars = filterOutExcludes(dependencyJars(isSrcJar) +++ projectDependencyJars(_.packageSrcJar))
+
+  def distDocJars = filterOutExcludes(dependencyJars(isDocJar) +++ projectDependencyJars(_.packageDocsJar))
+
+  def distShareSources = (distOutputPath ##) ** "*"
+
+  lazy val dist = (distAction dependsOn (distBase, `package`, packageSrc, packageDocs)
+                   describedAs("Create a distribution."))
+
+  def distAction = task {
+    copyFiles(scalaDependency, distScalaLibPath) orElse
+    copyFiles(distLibs, distLibPath) orElse
+    copyFiles(distSrcJars, distSrcPath) orElse
+    copyFiles(distDocJars, distDocJarsPath) orElse
+    copyFiles(distConfigSources, distConfigPath) orElse
+    copyScripts(distScriptSources, distBinPath) orElse
+    copyPaths(distShareSources, distSharePath) orElse
+    FileUtilities.zip(List(distOutputPath), distArchive, true, log)
+  }
+
+  lazy val distBase = distBaseAction dependsOn (distClean) describedAs "Create the dist base."
+
+  def distBaseAction = task {
+    if (!distExclusive) {
+      distDependencies.map( dist => {
+        val allFiles = (dist.distOutputPath ##) ** "*"
+        copyPaths(allFiles, distOutputPath)
+      }).foldLeft(None: Option[String])(_ orElse _)
+    } else None
+  }
+
+  def distDependencyTasks: Seq[ManagedTask] = distDependencies.map(_.dist)
+
+  lazy val distClean = (distCleanAction dependsOn (distDependencyTasks: _*)
+                        describedAs "Clean the dist target dir.")
+
+  def distCleanAction = task {
+    FileUtilities.clean(distOutputPath, log) orElse
+    FileUtilities.clean(distSharePath, log)
+  }
+
+  def copyFiles(from: PathFinder, to: Path): Option[String] = {
+    if (from.get.isEmpty) None
+    else FileUtilities.copyFlat(from.get, to, log).left.toOption
+  }
+
+  def copyPaths(from: PathFinder, to: Path): Option[String] = {
+    if (from.get.isEmpty) None
+    else FileUtilities.copy(from.get, to, log).left.toOption
+  }
+
+  def copyScripts(from: PathFinder, to: Path): Option[String] = {
+    from.get.map { script =>
+      val target = to / script.name
+      FileUtilities.copyFile(script, target, log) orElse
+      setExecutable(target, script.asFile.canExecute)
+    }.foldLeft(None: Option[String])(_ orElse _)
+  }
+
+  def setExecutable(target: Path, executable: Boolean): Option[String] = {
+    val success = target.asFile.setExecutable(executable, false)
+    if (success) None else Some("Couldn't set permissions of " + target)
+  }
+
+  override def disableCrossPaths = true
+
+  def doNothing = task { None }
+  override def compileAction = doNothing
+  override def testCompileAction = doNothing
+  override def testAction = doNothing
+  override def packageAction = doNothing
+  override def publishLocalAction = doNothing
+  override def deliverLocalAction = doNothing
+  override def publishAction = doNothing
+  override def deliverAction = doNothing
+}
+
+trait AkkaDistDocProject extends AkkaDistProject {
+  def distDocName = distName
+
+  def findDocParent(project: Project): DocParentProject = project.info.parent match {
+    case Some(dpp: DocParentProject) => dpp
+    case Some(p: Project) => findDocParent(p)
+    case _ => error("Parent project is not a DocParentProject")
+  }
+
+  def docParent = findDocParent(this)
+
+  override def distAction = super.distAction dependsOn (distApi, distRstDocs)
+
+  val apiSources = (docParent.docOutputPath ##) ** "*"
+  val apiPath = distDocPath / "api" / "html" / distDocName
+
+  lazy val distApi = task {
+    copyPaths(apiSources, apiPath)
+  } dependsOn (distBase, docParent.doc)
+
+  val rstDocsPath = docParent.info.projectPath / "akka-docs"
+
+  lazy val rstDocs = task {
+    import Process._
+    log.info("Building docs...")
+    val exitCode = ((new java.lang.ProcessBuilder("make", "clean", "html", "pdf")) directory rstDocsPath.asFile) ! log
+    if (exitCode > 0) Some("Failed to build docs.") else None
+  }
+
+  val rstDocsBuildPath = rstDocsPath / "_build"
+  val rstDocsHtmlSources = (rstDocsBuildPath / "html" ##) ** "*"
+  val rstDocsPdfSources = (rstDocsBuildPath / "latex" ##) ** "*.pdf"
+
+  val rstDocsOutputPath = distDocPath / "docs"
+  val rstDocsHtmlPath = rstDocsOutputPath / "html" / distDocName
+  val rstDocsPdfPath = rstDocsOutputPath / "pdf"
+
+  lazy val distRstDocs = task {
+    copyPaths(rstDocsHtmlSources, rstDocsHtmlPath) orElse
+    copyPaths(rstDocsPdfSources, rstDocsPdfPath)
+  } dependsOn (distBase, rstDocs)
+}
+
+/*
+ * For wiring together akka and akka-modules.
+ */
+trait AkkaDistSharedProject extends AkkaDistBaseProject {
+  def distName: String
+
+  val distFullName = distName + "-" + version
+  val distOutputPath = Path.userHome / ".ivy2" / "dist" / distFullName
+
+  val distLibPath = distOutputPath / "lib" / "akka"
+  val distSrcPath = distOutputPath / "src" / "akka"
+  val distDocPath = distOutputPath / "doc" / "akka"
+
+  lazy val dist = task { None }
+}
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 640f88d1c4..e7f5f14acd 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -10,7 +10,7 @@ import sbt._
 import sbt.CompileOrder._
 import spde._
 
-class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with ExecProject with DocParentProject {
+class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with ExecProject with DocParentProject { akkaParent =>
 
   // -------------------------------------------------------------------------------------------------------------------
   // Compile settings
@@ -444,6 +444,34 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
       publishTask(publishIvyModule, releaseConfiguration) dependsOn (deliver, publishLocal, makePom)
     }
   }
+
+  // -------------------------------------------------------------------------------------------------------------------
+  // Distribution
+  // -------------------------------------------------------------------------------------------------------------------
+
+  lazy val akkaDist = project("dist", "akka-dist", new AkkaDistParentProject(_))
+
+  class AkkaDistParentProject(info: ProjectInfo) extends ParentProject(info) {
+    lazy val akkaActorsDist = project("actors", "akka-dist-actors", new AkkaActorsDistProject(_), akka_actor)
+
+    lazy val akkaCoreDist = project("core", "akka-dist-core", new AkkaCoreDistProject(_),
+                                    akkaActorsDist, akka_remote, akka_http, akka_slf4j, akka_testkit, akka_actor_tests)
+
+    def doNothing = task { None }
+    override def publishLocalAction = doNothing
+    override def deliverLocalAction = doNothing
+    override def publishAction = doNothing
+    override def deliverAction = doNothing
+
+    class AkkaActorsDistProject(info: ProjectInfo) extends DefaultProject(info) with AkkaDistDocProject {
+      def distName = "akka-actors"
+      override def distDocName = "akka"
+    }
+
+    class AkkaCoreDistProject(info: ProjectInfo)extends DefaultProject(info) with AkkaDistProject {
+      def distName = "akka-core"
+    }
+  }
 }
 
 trait OsgiProject extends BNDPlugin { self: DefaultProject =>
diff --git a/project/build/DocParentProject.scala b/project/build/DocParentProject.scala
index ebe339ab2f..8200273ea1 100644
--- a/project/build/DocParentProject.scala
+++ b/project/build/DocParentProject.scala
@@ -1,3 +1,7 @@
+/**
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
 import sbt._
 
 trait DocParentProject extends ParentProject {

From 1e87f138cdb86bf7a94e07ac84eeff9556c814c0 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Mon, 9 May 2011 21:47:36 +1200
Subject: [PATCH 03/15] Don't deliver akka dist project

---
 project/build/AkkaProject.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index e7f5f14acd..a03d1ddde0 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -204,7 +204,10 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
 
   override def artifacts = Set(Artifact(artifactID, "pom", "pom"))
 
-  override def deliverProjectDependencies = super.deliverProjectDependencies.toList - akka_samples.projectID - akka_tutorials.projectID
+  override def deliverProjectDependencies = (super.deliverProjectDependencies.toList
+                                             - akka_samples.projectID
+                                             - akka_tutorials.projectID
+                                             - akkaDist.projectID)
 
   // -------------------------------------------------------------------------------------------------------------------
   // Build release

From 692820e73449132b583548b8c8576f7c95191fe7 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 May 2011 17:05:28 +0200
Subject: [PATCH 04/15] Fixing #846

---
 akka-docs/additional/index.rst                     | 2 +-
 akka-docs/additional/{recipes.rst => recipies.rst} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename akka-docs/additional/{recipes.rst => recipies.rst} (100%)

diff --git a/akka-docs/additional/index.rst b/akka-docs/additional/index.rst
index f36b5ce7cd..7398db601b 100644
--- a/akka-docs/additional/index.rst
+++ b/akka-docs/additional/index.rst
@@ -7,7 +7,7 @@ Additional Information
    add-on-modules
    articles
    benchmarks
-   recipes
+   recipies
    external-sample-projects
    companies-using-akka
    third-party-integrations
diff --git a/akka-docs/additional/recipes.rst b/akka-docs/additional/recipies.rst
similarity index 100%
rename from akka-docs/additional/recipes.rst
rename to akka-docs/additional/recipies.rst

From 48f2ceef3e6776f08fd14e475497b8d4a48f7303 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 May 2011 17:06:28 +0200
Subject: [PATCH 05/15] Adding some docs to AllForOne and OneForOne

---
 .../main/scala/akka/config/SupervisionConfig.scala   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala b/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
index 6b66f3415d..ee4f93280f 100644
--- a/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
+++ b/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
@@ -46,6 +46,12 @@ object Supervision {
         if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
   }
 
+  /**
+   * Restart all actors linked to the same supervisor when one fails,
+   * trapExit = which Throwables should be intercepted
+   * maxNrOfRetries = the number of times an actor is allowed to be restarted
+   * withinTimeRange = millisecond time window for maxNrOfRetries, negative means no window
+   */
   case class AllForOneStrategy(override val trapExit: List[Class[_ <: Throwable]],
                                maxNrOfRetries: Option[Int] = None,
                                withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy(trapExit) {
@@ -68,6 +74,12 @@ object Supervision {
         if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
   }
 
+  /**
+   * Restart an actor when it fails
+   * trapExit = which Throwables should be intercepted
+   * maxNrOfRetries = the number of times an actor is allowed to be restarted
+   * withinTimeRange = millisecond time window for maxNrOfRetries, negative means no window
+   */
   case class OneForOneStrategy(override val trapExit: List[Class[_ <: Throwable]],
                                maxNrOfRetries: Option[Int] = None,
                                withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy(trapExit) {

From b72b455f60607b2f6456be576d86e8eeb4f85c11 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 May 2011 17:06:37 +0200
Subject: [PATCH 06/15] Removing unused imports

---
 akka-actor/src/main/scala/akka/routing/Pool.scala | 2 --
 1 file changed, 2 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/routing/Pool.scala b/akka-actor/src/main/scala/akka/routing/Pool.scala
index 5a906df851..c95a80b0fc 100644
--- a/akka-actor/src/main/scala/akka/routing/Pool.scala
+++ b/akka-actor/src/main/scala/akka/routing/Pool.scala
@@ -5,7 +5,6 @@
 package akka.routing
 
 import akka.actor.{Actor, ActorRef, PoisonPill}
-import java.util.concurrent.TimeUnit
 
 /**
  * Actor pooling
@@ -47,7 +46,6 @@ trait ActorPool {
  */
 trait DefaultActorPool extends ActorPool { this: Actor =>
   import ActorPool._
-  import collection.mutable.LinkedList
   import akka.actor.MaximumNumberOfRestartsWithinTimeRangeReached
 
   protected var _delegates = Vector[ActorRef]()

From b30a1643572f938a7f626abb102b0bab3c8f790a Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 May 2011 17:52:30 +0200
Subject: [PATCH 07/15] Removing logging.rst and servlet.rst and moving the
 guice-integration.rst into the Java section

---
 .../{pending => java}/guice-integration.rst   |  8 ++--
 akka-docs/java/index.rst                      |  1 +
 akka-docs/pending/logging.rst                 |  4 --
 akka-docs/pending/servlet.rst                 | 41 -------------------
 4 files changed, 6 insertions(+), 48 deletions(-)
 rename akka-docs/{pending => java}/guice-integration.rst (93%)
 delete mode 100644 akka-docs/pending/logging.rst
 delete mode 100644 akka-docs/pending/servlet.rst

diff --git a/akka-docs/pending/guice-integration.rst b/akka-docs/java/guice-integration.rst
similarity index 93%
rename from akka-docs/pending/guice-integration.rst
rename to akka-docs/java/guice-integration.rst
index 6392bddfd3..de00b701cb 100644
--- a/akka-docs/pending/guice-integration.rst
+++ b/akka-docs/java/guice-integration.rst
@@ -45,6 +45,8 @@ Retrieve the external Guice dependency
 --------------------------------------
 
 The external dependency can be retrieved like this:
-`<code format="java">`_
-Ext ext = manager.getExternalDependency(Ext.class);
-`<code>`_
+
+.. code-block:: java
+
+  Ext ext = manager.getExternalDependency(Ext.class);
+
diff --git a/akka-docs/java/index.rst b/akka-docs/java/index.rst
index 54b2adf201..1d09b3e437 100644
--- a/akka-docs/java/index.rst
+++ b/akka-docs/java/index.rst
@@ -17,3 +17,4 @@ Java API
    fault-tolerance
    dispatchers
    routing
+   guice-integration
diff --git a/akka-docs/pending/logging.rst b/akka-docs/pending/logging.rst
deleted file mode 100644
index 833f2f419b..0000000000
--- a/akka-docs/pending/logging.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Logging
-=======
-
-Logging has been removed. See the `Event Handler <event-handler>`_.
diff --git a/akka-docs/pending/servlet.rst b/akka-docs/pending/servlet.rst
deleted file mode 100644
index 6859657a72..0000000000
--- a/akka-docs/pending/servlet.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-Akka Servlet
-============
-
-=
-
-Module stability: **STABLE**
-
-Akka has a servlet; ‘se.scalablesolutions.akka.comet.AkkaServlet’ that can use to deploy your Akka-based application in an external Servlet container. All you need to do is to add the servlet to the ‘web.xml’, set ‘$AKKA_HOME’ to the root of the distribution (needs the ‘$AKKA_HOME/config/*’ files) and add the JARs in the ‘$AKKA_HOME/lib’ to your classpath (or put them in the ‘WEB-INF/lib’ directory in the WAR file).
-
-Also, you need to add the Akka initialize/cleanup listener in web.xml
-
-.. code-block:: xml
-
-  <web-app>
-  ...
-    <listener>
-      <listener-class>se.scalablesolutions.akka.servlet.Initializer</listener-class>
-    </listener>
-  ...
-  </web-app>
-
-And to support REST actors and/or comet actors, you need to add the following servlet declaration:
-
-`<code format="xml">`_
-<web-app>
-...
-  <servlet>
-    <servlet-name>Akka</servlet-name>
-    <!-- Both Comet + REST -->
-    <servlet-class>se.scalablesolutions.akka.comet.AkkaServlet</servlet-class>
-    <!-- Or if you don't want to use comet, but only REST -->
-    <servlet-class>se.scalablesolutions.akka.rest.AkkaServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-   <url-pattern>*</url-pattern>
-   <servlet-name>Akka</servlet-name>
-  </servlet-mapping>
-...
-</web-app>
-
-`<code>`_

From 867dc0ffc7d12aab640c360e5291ae783ddb1156 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 09:57:57 +1200
Subject: [PATCH 08/15] Change the automatic release branch to avoid conflicts

---
 project/scripts/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/scripts/release b/project/scripts/release
index 4fa1cef623..2fd97d8693 100644
--- a/project/scripts/release
+++ b/project/scripts/release
@@ -1,4 +1,4 @@
-sh git checkout -b release-{{release.arg1}}
+sh git checkout -b releasing-{{release.arg1}}
 clean
 script find-replace.sh {{project.version}} {{release.arg1}}
 script find-replace.sh //[[:space:]]*release:[[:space:]]*

From a6f8a9f3ce33de42b0657d385761570a0e2c446b Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 12:32:38 +1200
Subject: [PATCH 09/15] Include docs and api in release process

---
 project/build/AkkaProject.scala               | 35 +++++++++++--
 ...kkaDistProject.scala => DistProject.scala} | 49 ++++++++-----------
 project/build/DocParentProject.scala          | 37 +++++++++-----
 3 files changed, 74 insertions(+), 47 deletions(-)
 rename project/build/{AkkaDistProject.scala => DistProject.scala} (82%)

diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index a03d1ddde0..746f9d2f39 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -165,7 +165,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
   // Scaladocs
   // -------------------------------------------------------------------------------------------------------------------
 
-  override def docProjectDependencies = dependencies.toList - akka_samples
+  override def apiProjectDependencies = dependencies.toList - akka_samples
 
   // -------------------------------------------------------------------------------------------------------------------
   // Publishing
@@ -215,7 +215,6 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
 
   val localReleasePath = outputPath / "release" / version.toString
   val localReleaseRepository = Resolver.file("Local Release", localReleasePath / "repository" asFile)
-  val localReleaseDownloads = localReleasePath / "downloads"
 
   override def otherRepositories = super.otherRepositories ++ Seq(localReleaseRepository)
 
@@ -224,7 +223,33 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
     publishTask(publishIvyModule, releaseConfiguration) dependsOn (deliver, publishLocal, makePom)
   }
 
-  lazy val buildRelease = task { None } dependsOn publishRelease
+  lazy val buildRelease = task {
+    log.info("Built release.")
+    None
+  } dependsOn (publishRelease, releaseApi, releaseDocs, releaseDownloads)
+
+  lazy val releaseApi = task {
+    val apiSources = ((apiOutputPath ##) ***)
+    val apiPath = localReleasePath / "api" / "akka" / version.toString
+    FileUtilities.copy(apiSources.get, apiPath, log).left.toOption
+  } dependsOn (api)
+
+  lazy val releaseDocs = task {
+    val docsBuildPath = docsPath / "_build"
+    val docsHtmlSources = ((docsBuildPath / "html" ##) ***)
+    val docsPdfSources = (docsBuildPath / "latex" ##) ** "*.pdf"
+    val docsOutputPath = localReleasePath / "docs" / "akka" / version.toString
+    FileUtilities.copy(docsHtmlSources.get, docsOutputPath, log).left.toOption orElse
+    FileUtilities.copy(docsPdfSources.get, docsOutputPath, log).left.toOption
+  } dependsOn (docs)
+
+  lazy val releaseDownloads = task {
+    val distArchive = akkaDist.akkaCoreDist.distArchive
+    val downloadsPath = localReleasePath / "downloads"
+    FileUtilities.copy(distArchive.get, downloadsPath, log).left.toOption
+  } dependsOn (dist)
+
+  lazy val dist = task { None } // dummy task
 
   // -------------------------------------------------------------------------------------------------------------------
   // akka-actor subproject
@@ -466,12 +491,12 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
     override def publishAction = doNothing
     override def deliverAction = doNothing
 
-    class AkkaActorsDistProject(info: ProjectInfo) extends DefaultProject(info) with AkkaDistDocProject {
+    class AkkaActorsDistProject(info: ProjectInfo) extends DefaultProject(info) with DistDocProject {
       def distName = "akka-actors"
       override def distDocName = "akka"
     }
 
-    class AkkaCoreDistProject(info: ProjectInfo)extends DefaultProject(info) with AkkaDistProject {
+    class AkkaCoreDistProject(info: ProjectInfo)extends DefaultProject(info) with DistProject {
       def distName = "akka-core"
     }
   }
diff --git a/project/build/AkkaDistProject.scala b/project/build/DistProject.scala
similarity index 82%
rename from project/build/AkkaDistProject.scala
rename to project/build/DistProject.scala
index 440d337f86..df6b348396 100644
--- a/project/build/AkkaDistProject.scala
+++ b/project/build/DistProject.scala
@@ -4,7 +4,7 @@
 
 import sbt._
 
-trait AkkaDistBaseProject extends DefaultProject {
+trait DistBaseProject extends DefaultProject {
   def distOutputPath: Path
   def distLibPath: Path
   def distSrcPath: Path
@@ -12,7 +12,7 @@ trait AkkaDistBaseProject extends DefaultProject {
   def dist: Task
 }
 
-trait AkkaDistProject extends AkkaDistBaseProject {
+trait DistProject extends DistBaseProject {
   def distName: String
 
   val distFullName = distName + "-" + version
@@ -43,7 +43,7 @@ trait AkkaDistProject extends AkkaDistBaseProject {
 
   def distDependencies = {
     allProjectDependencies.flatMap( p => p match {
-      case adp: AkkaDistBaseProject => Some(adp)
+      case adp: DistBaseProject => Some(adp)
       case _ => None
     })
   }
@@ -94,7 +94,7 @@ trait AkkaDistProject extends AkkaDistBaseProject {
 
   def distDocJars = filterOutExcludes(dependencyJars(isDocJar) +++ projectDependencyJars(_.packageDocsJar))
 
-  def distShareSources = (distOutputPath ##) ** "*"
+  def distShareSources = ((distOutputPath ##) ***)
 
   lazy val dist = (distAction dependsOn (distBase, `package`, packageSrc, packageDocs)
                    describedAs("Create a distribution."))
@@ -115,7 +115,7 @@ trait AkkaDistProject extends AkkaDistBaseProject {
   def distBaseAction = task {
     if (!distExclusive) {
       distDependencies.map( dist => {
-        val allFiles = (dist.distOutputPath ##) ** "*"
+        val allFiles = ((dist.distOutputPath ##) ***)
         copyPaths(allFiles, distOutputPath)
       }).foldLeft(None: Option[String])(_ orElse _)
     } else None
@@ -167,7 +167,7 @@ trait AkkaDistProject extends AkkaDistBaseProject {
   override def deliverAction = doNothing
 }
 
-trait AkkaDistDocProject extends AkkaDistProject {
+trait DistDocProject extends DistProject {
   def distDocName = distName
 
   def findDocParent(project: Project): DocParentProject = project.info.parent match {
@@ -178,42 +178,33 @@ trait AkkaDistDocProject extends AkkaDistProject {
 
   def docParent = findDocParent(this)
 
-  override def distAction = super.distAction dependsOn (distApi, distRstDocs)
+  override def distAction = super.distAction dependsOn (distApi, distDocs)
 
-  val apiSources = (docParent.docOutputPath ##) ** "*"
+  val apiSources = ((docParent.apiOutputPath ##) ***)
   val apiPath = distDocPath / "api" / "html" / distDocName
 
   lazy val distApi = task {
     copyPaths(apiSources, apiPath)
-  } dependsOn (distBase, docParent.doc)
+  } dependsOn (distBase, docParent.api)
 
-  val rstDocsPath = docParent.info.projectPath / "akka-docs"
+  val docsBuildPath = docParent.docsPath / "_build"
+  val docsHtmlSources = ((docsBuildPath / "html" ##) ***)
+  val docsPdfSources = (docsBuildPath / "latex" ##) ** "*.pdf"
 
-  lazy val rstDocs = task {
-    import Process._
-    log.info("Building docs...")
-    val exitCode = ((new java.lang.ProcessBuilder("make", "clean", "html", "pdf")) directory rstDocsPath.asFile) ! log
-    if (exitCode > 0) Some("Failed to build docs.") else None
-  }
+  val docsOutputPath = distDocPath / "docs"
+  val docsHtmlPath = docsOutputPath / "html" / distDocName
+  val docsPdfPath = docsOutputPath / "pdf"
 
-  val rstDocsBuildPath = rstDocsPath / "_build"
-  val rstDocsHtmlSources = (rstDocsBuildPath / "html" ##) ** "*"
-  val rstDocsPdfSources = (rstDocsBuildPath / "latex" ##) ** "*.pdf"
-
-  val rstDocsOutputPath = distDocPath / "docs"
-  val rstDocsHtmlPath = rstDocsOutputPath / "html" / distDocName
-  val rstDocsPdfPath = rstDocsOutputPath / "pdf"
-
-  lazy val distRstDocs = task {
-    copyPaths(rstDocsHtmlSources, rstDocsHtmlPath) orElse
-    copyPaths(rstDocsPdfSources, rstDocsPdfPath)
-  } dependsOn (distBase, rstDocs)
+  lazy val distDocs = task {
+    copyPaths(docsHtmlSources, docsHtmlPath) orElse
+    copyPaths(docsPdfSources, docsPdfPath)
+  } dependsOn (distBase, docParent.docs)
 }
 
 /*
  * For wiring together akka and akka-modules.
  */
-trait AkkaDistSharedProject extends AkkaDistBaseProject {
+trait DistSharedProject extends DistBaseProject {
   def distName: String
 
   val distFullName = distName + "-" + version
diff --git a/project/build/DocParentProject.scala b/project/build/DocParentProject.scala
index 8200273ea1..0bb08c4879 100644
--- a/project/build/DocParentProject.scala
+++ b/project/build/DocParentProject.scala
@@ -5,32 +5,43 @@
 import sbt._
 
 trait DocParentProject extends ParentProject {
-  def docOutputPath = outputPath / "doc" / "main" / "api"
+  def apiOutputPath = outputPath / "doc" / "main" / "api"
 
-  def docProjectDependencies = topologicalSort.dropRight(1)
+  def apiProjectDependencies = topologicalSort.dropRight(1)
 
-  def docMainSources =
-    docProjectDependencies.map {
+  def apiMainSources =
+    apiProjectDependencies.map {
       case sp: ScalaPaths => sp.mainSources
       case _ => Path.emptyPathFinder
     }.foldLeft(Path.emptyPathFinder)(_ +++ _)
 
-  def docCompileClasspath =
-    docProjectDependencies.map {
+  def apiCompileClasspath =
+    apiProjectDependencies.map {
       case bsp: BasicScalaProject => bsp.compileClasspath
       case _ => Path.emptyPathFinder
     }.foldLeft(Path.emptyPathFinder)(_ +++ _)
 
-  def docLabel = "main"
+  def apiLabel = "main"
 
-  def docMaxErrors = 100
+  def apiMaxErrors = 100
 
-  def docOptions: Seq[String] = Seq.empty
+  def apiOptions: Seq[String] = Seq.empty
 
-  lazy val doc = docAction describedAs ("Create combined scaladoc for all subprojects")
+  lazy val api = apiAction describedAs ("Create combined scaladoc for all subprojects.")
 
-  def docAction = task {
-    val scaladoc = new Scaladoc(docMaxErrors, buildCompiler)
-    scaladoc(docLabel, docMainSources.get, docCompileClasspath.get, docOutputPath, docOptions, log)
+  def apiAction = task {
+    val scaladoc = new Scaladoc(apiMaxErrors, buildCompiler)
+    scaladoc(apiLabel, apiMainSources.get, apiCompileClasspath.get, apiOutputPath, apiOptions, log)
+  }
+
+  val docsPath = info.projectPath / "akka-docs"
+
+  lazy val docs = docsAction describedAs ("Create the reStructuredText documentation.")
+
+  def docsAction = task {
+    import Process._
+    log.info("Building docs...")
+    val exitCode = ((new java.lang.ProcessBuilder("make", "clean", "html", "pdf")) directory docsPath.asFile) ! log
+    if (exitCode > 0) Some("Failed to build docs.") else None
   }
 }

From a769fb3640dacf297cda8c56aae019eb90785330 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 14:09:34 +1200
Subject: [PATCH 10/15] Update header in html docs

---
 akka-docs/_sphinx/static/logo.png             | Bin 7499 -> 7305 bytes
 akka-docs/_sphinx/themes/akka/layout.html     |   8 ++++----
 .../_sphinx/themes/akka/static/akka.css_t     |   7 +++++--
 akka-docs/conf.py                             |   3 ---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/akka-docs/_sphinx/static/logo.png b/akka-docs/_sphinx/static/logo.png
index a6bc9c3b98ed53f4c76165a2a52034a67e5d6ab0..558dfed6eb6d2ef0677478a00c546f0b4a484916 100644
GIT binary patch
literal 7305
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

literal 7499
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
HQ$iB}ON*{e

diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
index db443c3fe5..15d7a9b951 100644
--- a/akka-docs/_sphinx/themes/akka/layout.html
+++ b/akka-docs/_sphinx/themes/akka/layout.html
@@ -38,11 +38,11 @@
         </a>
         {%- else %}
         {%- if logo -%}
-          <img class="rightlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+          <img class="leftlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
         {%- endif -%}
-        <h1 class="heading"><a href="{{ pathto('index') }}">
-          <span>{{ shorttitle|e }}</span></a></h1>
-        <h2 class="heading"><span>{{ title|striptags|e }}</span></h2>
+       <h1 class="heading"><a href="{{ pathto('index') }}">
+         <span>{{ shorttitle|e }}</span></a></h1>
+       <h2 class="heading"><span>Version {{ version|e }}</span></h2>
         {%- endif %}
         {%- endblock %}
       </div>
diff --git a/akka-docs/_sphinx/themes/akka/static/akka.css_t b/akka-docs/_sphinx/themes/akka/static/akka.css_t
index f05e86bb6a..146ba31623 100644
--- a/akka-docs/_sphinx/themes/akka/static/akka.css_t
+++ b/akka-docs/_sphinx/themes/akka/static/akka.css_t
@@ -112,13 +112,16 @@ div.header h2 {
     font-size: 1.3em;
     font-weight: normal;
     letter-spacing: 1px;
-    text-transform: uppercase;
-    color: #aaa;
+    color: {{ theme_headingcolor }};
     border: 0;
     margin-top: -3px;
     padding: 0;
 }
 
+div.header img.leftlogo {
+    float: left;
+}
+
 div.header img.rightlogo {
     float: right;
 }
diff --git a/akka-docs/conf.py b/akka-docs/conf.py
index 712a3d10c8..f6a0c67069 100644
--- a/akka-docs/conf.py
+++ b/akka-docs/conf.py
@@ -28,9 +28,6 @@ show_authors = True
 # -- Options for HTML output ---------------------------------------------------
 
 html_theme = 'akka'
-html_theme_options = {
-    'full_logo': 'true'
-    }
 html_theme_path = ['_sphinx/themes']
 
 html_title = 'Akka Documentation'

From 5e63ebc36ea6b92ee9da61acb173c10a7e23a72a Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 14:30:00 +1200
Subject: [PATCH 11/15] Fix new api task

---
 project/build/DocParentProject.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/build/DocParentProject.scala b/project/build/DocParentProject.scala
index 0bb08c4879..1e7bf0266c 100644
--- a/project/build/DocParentProject.scala
+++ b/project/build/DocParentProject.scala
@@ -27,13 +27,15 @@ trait DocParentProject extends ParentProject {
 
   def apiOptions: Seq[String] = Seq.empty
 
-  lazy val api = apiAction describedAs ("Create combined scaladoc for all subprojects.")
+  lazy val api = apiAction dependsOn (doc) describedAs ("Create combined scaladoc for all subprojects.")
 
   def apiAction = task {
     val scaladoc = new Scaladoc(apiMaxErrors, buildCompiler)
     scaladoc(apiLabel, apiMainSources.get, apiCompileClasspath.get, apiOutputPath, apiOptions, log)
   }
 
+  lazy val doc = task { None } // dummy task
+
   val docsPath = info.projectPath / "akka-docs"
 
   lazy val docs = docsAction describedAs ("Create the reStructuredText documentation.")

From c581e4be28f5696c2cc7a70f42ae4b6b6880f339 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 14:40:05 +1200
Subject: [PATCH 12/15] Update loader banner and version

---
 .../src/main/scala/akka/util/AkkaLoader.scala | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
index e6ebc28c3d..c780cb48f3 100644
--- a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
+++ b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
@@ -65,29 +65,29 @@ class AkkaLoader {
         .?ZZZZZZ'    .ZZZZ?    .ZZZ?                                'ZZZO
     .+ZZZZZZ?'    .7ZZZZ'    .ZZZZ                                    :ZZZZ
  .ZZZZZZ$'     .?ZZZZZ'   .~ZZZZ                                        'ZZZZ.
-                                                                                
-                                                                                
-                      NNNNN              $NNNN+                                 
-                      NNNNN              $NNNN+                                 
-                      NNNNN              $NNNN+                                 
-                      NNNNN              $NNNN+                                 
-                      NNNNN              $NNNN+                                 
-    =NNNNNNNNND$      NNNNN     DDDDDD:  $NNNN+     DDDDDN     NDDNNNNNNNN,     
-   NNNNNNNNNNNNND     NNNNN    DNNNNN    $NNNN+   8NNNNN=    :NNNNNNNNNNNNNN    
-  NNNNN$    DNNNNN    NNNNN  $NNNNN~     $NNNN+  NNNNNN      NNNNN,   :NNNNN+   
-   ?DN~      NNNNN    NNNNN MNNNNN       $NNNN+:NNNNN7        $ND      =NNNNN   
-            DNNNNN    NNNNNDNNNN$        $NNNNDNNNNN                  :DNNNNN   
-     ZNDNNNNNNNNND    NNNNNNNNNND,       $NNNNNNNNNNN           DNDNNNNNNNNNN   
-   NNNNNNNDDINNNNN    NNNNNNNNNNND       $NNNNNNNNNNND       ONNNNNNND8+NNNNN   
- :NNNND      NNNNN    NNNNNN  DNNNN,     $NNNNNO 7NNNND     NNNNNO     :NNNNN   
- DNNNN       NNNNN    NNNNN    DNNNN     $NNNN+   8NNNNN    NNNNN      $NNNNN   
- DNNNNO     NNNNNN    NNNNN     NNNNN    $NNNN+    NNNNN$   NNNND,    ,NNNNND   
-  NNNNNNDDNNNNNNNN    NNNNN     =NNNNN   $NNNN+     DNNNN?  DNNNNNNDNNNNNNNND   
+
+
+                      NNNNN              $NNNN+
+                      NNNNN              $NNNN+
+                      NNNNN              $NNNN+
+                      NNNNN              $NNNN+
+                      NNNNN              $NNNN+
+    =NNNNNNNNND$      NNNNN     DDDDDD:  $NNNN+     DDDDDN     NDDNNNNNNNN,
+   NNNNNNNNNNNNND     NNNNN    DNNNNN    $NNNN+   8NNNNN=    :NNNNNNNNNNNNNN
+  NNNNN$    DNNNNN    NNNNN  $NNNNN~     $NNNN+  NNNNNN      NNNNN,   :NNNNN+
+   ?DN~      NNNNN    NNNNN MNNNNN       $NNNN+:NNNNN7        $ND      =NNNNN
+            DNNNNN    NNNNNDNNNN$        $NNNNDNNNNN                  :DNNNNN
+     ZNDNNNNNNNNND    NNNNNNNNNND,       $NNNNNNNNNNN           DNDNNNNNNNNNN
+   NNNNNNNDDINNNNN    NNNNNNNNNNND       $NNNNNNNNNNND       ONNNNNNND8+NNNNN
+ :NNNND      NNNNN    NNNNNN  DNNNN,     $NNNNNO 7NNNND     NNNNNO     :NNNNN
+ DNNNN       NNNNN    NNNNN    DNNNN     $NNNN+   8NNNNN    NNNNN      $NNNNN
+ DNNNNO     NNNNNN    NNNNN     NNNNN    $NNNN+    NNNNN$   NNNND,    ,NNNNND
+  NNNNNNDDNNNNNNNN    NNNNN     =NNNNN   $NNNN+     DNNNN?  DNNNNNNDNNNNNNNND
    NNNNNNNNN  NNNN$   NNNNN      8NNNND  $NNNN+      NNNNN=  ,DNNNNNNND NNNNN$
 
 ==============================================================================
-""")
-    println("            Running version " + Config.VERSION)
-    println("==================================================")
+                      Running version %s
+==============================================================================
+""".format(Config.VERSION))
   }
 }

From 8dec4bcbc415d80dd1b1907d9bc099437c4fb65a Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 16:37:31 +1200
Subject: [PATCH 13/15] Update tutorials and include source in the distribution

---
 .../intro/getting-started-first-java.rst      | 95 +++++++++++--------
 .../getting-started-first-scala-eclipse.rst   | 58 ++++++-----
 .../intro/getting-started-first-scala.rst     | 70 ++++++++------
 akka-tutorials/akka-tutorial-first/README     |  7 ++
 akka-tutorials/akka-tutorial-first/pom.xml    |  4 +-
 .../project/build.properties                  |  5 +
 .../project/build/Project.scala               |  3 +
 .../project/plugins/Plugins.scala             |  6 ++
 .../java/akka/tutorial/first/java/Pi.java     | 25 -----
 .../src/main/scala/Pi.scala                   | 26 -----
 akka-tutorials/akka-tutorial-second/README    |  7 ++
 akka-tutorials/akka-tutorial-second/pom.xml   | 43 +++++++++
 .../project/build.properties                  |  5 +
 .../project/build/Project.scala               |  3 +
 .../project/plugins/Plugins.scala             |  6 ++
 .../java/akka/tutorial/java/second/Pi.java    | 25 -----
 .../src/main/scala/Pi.scala                   | 26 -----
 project/build/AkkaProject.scala               | 23 ++++-
 18 files changed, 243 insertions(+), 194 deletions(-)
 create mode 100644 akka-tutorials/akka-tutorial-first/README
 create mode 100644 akka-tutorials/akka-tutorial-first/project/build.properties
 create mode 100644 akka-tutorials/akka-tutorial-first/project/build/Project.scala
 create mode 100644 akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala
 create mode 100644 akka-tutorials/akka-tutorial-second/README
 create mode 100644 akka-tutorials/akka-tutorial-second/pom.xml
 create mode 100644 akka-tutorials/akka-tutorial-second/project/build.properties
 create mode 100644 akka-tutorials/akka-tutorial-second/project/build/Project.scala
 create mode 100644 akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala

diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
index 32e8f36672..920f64521f 100644
--- a/akka-docs/intro/getting-started-first-java.rst
+++ b/akka-docs/intro/getting-started-first-java.rst
@@ -37,7 +37,7 @@ To check out the code using Git invoke the following::
 
     $ git clone git://github.com/jboner/akka.git
 
-Then you can navigate down to the tutorial:: 
+Then you can navigate down to the tutorial::
 
     $ cd akka/akka-tutorials/akka-tutorial-first
 
@@ -58,39 +58,49 @@ You can test your installation by invoking ``java``::
     Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
     Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
 
+
 Downloading and installing Akka
 -------------------------------
 
-To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one.
+To build and run the tutorial sample from the command line, you have to download
+Akka. If you prefer to use SBT to build and run the sample then you can skip
+this section and jump to the next one.
 
-Let's get the ``akka-1.1`` distribution of Akka core (not Akka Modules) from `http://akka.io/downloads <http://akka.io/downloads/>`_. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in, in my case I choose to install it in ``/Users/jboner/tools/``, simply by unzipping it to this directory.
+Let's get the ``akka-actors-1.1.zip`` distribution of Akka from
+http://akka.io/downloads/ which includes everything we need for this
+tutorial. Once you have downloaded the distribution unzip it in the folder you
+would like to have Akka installed in. In my case I choose to install it in
+``/Users/jboner/tools/``, simply by unzipping it to this directory.
 
-You need to do one more thing in order to install Akka properly: set the ``AKKA_HOME`` environment variable to the root of the distribution. In my case I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable::
+You need to do one more thing in order to install Akka properly: set the
+``AKKA_HOME`` environment variable to the root of the distribution. In my case
+I'm opening up a shell, navigating down to the distribution, and setting the
+``AKKA_HOME`` variable::
 
-    $ cd /Users/jboner/tools/akka-1.1
+    $ cd /Users/jboner/tools/akka-actors-1.1
     $ export AKKA_HOME=`pwd`
     $ echo $AKKA_HOME
-    /Users/jboner/tools/akka-1.1
+    /Users/jboner/tools/akka-actors-1.1
 
 The distribution looks like this::
 
-    $ ls -l
-    total 16944
-    drwxr-xr-x   7 jboner  staff      238 Apr  6 11:15 .
-    drwxr-xr-x  28 jboner  staff      952 Apr  6 11:16 ..
-    drwxr-xr-x  17 jboner  staff      578 Apr  6 11:16 deploy
-    drwxr-xr-x  26 jboner  staff      884 Apr  6 11:16 dist
-    drwxr-xr-x   3 jboner  staff      102 Apr  6 11:15 lib_managed
-    -rwxr-xr-x   1 jboner  staff  8674105 Apr  6 11:15 scala-library.jar
-    drwxr-xr-x   4 jboner  staff      136 Apr  6 11:16 scripts
+    $ ls -1
+    config
+    doc
+    lib
+    src
 
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- In the ``scripts`` directory we have scripts for running Akka.
-- Finally ``scala-library.jar`` is the JAR for the latest Scala distribution that Akka depends on.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+  the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- In the ``src`` directory we have the source JARs for Akka.
 
-The only JAR we will need for this tutorial (apart from the ``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``dist`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``lib/akka``
+directory. This is a self-contained JAR with zero dependencies and contains
+everything we need to write a system using Actors.
 
 Akka is very modular and has many JARs for containing different features. The core distribution has seven modules:
 
@@ -102,7 +112,10 @@ Akka is very modular and has many JARs for containing different features. The co
 - ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
 - ``akka-testkit-1.1.jar`` -- Toolkit for testing Actors
 
-We also have Akka Modules containing add-on modules outside the core of Akka. You can download the Akka Modules distribution from TODO. It contains Akka core as well. We will not be needing any modules there today, but for your information the module JARs are these:
+We also have Akka Modules containing add-on modules outside the core of
+Akka. You can download the Akka Modules distribution from TODO. It contains Akka
+core as well. We will not be needing any modules there today, but for your
+information the module JARs are these:
 
 - ``akka-kernel-1.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
 - ``akka-amqp-1.1.jar`` -- AMQP integration
@@ -112,6 +125,7 @@ We also have Akka Modules containing add-on modules outside the core of Akka. Yo
 - ``akka-spring-1.1.jar`` -- Spring framework integration
 - ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
 
+
 Downloading and installing Maven
 --------------------------------
 
@@ -178,7 +192,7 @@ We also need to edit the ``pom.xml`` build file. Let's add the dependency we nee
             <repository>
                 <id>Akka</id>
                 <name>Akka Maven2 Repository</name>
-                <url>http://www.scalablesolutions.se/akka/repository/</url>
+                <url>http://akka.io/repository/</url>
             </repository>
         </repositories>
 
@@ -695,35 +709,42 @@ Before we package it up and run it, let's take a look at the full code now, with
       }
     }
 
+
 Run it as a command line application
 ------------------------------------
 
-To build and run the tutorial from the command line, you need to have the Scala library JAR on the classpath.
+If you have not typed in (or copied) the code for the tutorial as
+``$AKKA_HOME/tutorial/akka/tutorial/first/java/Pi.java`` then now is the
+time. When that's done open up a shell and step in to the Akka distribution
+(``cd $AKKA_HOME``).
 
-Scala can be downloaded from `http://www.scala-lang.org/downloads <http://www.scala-lang.org/downloads>`_. Browse there and download the Scala 2.9.0.RC1 release. If you pick the ``tgz`` or ``zip`` distribution then just unzip it where you want it installed. If you pick the IzPack Installer then double click on it and follow the instructions.
+First we need to compile the source file. That is done with Java's compiler
+``javac``. Our application depends on the ``akka-actor-1.1.jar`` and the
+``scala-library.jar`` JAR files, so let's add them to the compiler classpath
+when we compile the source::
 
-The ``scala-library.jar`` resides in the ``scala-2.9.0.RC1/lib`` directory. Copy that to your project directory.
+    $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar tutorial/akka/tutorial/first/java/Pi.java
 
-If you have not typed in (or copied) the code for the tutorial as ``$AKKA_HOME/tutorial/akka/tutorial/first/java/Pi.java`` then now is the time. When that's done open up a shell and step in to the Akka distribution (``cd $AKKA_HOME``).
-
-First we need to compile the source file. That is done with Java's compiler ``javac``. Our application depends on the ``akka-actor-1.1.jar`` and the ``scala-library.jar`` JAR files, so let's add them to the compiler classpath when we compile the source::
-
-    $ javac -cp dist/akka-actor-1.1.jar:scala-library.jar tutorial/Pi.scala
-
-When we have compiled the source file we are ready to run the application. This is done with ``java`` but yet again we need to add the ``akka-actor-1.1.jar`` and the ``scala-library.jar`` JAR files to the classpath as well as the classes we compiled ourselves::
+When we have compiled the source file we are ready to run the application. This
+is done with ``java`` but yet again we need to add the ``akka-actor-1.1.jar``
+and the ``scala-library.jar`` JAR files to the classpath as well as the classes
+we compiled ourselves::
 
     $ java \
-        -cp dist/akka-actor-1.1.jar:scala-library.jar:tutorial \
+        -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar:tutorial \
         akka.tutorial.java.first.Pi
-    AKKA_HOME is defined as [/Users/jboner/src/akka-stuff/akka-core]
-    loading config from [/Users/jboner/src/akka-stuff/akka-core/config/akka.conf].
+    AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.1]
+    loading config from [/Users/jboner/tools/akka-actors-1.1/config/akka.conf].
 
     Pi estimate:        3.1435501812459323
     Calculation time:   822 millis
 
 Yippee! It is working.
 
-If you have not defined the ``AKKA_HOME`` environment variable then Akka can't find the ``akka.conf`` configuration file and will print out a ``Can’t load akka.conf`` warning. This is ok since it will then just use the defaults.
+If you have not defined the ``AKKA_HOME`` environment variable then Akka can't
+find the ``akka.conf`` configuration file and will print out a ``Can’t load
+akka.conf`` warning. This is ok since it will then just use the defaults.
+
 
 Run it inside Maven
 -------------------
diff --git a/akka-docs/intro/getting-started-first-scala-eclipse.rst b/akka-docs/intro/getting-started-first-scala-eclipse.rst
index b4380490ef..f34cfb75f3 100644
--- a/akka-docs/intro/getting-started-first-scala-eclipse.rst
+++ b/akka-docs/intro/getting-started-first-scala-eclipse.rst
@@ -43,39 +43,49 @@ You can test your installation by invoking ``java``::
     Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
     Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
 
+
 Downloading and installing Akka
 -------------------------------
 
-To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one.
+To build and run the tutorial sample from the command line, you have to download
+Akka. If you prefer to use SBT to build and run the sample then you can skip
+this section and jump to the next one.
 
-Let's get the ``akka-1.1`` distribution of Akka core (not Akka Modules) from `http://akka.io/downloads <http://akka.io/downloads/>`_. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in, in my case I choose to install it in ``/Users/jboner/tools/``, simply by unzipping it to this directory.
+Let's get the ``akka-actors-1.1.zip`` distribution of Akka from
+http://akka.io/downloads/ which includes everything we need for this
+tutorial. Once you have downloaded the distribution unzip it in the folder you
+would like to have Akka installed in. In my case I choose to install it in
+``/Users/jboner/tools/``, simply by unzipping it to this directory.
 
-You need to do one more thing in order to install Akka properly: set the ``AKKA_HOME`` environment variable to the root of the distribution. In my case I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable::
+You need to do one more thing in order to install Akka properly: set the
+``AKKA_HOME`` environment variable to the root of the distribution. In my case
+I'm opening up a shell, navigating down to the distribution, and setting the
+``AKKA_HOME`` variable::
 
-    $ cd /Users/jboner/tools/akka-1.1
+    $ cd /Users/jboner/tools/akka-actors-1.1
     $ export AKKA_HOME=`pwd`
     $ echo $AKKA_HOME
-    /Users/jboner/tools/akka-1.1
+    /Users/jboner/tools/akka-actors-1.1
 
 The distribution looks like this::
 
-    $ ls -l
-    total 16944
-    drwxr-xr-x   7 jboner  staff      238 Apr  6 11:15 .
-    drwxr-xr-x  28 jboner  staff      952 Apr  6 11:16 ..
-    drwxr-xr-x  17 jboner  staff      578 Apr  6 11:16 deploy
-    drwxr-xr-x  26 jboner  staff      884 Apr  6 11:16 dist
-    drwxr-xr-x   3 jboner  staff      102 Apr  6 11:15 lib_managed
-    -rwxr-xr-x   1 jboner  staff  8674105 Apr  6 11:15 scala-library.jar
-    drwxr-xr-x   4 jboner  staff      136 Apr  6 11:16 scripts
+    $ ls -1
+    config
+    doc
+    lib
+    src
 
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- In the ``scripts`` directory we have scripts for running Akka.
-- Finally ``scala-library.jar`` is the JAR for the latest Scala distribution that Akka depends on.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+  the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- In the ``src`` directory we have the source JARs for Akka.
 
-The only JAR we will need for this tutorial (apart from the ``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``dist`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``lib/akka``
+directory. This is a self-contained JAR with zero dependencies and contains
+everything we need to write a system using Actors.
 
 Akka is very modular and has many JARs for containing different features. The core distribution has seven modules:
 
@@ -84,10 +94,13 @@ Akka is very modular and has many JARs for containing different features. The co
 - ``akka-remote-1.1.jar`` -- Remote Actors
 - ``akka-stm-1.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
 - ``akka-http-1.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
-- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener
+- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
 - ``akka-testkit-1.1.jar`` -- Toolkit for testing Actors
 
-We also have Akka Modules containing add-on modules outside the core of Akka. You can download the Akka Modules distribution from TODO. It contains Akka core as well. We will not be needing any modules there today, but for your information the module JARs are these:
+We also have Akka Modules containing add-on modules outside the core of
+Akka. You can download the Akka Modules distribution from TODO. It contains Akka
+core as well. We will not be needing any modules there today, but for your
+information the module JARs are these:
 
 - ``akka-kernel-1.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
 - ``akka-amqp-1.1.jar`` -- AMQP integration
@@ -97,6 +110,7 @@ We also have Akka Modules containing add-on modules outside the core of Akka. Yo
 - ``akka-spring-1.1.jar`` -- Spring framework integration
 - ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
 
+
 Downloading and installing the Scala IDE for Eclipse
 ----------------------------------------------------
 
diff --git a/akka-docs/intro/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst
index 07cfec7548..b6e5fca400 100644
--- a/akka-docs/intro/getting-started-first-scala.rst
+++ b/akka-docs/intro/getting-started-first-scala.rst
@@ -58,39 +58,49 @@ You can test your installation by invoking ``java``::
     Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
     Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
 
+
 Downloading and installing Akka
 -------------------------------
 
-To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one.
+To build and run the tutorial sample from the command line, you have to download
+Akka. If you prefer to use SBT to build and run the sample then you can skip
+this section and jump to the next one.
 
-Let's get the ``akka-1.1`` distribution of Akka core (not Akka Modules) from `http://akka.io/downloads <http://akka.io/downloads/>`_. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in, in my case I choose to install it in ``/Users/jboner/tools/``, simply by unzipping it to this directory.
+Let's get the ``akka-actors-1.1.zip`` distribution of Akka from
+http://akka.io/downloads/ which includes everything we need for this
+tutorial. Once you have downloaded the distribution unzip it in the folder you
+would like to have Akka installed in. In my case I choose to install it in
+``/Users/jboner/tools/``, simply by unzipping it to this directory.
 
-You need to do one more thing in order to install Akka properly: set the ``AKKA_HOME`` environment variable to the root of the distribution. In my case I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable::
+You need to do one more thing in order to install Akka properly: set the
+``AKKA_HOME`` environment variable to the root of the distribution. In my case
+I'm opening up a shell, navigating down to the distribution, and setting the
+``AKKA_HOME`` variable::
 
-    $ cd /Users/jboner/tools/akka-1.1
+    $ cd /Users/jboner/tools/akka-actors-1.1
     $ export AKKA_HOME=`pwd`
     $ echo $AKKA_HOME
-    /Users/jboner/tools/akka-1.1
+    /Users/jboner/tools/akka-actors-1.1
 
 The distribution looks like this::
 
-    $ ls -l
-    total 16944
-    drwxr-xr-x   7 jboner  staff      238 Apr  6 11:15 .
-    drwxr-xr-x  28 jboner  staff      952 Apr  6 11:16 ..
-    drwxr-xr-x  17 jboner  staff      578 Apr  6 11:16 deploy
-    drwxr-xr-x  26 jboner  staff      884 Apr  6 11:16 dist
-    drwxr-xr-x   3 jboner  staff      102 Apr  6 11:15 lib_managed
-    -rwxr-xr-x   1 jboner  staff  8674105 Apr  6 11:15 scala-library.jar
-    drwxr-xr-x   4 jboner  staff      136 Apr  6 11:16 scripts
+    $ ls -1
+    config
+    doc
+    lib
+    src
 
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- In the ``scripts`` directory we have scripts for running Akka.
-- Finally ``scala-library.jar`` is the JAR for the latest Scala distribution that Akka depends on.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+  the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- In the ``src`` directory we have the source JARs for Akka.
 
-The only JAR we will need for this tutorial (apart from the ``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``dist`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.1.jar`` JAR in the ``lib/akka``
+directory. This is a self-contained JAR with zero dependencies and contains
+everything we need to write a system using Actors.
 
 Akka is very modular and has many JARs for containing different features. The core distribution has seven modules:
 
@@ -99,10 +109,13 @@ Akka is very modular and has many JARs for containing different features. The co
 - ``akka-remote-1.1.jar`` -- Remote Actors
 - ``akka-stm-1.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
 - ``akka-http-1.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
-- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener
+- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
 - ``akka-testkit-1.1.jar`` -- Toolkit for testing Actors
 
-We also have Akka Modules containing add-on modules outside the core of Akka. You can download the Akka Modules distribution from TODO. It contains Akka core as well. We will not be needing any modules there today, but for your information the module JARs are these:
+We also have Akka Modules containing add-on modules outside the core of
+Akka. You can download the Akka Modules distribution from TODO. It contains Akka
+core as well. We will not be needing any modules there today, but for your
+information the module JARs are these:
 
 - ``akka-kernel-1.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
 - ``akka-amqp-1.1.jar`` -- AMQP integration
@@ -112,6 +125,7 @@ We also have Akka Modules containing add-on modules outside the core of Akka. Yo
 - ``akka-spring-1.1.jar`` -- Spring framework integration
 - ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
 
+
 Downloading and installing Scala
 --------------------------------
 
@@ -171,9 +185,7 @@ Now we need to create a project definition using our Akka SBT plugin. We do that
 
     import sbt._
 
-    class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject {
-      val akkaRepo = "Akka Repo" at "http://akka.io/repository"
-    }
+    class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject
 
 The magic is in mixing in the ``AkkaProject`` trait.
 
@@ -507,15 +519,15 @@ If you have not typed in (or copied) the code for the tutorial as ``$AKKA_HOME/t
 
 First we need to compile the source file. That is done with Scala's compiler ``scalac``. Our application depends on the ``akka-actor-1.1.jar`` JAR file, so let's add that to the compiler classpath when we compile the source::
 
-    $ scalac -cp dist/akka-actor-1.1.jar tutorial/Pi.scala
+    $ scalac -cp lib/akka/akka-actor-1.1.jar tutorial/Pi.scala
 
 When we have compiled the source file we are ready to run the application. This is done with ``java`` but yet again we need to add the ``akka-actor-1.1.jar`` JAR file to the classpath, and this time we also need to add the Scala runtime library ``scala-library.jar`` and the classes we compiled ourselves::
 
     $ java \
-        -cp dist/akka-actor-1.1.jar:scala-library.jar:tutorial \
+        -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar:. \
         akka.tutorial.first.scala.Pi
-    AKKA_HOME is defined as [/Users/jboner/src/akka-stuff/akka-core]
-    loading config from [/Users/jboner/src/akka-stuff/akka-core/config/akka.conf].
+    AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.1]
+    loading config from [/Users/jboner/tools/akka-actors-1.1/config/akka.conf].
 
     Pi estimate:        3.1435501812459323
     Calculation time:   858 millis
diff --git a/akka-tutorials/akka-tutorial-first/README b/akka-tutorials/akka-tutorial-first/README
new file mode 100644
index 0000000000..f4b42f631f
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/README
@@ -0,0 +1,7 @@
+================
+ First Tutorial
+================
+
+This is the source code for the first tutorial.
+
+See the Akka Documentation for information about this tutorial.
diff --git a/akka-tutorials/akka-tutorial-first/pom.xml b/akka-tutorials/akka-tutorial-first/pom.xml
index e6b1758877..b3e9f7319c 100644
--- a/akka-tutorials/akka-tutorial-first/pom.xml
+++ b/akka-tutorials/akka-tutorial-first/pom.xml
@@ -8,7 +8,7 @@
     <groupId>akka.tutorial.first.java</groupId>
     <artifactId>akka-tutorial-first-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <url>http://akka.io</url>
 
     <dependencies>
@@ -23,7 +23,7 @@
         <repository>
             <id>Akka</id>
             <name>Akka Maven2 Repository</name>
-            <url>http://www.scalablesolutions.se/akka/repository/</url>
+            <url>http://akka.io/repository/</url>
         </repository>
     </repositories>
 
diff --git a/akka-tutorials/akka-tutorial-first/project/build.properties b/akka-tutorials/akka-tutorial-first/project/build.properties
new file mode 100644
index 0000000000..bcee7b19c1
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/build.properties
@@ -0,0 +1,5 @@
+project.organization=akka.tutorial.first.scala
+project.name=akka-tutorial-first-scala
+project.version=1.2-SNAPSHOT
+build.scala.versions=2.9.0.RC3
+sbt.version=0.7.6.RC0
diff --git a/akka-tutorials/akka-tutorial-first/project/build/Project.scala b/akka-tutorials/akka-tutorial-first/project/build/Project.scala
new file mode 100644
index 0000000000..975f2ce970
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/build/Project.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject
diff --git a/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala
new file mode 100644
index 0000000000..aa263a988e
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
+  val akkaRepo   = "Akka Repo" at "http://akka.io/repository"
+  val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.2-SNAPSHOT"
+}
diff --git a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
index 24264b52a7..bb081af751 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
+++ b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
@@ -18,31 +18,6 @@ import akka.routing.UntypedLoadBalancer;
 
 import java.util.concurrent.CountDownLatch;
 
-/**
- * First part in Akka tutorial for Java.
- * <p/>
- * Calculates Pi.
- * <p/>
- * Run on command line:
- * <pre>
- *   $ cd akka-1.1
- *   $ export AKKA_HOME=`pwd`
- *   $ javac -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar akka/tutorial/first/java/Pi.java
- *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.java.Pi
- *   $ ...
- * </pre>
- * <p/>
- * Run it in Maven:
- * <pre>
- *   $ mvn
- *   > scala:console
- *   > val pi = new akka.tutorial.first.java.Pi
- *   > pi.calculate(4, 10000, 10000)
- *   > ...
- * </pre>
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
 public class Pi {
 
   public static void main(String[] args) throws Exception {
diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
index 6164ae00cb..51fcfac45d 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
@@ -12,32 +12,6 @@ import Routing._
 import System.{currentTimeMillis => now}
 import java.util.concurrent.CountDownLatch
 
-/**
- * First part in Akka tutorial.
- * <p/>
- * Calculates Pi.
- * <p/>
- * Run on command line:
- * <pre>
- *   $ cd akka-1.1
- *   $ export AKKA_HOME=`pwd`
- *   $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
- *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.scala.Pi
- *   $ ...
- * </pre>
- * <p/>
- * Run it in SBT:
- * <pre>
- *   $ sbt
- *   > update
- *   > console
- *   > akka.tutorial.first.scala.Pi.calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
- *   > ...
- *   > :quit
- * </pre>
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
 object Pi extends App {
 
   calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
diff --git a/akka-tutorials/akka-tutorial-second/README b/akka-tutorials/akka-tutorial-second/README
new file mode 100644
index 0000000000..ed31bbca22
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-second/README
@@ -0,0 +1,7 @@
+=================
+ Second Tutorial
+=================
+
+This is the source code for the second tutorial.
+
+See the Akka Documentation for information about this tutorial.
diff --git a/akka-tutorials/akka-tutorial-second/pom.xml b/akka-tutorials/akka-tutorial-second/pom.xml
new file mode 100644
index 0000000000..cf7c46fd3b
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-second/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>akka-tutorial-second-java</name>
+    <groupId>akka.tutorial.second.java</groupId>
+    <artifactId>akka-tutorial-second-java</artifactId>
+    <packaging>jar</packaging>
+    <version>1.2-SNAPSHOT</version>
+    <url>http://akka.io</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>se.scalablesolutions.akka</groupId>
+            <artifactId>akka-actor</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>Akka</id>
+            <name>Akka Maven2 Repository</name>
+            <url>http://akka.io/repository/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/akka-tutorials/akka-tutorial-second/project/build.properties b/akka-tutorials/akka-tutorial-second/project/build.properties
new file mode 100644
index 0000000000..ae73049d36
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-second/project/build.properties
@@ -0,0 +1,5 @@
+project.organization=akka.tutorial.second.scala
+project.name=akka-tutorial-second-scala
+project.version=1.2-SNAPSHOT
+build.scala.versions=2.9.0.RC3
+sbt.version=0.7.6.RC0
diff --git a/akka-tutorials/akka-tutorial-second/project/build/Project.scala b/akka-tutorials/akka-tutorial-second/project/build/Project.scala
new file mode 100644
index 0000000000..1d0b230149
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-second/project/build/Project.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class TutorialTwoProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject
diff --git a/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala b/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala
new file mode 100644
index 0000000000..aa263a988e
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
+  val akkaRepo   = "Akka Repo" at "http://akka.io/repository"
+  val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.2-SNAPSHOT"
+}
diff --git a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
index 1829428f5b..c8b47f46a2 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
+++ b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
@@ -20,31 +20,6 @@ import akka.routing.InfiniteIterator;
 import akka.routing.Routing.Broadcast;
 import akka.routing.UntypedLoadBalancer;
 
-/**
- * Second part in Akka tutorial for Java.
- * <p/>
- * Calculates Pi.
- * <p/>
- * Run on command line:
- * <pre>
- *   $ cd akka-1.1
- *   $ export AKKA_HOME=`pwd`
- *   $ javac -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar akka/tutorial/java/second/Pi.java
- *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.java.second.Pi
- *   $ ...
- * </pre>
- * <p/>
- * Run it in Maven:
- * <pre>
- *   $ mvn
- *   > scala:console
- *   > val pi = new akka.tutorial.java.second.Pi
- *   > pi.calculate(4, 10000, 10000)
- *   > ...
- * </pre>
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
 public class Pi {
 
   public static void main(String[] args) throws Exception {
diff --git a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
index f671605359..ff4b8d9c4a 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
@@ -13,32 +13,6 @@ import akka.dispatch.Future
 
 import System.{currentTimeMillis => now}
 
-/**
- * Second part in Akka tutorial.
- * <p/>
- * Calculates Pi.
- * <p/>
- * Run on command line:
- * <pre>
- *   $ cd akka-1.1
- *   $ export AKKA_HOME=`pwd`
- *   $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
- *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.second.Pi
- *   $ ...
- * </pre>
- * <p/>
- * Run it in SBT:
- * <pre>
- *   $ sbt
- *   > update
- *   > console
- *   > akka.tutorial.second.Pi.calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
- *   > ...
- *   > :quit
- * </pre>
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
 object Pi extends App {
 
   calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 746f9d2f39..bab3658c35 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -244,9 +244,9 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
   } dependsOn (docs)
 
   lazy val releaseDownloads = task {
-    val distArchive = akkaDist.akkaCoreDist.distArchive
+    val distArchives = akkaDist.akkaActorsDist.distArchive +++ akkaDist.akkaCoreDist.distArchive
     val downloadsPath = localReleasePath / "downloads"
-    FileUtilities.copy(distArchive.get, downloadsPath, log).left.toOption
+    FileUtilities.copy(distArchives.get, downloadsPath, log).left.toOption
   } dependsOn (dist)
 
   lazy val dist = task { None } // dummy task
@@ -494,6 +494,25 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
     class AkkaActorsDistProject(info: ProjectInfo) extends DefaultProject(info) with DistDocProject {
       def distName = "akka-actors"
       override def distDocName = "akka"
+
+      override def distConfigSources = (akkaParent.info.projectPath / "config") * "*"
+
+      override def distAction = super.distAction dependsOn (distTutorials)
+
+      val distTutorialsPath = distDocPath / "tutorials"
+
+      lazy val distTutorials = task {
+        val tutorials = Set(akka_tutorials.akka_tutorial_first,
+                            akka_tutorials.akka_tutorial_second)
+
+        tutorials.map { tutorial =>
+          val tutorialPath = (tutorial.info.projectPath ##)
+          val tutorialFilterOut = ((tutorial.outputPath ##) ***)
+          val tutorialSources = (tutorialPath ***) --- tutorialFilterOut
+          val tutorialOutputPath = distTutorialsPath / tutorial.name
+          copyPaths(tutorialSources, tutorialOutputPath)
+        }.foldLeft(None: Option[String])(_ orElse _)
+      } dependsOn (distBase)
     }
 
     class AkkaCoreDistProject(info: ProjectInfo)extends DefaultProject(info) with DistProject {

From 5856860061ed881e5e29fcf29f3b6add26aac87c Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 18:49:33 +1200
Subject: [PATCH 14/15] Rework modular dist and include in release build

---
 project/build/AkkaProject.scala | 10 ++++-
 project/build/DistProject.scala | 65 ++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index bab3658c35..497c1cac1d 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -226,7 +226,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
   lazy val buildRelease = task {
     log.info("Built release.")
     None
-  } dependsOn (publishRelease, releaseApi, releaseDocs, releaseDownloads)
+  } dependsOn (publishRelease, releaseApi, releaseDocs, releaseDownloads, releaseDist)
 
   lazy val releaseApi = task {
     val apiSources = ((apiOutputPath ##) ***)
@@ -249,6 +249,12 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
     FileUtilities.copy(distArchives.get, downloadsPath, log).left.toOption
   } dependsOn (dist)
 
+  lazy val releaseDist = task {
+    val distArchives = akkaDist.akkaActorsDist.distExclusiveArchive +++ akkaDist.akkaCoreDist.distExclusiveArchive
+    val distPath = localReleasePath / "dist"
+    FileUtilities.copy(distArchives.get, distPath, log).left.toOption
+  } dependsOn (dist)
+
   lazy val dist = task { None } // dummy task
 
   // -------------------------------------------------------------------------------------------------------------------
@@ -495,7 +501,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
       def distName = "akka-actors"
       override def distDocName = "akka"
 
-      override def distConfigSources = (akkaParent.info.projectPath / "config") * "*"
+      override def distConfigSources = (akkaParent.info.projectPath / "config" ##) * "*"
 
       override def distAction = super.distAction dependsOn (distTutorials)
 
diff --git a/project/build/DistProject.scala b/project/build/DistProject.scala
index df6b348396..5286d582d0 100644
--- a/project/build/DistProject.scala
+++ b/project/build/DistProject.scala
@@ -30,14 +30,17 @@ trait DistProject extends DistBaseProject {
   val distArchiveName = distFullName + ".zip"
   val distArchive = (distOutputBasePath ##) / distArchiveName
 
-  def distConfigSources = info.projectPath / "config" * "*"
-  def distScriptSources = info.projectPath / "scripts" * "*"
+  val distExclusiveOutputBasePath = distOutputBasePath / "exclusive"
+  val distExclusiveOutputPath = (distExclusiveOutputBasePath ##) / distFullName
+  val distExclusiveArchive = (distExclusiveOutputBasePath ##) / distArchiveName
 
-  lazy val distExclusiveProperty = systemOptional[Boolean]("dist.exclusive", false)
+  def distConfigSources = ((info.projectPath / "config" ##) ***)
+  def distScriptSources = ((info.projectPath / "scripts" ##) ***)
 
-  def distExclusive = distExclusiveProperty.value
+  def distAlwaysExclude(path: Path) = path.name == "scala-library.jar"
+  def distAlwaysInclude(path: Path) = distConfigSources.get.toList.map(_.name).contains(path.name)
 
-  def scalaDependency = if (distExclusive) Path.emptyPathFinder else buildLibraryJar
+  def scalaDependency = buildLibraryJar
 
   def allProjectDependencies = topologicalSort.dropRight(1)
 
@@ -48,25 +51,8 @@ trait DistProject extends DistBaseProject {
     })
   }
 
-  def distDependencyJarNames = {
-    val jarNames = distDependencies.flatMap { dist =>
-      (dist.distLibPath ** "*.jar").get.map(_.name) ++
-      (dist.distSrcPath ** "*.jar").get.map(_.name) ++
-      (dist.distDocPath ** "*.jar").get.map(_.name)
-    }
-    Set(jarNames: _*)
-  }
-
   def distClasspath = runClasspath
 
-  def filterOutExcludes(paths: PathFinder) = {
-    if (distExclusive) {
-      val exclude = distDependencyJarNames
-      def include(path: Path) = !exclude(path.name)
-      paths.filter(include)
-    } else paths
-  }
-
   def dependencyJars(filter: Path => Boolean) = distClasspath.filter(filter)
 
   def isJar(path: Path) = path.name.endsWith(".jar")
@@ -88,11 +74,11 @@ trait DistProject extends DistBaseProject {
     }
   }
 
-  def distLibs = filterOutExcludes(dependencyJars(isClassJar) +++ projectDependencyJars(_.jarPath))
+  def distLibs = dependencyJars(isClassJar) +++ projectDependencyJars(_.jarPath)
 
-  def distSrcJars = filterOutExcludes(dependencyJars(isSrcJar) +++ projectDependencyJars(_.packageSrcJar))
+  def distSrcJars = dependencyJars(isSrcJar) +++ projectDependencyJars(_.packageSrcJar)
 
-  def distDocJars = filterOutExcludes(dependencyJars(isDocJar) +++ projectDependencyJars(_.packageDocsJar))
+  def distDocJars = dependencyJars(isDocJar) +++ projectDependencyJars(_.packageDocsJar)
 
   def distShareSources = ((distOutputPath ##) ***)
 
@@ -100,25 +86,36 @@ trait DistProject extends DistBaseProject {
                    describedAs("Create a distribution."))
 
   def distAction = task {
+    def exclusiveDist = {
+      val excludePaths = (distDependencies.map(p => ((p.distOutputPath ##) ***))
+                           .foldLeft(Path.emptyPathFinder)(_ +++ _))
+      val excludeRelativePaths = excludePaths.get.toList.map(_.relativePath)
+      val allDistPaths = ((distOutputPath ##) ***)
+      val includePaths = allDistPaths.filter(path => {
+        distAlwaysInclude(path) || !(distAlwaysExclude(path) || excludeRelativePaths.contains(path.relativePath))
+      })
+      copyPaths(includePaths, distExclusiveOutputPath) orElse
+      FileUtilities.zip(List(distExclusiveOutputPath), distExclusiveArchive, true, log)
+    }
+
     copyFiles(scalaDependency, distScalaLibPath) orElse
     copyFiles(distLibs, distLibPath) orElse
     copyFiles(distSrcJars, distSrcPath) orElse
     copyFiles(distDocJars, distDocJarsPath) orElse
-    copyFiles(distConfigSources, distConfigPath) orElse
+    copyPaths(distConfigSources, distConfigPath) orElse
     copyScripts(distScriptSources, distBinPath) orElse
     copyPaths(distShareSources, distSharePath) orElse
-    FileUtilities.zip(List(distOutputPath), distArchive, true, log)
+    FileUtilities.zip(List(distOutputPath), distArchive, true, log) orElse
+    exclusiveDist
   }
 
   lazy val distBase = distBaseAction dependsOn (distClean) describedAs "Create the dist base."
 
   def distBaseAction = task {
-    if (!distExclusive) {
-      distDependencies.map( dist => {
-        val allFiles = ((dist.distOutputPath ##) ***)
-        copyPaths(allFiles, distOutputPath)
-      }).foldLeft(None: Option[String])(_ orElse _)
-    } else None
+    distDependencies.map( dist => {
+      val allFiles = ((dist.distOutputPath ##) ***)
+      copyPaths(allFiles, distOutputPath)
+    }).foldLeft(None: Option[String])(_ orElse _)
   }
 
   def distDependencyTasks: Seq[ManagedTask] = distDependencies.map(_.dist)
@@ -138,7 +135,7 @@ trait DistProject extends DistBaseProject {
 
   def copyPaths(from: PathFinder, to: Path): Option[String] = {
     if (from.get.isEmpty) None
-    else FileUtilities.copy(from.get, to, log).left.toOption
+    else FileUtilities.copy(from.get, to, true, log).left.toOption
   }
 
   def copyScripts(from: PathFinder, to: Path): Option[String] = {

From aa706a4e1b4a4262035dec6951722421b5be2321 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 10 May 2011 19:35:24 +1200
Subject: [PATCH 15/15] Update tutorial sbt defs to match main project

---
 akka-tutorials/akka-tutorial-first/project/build.properties  | 4 ++--
 akka-tutorials/akka-tutorial-second/project/build.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-tutorials/akka-tutorial-first/project/build.properties b/akka-tutorials/akka-tutorial-first/project/build.properties
index bcee7b19c1..e4ff105728 100644
--- a/akka-tutorials/akka-tutorial-first/project/build.properties
+++ b/akka-tutorials/akka-tutorial-first/project/build.properties
@@ -1,5 +1,5 @@
-project.organization=akka.tutorial.first.scala
-project.name=akka-tutorial-first-scala
+project.organization=se.scalablesolutions.akka
+project.name=akka-tutorial-first
 project.version=1.2-SNAPSHOT
 build.scala.versions=2.9.0.RC3
 sbt.version=0.7.6.RC0
diff --git a/akka-tutorials/akka-tutorial-second/project/build.properties b/akka-tutorials/akka-tutorial-second/project/build.properties
index ae73049d36..0b21be843f 100644
--- a/akka-tutorials/akka-tutorial-second/project/build.properties
+++ b/akka-tutorials/akka-tutorial-second/project/build.properties
@@ -1,5 +1,5 @@
-project.organization=akka.tutorial.second.scala
-project.name=akka-tutorial-second-scala
+project.organization=se.scalablesolutions.akka
+project.name=akka-tutorial-second
 project.version=1.2-SNAPSHOT
 build.scala.versions=2.9.0.RC3
 sbt.version=0.7.6.RC0