From b54382efae19fbb0a10ec1a91b269ccd5c30c458 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 16 Jul 2009 21:11:14 +0000
Subject: [PATCH] Added log4j to parent pom for samples, and replaced the
 inbound-channel-adapter with message-driven-channel-adapter in the JMS
 ChannelAdapterDemo sample.

---
 .../jms/src/main/java/log4j.xml               | 32 +++++++++++++++++++
 .../samples/jms/inboundChannelAdapter.xml     |  4 ++-
 spring-integration-samples/pom.xml            | 20 ++++++------
 3 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 spring-integration-samples/jms/src/main/java/log4j.xml

diff --git a/spring-integration-samples/jms/src/main/java/log4j.xml b/spring-integration-samples/jms/src/main/java/log4j.xml
new file mode 100644
index 0000000000..fc52ec6bf8
--- /dev/null
+++ b/spring-integration-samples/jms/src/main/java/log4j.xml
@@ -0,0 +1,32 @@
+<?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">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.apache.activemq">
+		<level value="warn" />
+	</logger>
+	
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>
\ No newline at end of file
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
index e00ad285cb..f7cff51de7 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
@@ -13,7 +13,9 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<jms:inbound-channel-adapter id="jmsin" destination="requestQueue" channel="jmsinToStdoutChannel"/>
+	<jms:message-driven-channel-adapter id="jmsin"
+			destination="requestQueue"
+			channel="jmsinToStdoutChannel"/>
 
 	<channel id="jmsinToStdoutChannel"/>
 
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index bf8fd59d7c..28746e05d2 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -9,7 +9,7 @@
 	<packaging>pom</packaging>
 	<name>Spring Integration Samples</name>
 	<properties>
-		<release.version>1.0.3.BUILD-SNAPSHOT</release.version>
+		<release.version>1.0.3.RELEASE</release.version>
 	</properties>
 	<modules>
 		<module>cafe</module>
@@ -24,18 +24,11 @@
 	</modules>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>org.springframework.integration.stream</artifactId>
-			<version>${release.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>org.springframework.integration</artifactId>
 			<version>${release.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>org.springframework.integration.adapter</artifactId>
@@ -81,6 +74,11 @@
 			<artifactId>org.springframework.integration.security</artifactId>
 			<version>${release.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>org.springframework.integration.stream</artifactId>
+			<version>${release.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>org.springframework.integration.ws</artifactId>
@@ -91,7 +89,11 @@
 			<artifactId>org.springframework.integration.xml</artifactId>
 			<version>${release.version}</version>
 		</dependency>
-		<!--  -->
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<version>1.2.15</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>