From cfa68f54b3e0a133c06ec5df7d6dea968695b7e7 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 12 Aug 2010 13:38:13 +0200
Subject: [PATCH 1/2] Moving logback-test.xml to /config

---
 .../src/test/resources => config}/logback-test.xml    |  0
 project/build/AkkaProject.scala                       | 11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename {akka-core/src/test/resources => config}/logback-test.xml (100%)

diff --git a/akka-core/src/test/resources/logback-test.xml b/config/logback-test.xml
similarity index 100%
rename from akka-core/src/test/resources/logback-test.xml
rename to config/logback-test.xml
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 7140c40895..e0874b9e9c 100644
--- a/project/build/AkkaProject.scala
+++ b/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

From b5b6574912a47a1d23a5b36aa5a38322e073a692 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 12 Aug 2010 13:39:20 +0200
Subject: [PATCH 2/2] Allow core threads to time out in dispatchers

---
 akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala
index 55755250e2..6f8da64073 100644
--- a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala
+++ b/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