From b090f873af8a4484a0a65b5304b1eafc202b00a8 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Fri, 4 Mar 2011 18:04:15 +0100
Subject: [PATCH] Remove logback config

---
 config/logback-test.xml         | 26 --------------------------
 config/logback.xml              | 30 ------------------------------
 project/build/AkkaProject.scala |  2 --
 scripts/akka-init-script.sh     |  4 +---
 4 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 config/logback-test.xml
 delete mode 100644 config/logback.xml

diff --git a/config/logback-test.xml b/config/logback-test.xml
deleted file mode 100644
index 0a8d97ad51..0000000000
--- a/config/logback-test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration scan="false" debug="false">
-  <!-- Errors were reported during translation. -->
-  <!-- Could not find transformer for org.apache.log4j.SimpleLayout -->
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>[%4p] [%d{ISO8601}] [%t] %c{1}: %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="akka" level="DEBUG"/>
-
-  <logger name="org.mortbay.log" level="ERROR"/>
-  <logger name="org.apache.jasper" level="ERROR"/>
-
-  <root level="DEBUG">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>
diff --git a/config/logback.xml b/config/logback.xml
deleted file mode 100644
index 403062049f..0000000000
--- a/config/logback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration scan="false" debug="false">
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>[%t] [%4p] [%d{ISO8601}] %c{1}: %m%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="R" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>./logs/akka.log</File>
-    <encoder>
-      <pattern>[%t] [%4p] [%d{ISO8601}] %c{1}: %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>./logs/akka.log.slf4j.%d{yyyy-MM-dd-HH}</fileNamePattern>
-    </rollingPolicy>
-  </appender>
-  <logger name="akka" level="INFO"/>
-  <root level="INFO">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="R"/>
-  </root>
-</configuration>
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 5293175c33..5101863efa 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -213,8 +213,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     (super.fullClasspath(config) ** "slf4j*1.5.11.jar")
   }
 
-//  override def mainResources = super.mainResources +++ (info.projectPath / "config").descendentsExcept("*", "logback-test.xml")
-
 //  override def runClasspath = super.runClasspath +++ "config"
 
   // ------------------------------------------------------------
diff --git a/scripts/akka-init-script.sh b/scripts/akka-init-script.sh
index 752d675b55..3a1474d04a 100644
--- a/scripts/akka-init-script.sh
+++ b/scripts/akka-init-script.sh
@@ -10,9 +10,7 @@ NAME="cool"
 DAEMON=/usr/bin/java
 export AKKA_HOME=/var/.../servers/akka
 AKKA_JAR=$AKKA_HOME/akka.jar
-LOGBACK=$AKKA_HOME/config/logback.xml
-JVMFLAGS="-Xms512M -Xmx3072M -XX:+UseConcMarkSweepGC -
-Dlogback.configurationFile="$LOGBACK
+JVMFLAGS="-Xms512M -Xmx3072M -XX:+UseConcMarkSweepGC"
 DAEMON_ARGS=$JVMFLAGS" -jar "$AKKA_JAR
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME