From d175bd1d962bbbb9a45315089fed7a53f7b2a881 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Fri, 28 May 2010 22:08:22 +1200
Subject: [PATCH] Correct fix for no logging on sbt run

---
 akka-core/src/main/scala/config/Config.scala  |  2 +-
 .../src/main/resources/akka.conf              | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 akka-samples/akka-sample-ants/src/main/resources/akka.conf

diff --git a/akka-core/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala
index 34b2402d08..b5de27a669 100644
--- a/akka-core/src/main/scala/config/Config.scala
+++ b/akka-core/src/main/scala/config/Config.scala
@@ -43,7 +43,7 @@ object Config extends Logging {
           "\n\tdue to: " + e.toString)
       }
       Configgy.config
-    } else if (getClass.getClassLoader.getResource("/akka.conf") != null) {
+    } else if (getClass.getClassLoader.getResource("akka.conf") != null) {
       try {
         Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
         log.info("Config loaded from the application classpath.")
diff --git a/akka-samples/akka-sample-ants/src/main/resources/akka.conf b/akka-samples/akka-sample-ants/src/main/resources/akka.conf
deleted file mode 100644
index bcd5a09255..0000000000
--- a/akka-samples/akka-sample-ants/src/main/resources/akka.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<log>
-  level = "off"
-  console = off
-</log>
- 
-<akka>
-  version = "0.9"
- 
-  <actor>
-    timeout = 5000
-    serialize-messages = off
-  </actor>
- 
-  <stm>
-    service = on
-    fair = on           
-    max-nr-of-retries = 10
-    timeout = 1000
-  </stm>
-</akka>