diff --git a/akka-core/src/main/resources/logback.xml b/akka-core/src/main/resources/logback.xml
deleted file mode 100644
index 4635396601..0000000000
--- a/akka-core/src/main/resources/logback.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- [%4p] [%d{ISO8601}] [%t] %c{1}: %m%n
-
-
-
- ./logs/akka.log
-
- [%4p] [%d{ISO8601}] [%t] %c{1}: %m%n
-
-
- ./logs/akka.log.%d{yyyy-MM-dd-HH}
-
-
-
-
-
-
-
-
diff --git a/akka-core/src/test/resources/logback-test.xml b/akka-core/src/test/resources/logback-test.xml
deleted file mode 100644
index 78eae40ec4..0000000000
--- a/akka-core/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- [%4p] [%d{ISO8601}] [%t] %c{1}: %m%n
-
-
-
-
-
-
-
diff --git a/config/logback.xml b/config/logback.xml
index 1ace0bfd8f..3e6ba75548 100644
--- a/config/logback.xml
+++ b/config/logback.xml
@@ -22,7 +22,7 @@
./logs/akka.log.%d{yyyy-MM-dd-HH}
-
+
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 4503357db6..0d0a9e00cb 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -250,6 +250,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
.filter(!_.getName.contains("scala-library"))
.map("lib_managed/scala_%s/compile/".format(buildScalaVersion) + _.getName)
.mkString(" ") +
+ " config/" +
" scala-library.jar" +
" dist/akka-core_%s-%s.jar".format(buildScalaVersion, version) +
" dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) +
@@ -271,10 +272,9 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
}
override def mainResources = super.mainResources +++
- descendents(info.projectPath / "config", "*") ---
- (super.mainResources ** "logback-test.xml")
+ (info.projectPath / "config").descendentsExcept("*", "logback-test.xml")
- override def testResources = super.testResources --- (super.testResources ** "logback-test.xml")
+ override def runClasspath = super.runClasspath +++ "config"
// ------------------------------------------------------------
// publishing
@@ -730,6 +730,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
// ------------------------------------------------------------
class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject with OSGiProject {
+ override def runClasspath = super.runClasspath +++ (AkkaParentProject.this.info.projectPath / "config")
+ override def testClasspath = super.testClasspath +++ (AkkaParentProject.this.info.projectPath / "config")
override def packageDocsJar = this.defaultJarPath("-docs.jar")
override def packageSrcJar = this.defaultJarPath("-sources.jar")
}