From d62c74d1379dbccead1428b95d4135f4e96c52ee Mon Sep 17 00:00:00 2001
From: Christos KK Loverdos <loverdos@gmail.com>
Date: Mon, 2 Apr 2012 14:53:25 +0300
Subject: [PATCH] Using SLF4J with logback-classic

---
 make-dist.sh                        |   18 +++++++++---------
 pom.xml                             |   10 +++++-----
 src/main/resources/log4j.properties |    9 ---------
 src/main/resources/logback.xml      |   18 ++++++++++++++++++
 src/test/resources/log4j.properties |   10 ----------
 src/test/resources/logback.xml      |   18 ++++++++++++++++++
 6 files changed, 50 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/resources/log4j.properties
 create mode 100644 src/main/resources/logback.xml
 delete mode 100644 src/test/resources/log4j.properties
 create mode 100644 src/test/resources/logback.xml

diff --git a/make-dist.sh b/make-dist.sh
index 600d6cd..dde86aa 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -56,10 +56,10 @@ verbose() {
 }
 
 verbose_p() {
-  verbose "Build type       :" $P_BUILD
-  verbose "Custom properties:" $P_PROPS
-  verbose "Keep dist/ folder:" $P_KEEPDIST
-  verbose "Fake it          :" $P_FAKEIT
+  verbose "Build type          :" $P_BUILD
+  verbose "Custom configuration:" $P_PROPS
+  verbose "Keep dist/ folder   :" $P_KEEPDIST
+  verbose "Fake it             :" $P_FAKEIT
 }
 
 fail() {
@@ -126,7 +126,7 @@ collectconf() {
   echo
   echo Copying config files from $CONF_SRC
   echo
-  cp $CONF_SRC/log4j.properties $DIST/conf|| fail "copying log4j.properties"
+  cp $CONF_SRC/logback.xml $DIST/conf|| fail "copying logback.xml"
   cp $CONF_SRC/policy.yaml $DIST/conf || fail "copying policy.yaml"
   cp $CONF_SRC/roles-agreements.map $DIST/conf || fail "copying roles-agreements.map"
 
@@ -166,28 +166,28 @@ usage() {
   echo "  -b TYPE   Use build TYPE. One of 'normal', 'fast'."
   echo "            'normal' is the default and can be omitted."
   echo "            'fast' means that it will not run mvn clean."
+  echo "  -c FILE   Use FILE as aquarium.properties configuration."
   echo "  -k        Keep generated dist folder."
   echo "  -h        Show this message."
   echo "  -n        As in make -n."
-  echo "  -p FILE   Use FILE as aquarium.properties."
   echo "  -v        Be verbose."
 
   exit 0
 }
 
-while getopts ":b:hkp:nv" opt
+while getopts ":b:hkc:nv" opt
 do
   case $opt in
     b) P_BUILD=$OPTARG
     ;;
+    c) P_PROPS=$OPTARG
+    ;;
     h) usage
     ;;
     k) P_KEEPDIST="yes"
     ;;
     n) P_FAKEIT="yes"
     ;;
-    p) P_PROPS=$OPTARG
-    ;;
     v) P_VERBOSE="yes"
     ;;
     :) ERROR="Option -$OPTARG requires an argument. Aborting..."
diff --git a/pom.xml b/pom.xml
index b9f67aa..d7ad62b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,11 @@
       <version>1.6.1</version>
     </dependency>
     <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.29</version>
+    </dependency>
+    <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-compiler</artifactId>
       <version>${scala.version}</version>
@@ -164,11 +169,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.3</version>
-    </dependency>
-    <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-json_2.9.1</artifactId>
       <version>2.4</version>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index 1bb98a0..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-log4j.rootLogger=DEBUG,console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%-5p] %d %t %F:%L - %m%n
-log4j.appender.console.threshold=DEBUG
-
-log4j.logger.com.ckkloverdos=INFO
-
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..0ba7fe9
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-5level %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="ch.qos.logback" level="DEBUG"/>
+
+  <logger name="com.ckkloverdos" level="INFO"/>
+  
+  <logger name="gr.grnet" level="DEBUG"/>
+
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index f2611ce..0000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-log4j.rootLogger=DEBUG,console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-#log4j.appender.console.layout.ConversionPattern=%-5p %d %m%n
-log4j.appender.console.layout.ConversionPattern=[%-5p] [%d] [%F:%L] %m%n
-log4j.appender.console.threshold=DEBUG
-
-log4j.logger.com.ckkloverdos=INFO
-log4j.logger.cc.spray.can.HttpClient=DEBUG
\ No newline at end of file
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
new file mode 100644
index 0000000..9bcafde
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-5level %d{HH:mm:ss} %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="ch.qos.logback" level="DEBUG"/>
+
+  <logger name="com.ckkloverdos" level="INFO"/>
+
+  <logger name="gr.grnet" level="DEBUG"/>
+
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
-- 
1.7.10.4