From 1be9b86a590bd9f52dce5f2092db2331e8ee27c9 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 16 Jul 2009 23:09:43 +0000
Subject: [PATCH] INT-729 Added log4j configuration to the quote, ws, and xml
 samples.

---
 .../filecopy/src/main/java/log4j.xml          |  4 +++
 .../samples/filecopy/fileCopyDemo-file.xml    |  4 ++-
 .../jms/src/main/java/log4j.xml               |  4 +++
 .../quote/src/main/java/log4j.xml             | 28 +++++++++++++++
 .../ws/src/main/java/log4j.xml                | 36 +++++++++++++++++++
 .../xml/src/main/java/log4j.xml               | 32 +++++++++++++++++
 .../xml/BookOrderProcessingSample.java        |  4 ++-
 .../samples/xml/ExternalResupply.java         |  7 ++--
 .../integration/samples/xml/StockChecker.java |  8 ++---
 .../samples/xml/WarehouseDispatch.java        |  9 +++--
 .../integration/samples/xml/XmlUtil.java      |  9 +++--
 .../samples/xml/orderProcessingSample.xml     |  3 --
 12 files changed, 129 insertions(+), 19 deletions(-)
 create mode 100644 spring-integration-samples/quote/src/main/java/log4j.xml
 create mode 100644 spring-integration-samples/ws/src/main/java/log4j.xml
 create mode 100644 spring-integration-samples/xml/src/main/java/log4j.xml

diff --git a/spring-integration-samples/filecopy/src/main/java/log4j.xml b/spring-integration-samples/filecopy/src/main/java/log4j.xml
index a01d5446a0..c02b7b0de7 100644
--- a/spring-integration-samples/filecopy/src/main/java/log4j.xml
+++ b/spring-integration-samples/filecopy/src/main/java/log4j.xml
@@ -19,6 +19,10 @@
 		<level value="warn" />
 	</logger>
 
+	<logger name="org.springframework.integration.file">
+		<level value="warn" />
+	</logger>
+
 	<!-- Root Logger -->
 	<root>
 		<priority value="warn" />
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index 226265521a..fc81393309 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -23,7 +23,9 @@
 	                               output-channel="filesOut"
                                    ref="handler"/>
 
-	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
+	<file:outbound-channel-adapter id="filesOut"
+								   directory="${java.io.tmpdir}/spring-integration-samples/output"
+								   delete-source-files="true"/>
 
 	<bean id="handler" class="org.springframework.integration.samples.filecopy.Handler"/>
 
diff --git a/spring-integration-samples/jms/src/main/java/log4j.xml b/spring-integration-samples/jms/src/main/java/log4j.xml
index fc52ec6bf8..a54abb801d 100644
--- a/spring-integration-samples/jms/src/main/java/log4j.xml
+++ b/spring-integration-samples/jms/src/main/java/log4j.xml
@@ -19,6 +19,10 @@
 		<level value="warn" />
 	</logger>
 
+	<logger name="org.springframework.integration.jms">
+		<level value="warn" />
+	</logger>
+
 	<logger name="org.apache.activemq">
 		<level value="warn" />
 	</logger>
diff --git a/spring-integration-samples/quote/src/main/java/log4j.xml b/spring-integration-samples/quote/src/main/java/log4j.xml
new file mode 100644
index 0000000000..3865c97d90
--- /dev/null
+++ b/spring-integration-samples/quote/src/main/java/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">
+		<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/ws/src/main/java/log4j.xml b/spring-integration-samples/ws/src/main/java/log4j.xml
new file mode 100644
index 0000000000..6cb1544ee3
--- /dev/null
+++ b/spring-integration-samples/ws/src/main/java/log4j.xml
@@ -0,0 +1,36 @@
+<?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.ws">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.integration">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.integration.ws">
+		<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/xml/src/main/java/log4j.xml b/spring-integration-samples/xml/src/main/java/log4j.xml
new file mode 100644
index 0000000000..da6411c70a
--- /dev/null
+++ b/spring-integration-samples/xml/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.springframework.integration.xml">
+		<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/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
index aa125fb833..2a49334cc3 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
@@ -13,18 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.xml;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.w3c.dom.Document;
+
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.message.GenericMessage;
-import org.w3c.dom.Document;
 
 /**
  * This example demonstrates the processing of an order for books using 
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
index c6bde97bd1..c8ca802412 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.xml;
 
 import org.w3c.dom.Document;
 
 public class ExternalResupply {
-	
-	public void orderResupply(Document resupplyOrder){
+
+	public void orderResupply(Document resupplyOrder) {
 		System.out.println("Placing resupply order: " + XmlUtil.docAsString(resupplyOrder));
 	}
 
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
index c57f2bbfb5..2891551308 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.xml;
 
-import org.springframework.xml.xpath.XPathExpression;
 import org.w3c.dom.Document;
 
+import org.springframework.xml.xpath.XPathExpression;
+
 /**
- * 
  * @author Jonas Partner
- * 
  */
 public class StockChecker {
 
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
index e74192d019..4409a8b91a 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.xml;
 
 import org.w3c.dom.Document;
 
 public class WarehouseDispatch {
-	
+
 	public void dispatch(Document orderItem){
 		System.out.println("Warehouse dispatching orderItem: " + XmlUtil.docAsString(orderItem));
 	}
-	
-	
-	
+
 }
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
index ce0e8956c1..b341b12219 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.xml;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 
-import org.springframework.xml.transform.StringResult;
 import org.w3c.dom.Document;
 
+import org.springframework.xml.transform.StringResult;
+
+/**
+ * @author Jonas Partner
+ */
 public class XmlUtil {
 
 	public static String docAsString(Document doc) {
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
index a6eef4f16a..2d4d058c68 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
@@ -69,7 +69,4 @@
 	<si:outbound-channel-adapter ref="externalResupply" method="orderResupply" channel="resupplyOrderChannel" />
 	<bean id="externalResupply" class="org.springframework.integration.samples.xml.ExternalResupply" />
 
-
-
 </beans>
-