Merge branch 'master' of git@github.com:jboner/akka

akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala

@@ -34,6 +34,7 @@ trait ThreadPoolBuilder {
   def buildThreadPool(): Unit = synchronized {
     ensureNotActive
     inProcessOfBuilding = false
+    threadPoolBuilder.allowCoreThreadTimeOut(true)
     if (boundedExecutorBound > 0) {
       val boundedExecutor = new BoundedExecutorDecorator(threadPoolBuilder, boundedExecutorBound)
       boundedExecutorBound = -1

project/build/AkkaProject.scala

@@ -269,16 +269,17 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     " dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version)
     )
 
-  override def runClasspath = super.runClasspath +++
-                              descendents(info.projectPath / "config", "*")
-
   //Exclude slf4j1.5.11 from the classpath, it's conflicting...
   override def fullClasspath(config: Configuration): PathFinder = {
-    super.fullClasspath(config) --- (super.fullClasspath(config) ** "slf4j*1.5.11.jar")
+    super.fullClasspath(config) ---
+    (super.fullClasspath(config) ** "slf4j*1.5.11.jar")
   }
 
   override def mainResources = super.mainResources +++
-                               descendents(info.projectPath / "config", "*")
+                               descendents(info.projectPath / "config", "*") ---
+                               (info.projectPath / "config" / "logback-test.xml")
+
+  override def testResources = super.testResources +++ (info.projectPath / "config" / "logback-test.xml")
 
   // ------------------------------------------------------------
   // publishing