From 3577dbe1cbeb716f954db51e57d8634d5c96c7ea Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Tue, 17 Jan 2012 14:24:33 -0500
Subject: [PATCH] INTSAMPLES-48 Decided to continue to use Log4J

---
 basic/jms/pom.xml                        | 12 +---------
 basic/jms/src/main/resources/log4j.xml   | 28 ++++++++++++++++++++++++
 basic/jms/src/main/resources/logback.xml | 24 --------------------
 3 files changed, 29 insertions(+), 35 deletions(-)
 create mode 100644 basic/jms/src/main/resources/log4j.xml
 delete mode 100644 basic/jms/src/main/resources/logback.xml

diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 452e5da1..cae18afb 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -60,19 +60,9 @@
 			<version>${spring.integration.version}</version>
 		</dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
 
diff --git a/basic/jms/src/main/resources/log4j.xml b/basic/jms/src/main/resources/log4j.xml
new file mode 100644
index 00000000..f391e2ed
--- /dev/null
+++ b/basic/jms/src/main/resources/log4j.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+
+	<!-- Loggers -->
+	<logger name="org.springframework">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.integration.samples">
+		<level value="debug" />
+	</logger>
+
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>
\ No newline at end of file
diff --git a/basic/jms/src/main/resources/logback.xml b/basic/jms/src/main/resources/logback.xml
deleted file mode 100644
index eee6b966..00000000
--- a/basic/jms/src/main/resources/logback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<configuration>
-
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d %5p | %t | %-55logger{55} | %m %n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework.integration">
-        <level value="INFO" />
-    </logger>
-
-    <logger name="org.springframework">
-        <level value="INFO" />
-    </logger>
-
-    <root>
-        <level value="INFO" />
-        <appender-ref ref="CONSOLE" />
-    </root>
-
-</configuration>