From d1dd81e2b4960d477b8ee78f394aaa84d0632434 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 2 Apr 2007 10:59:45 +0000
Subject: [PATCH] Fixed #SWS-93: new location for log4j.properties

---
 changelog.txt                                     |  3 +++
 samples/airline/pom.xml                           |  3 ++-
 .../airline/src/main/resources/log4j.properties   |  7 +++++++
 .../src/main/webapp/WEB-INF/log4j.properties      | 15 ---------------
 samples/airline/src/main/webapp/WEB-INF/web.xml   |  7 -------
 5 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 samples/airline/src/main/resources/log4j.properties
 delete mode 100644 samples/airline/src/main/webapp/WEB-INF/log4j.properties

diff --git a/changelog.txt b/changelog.txt
index d60840ce..13bc5d16 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -39,6 +39,9 @@ Package org.springframework.ws.wsdl.wsdl11.builder
 Package org.springframework.xml.stream
 * prefixed all abstract classes with Abstract
 
+Samples
+* fixed #SWS-93: new location for log4j.properties
+
 Changes in version 1.0-M3
 -------------------------
 Package org.springframework.oxm.castor
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 7f26cf94..67e57e8b 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -269,6 +269,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -333,4 +334,4 @@
             <version>0.8</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/airline/src/main/resources/log4j.properties b/samples/airline/src/main/resources/log4j.properties
new file mode 100644
index 00000000..0f73a758
--- /dev/null
+++ b/samples/airline/src/main/resources/log4j.properties
@@ -0,0 +1,7 @@
+log4j.rootLogger=WARN, stdout
+log4j.logger.org.springframework.ws=DEBUG
+log4j.logger.org.springframework.xml=DEBUG
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/airline/src/main/webapp/WEB-INF/log4j.properties b/samples/airline/src/main/webapp/WEB-INF/log4j.properties
deleted file mode 100644
index f8c051ec..00000000
--- a/samples/airline/src/main/webapp/WEB-INF/log4j.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-log4j.rootLogger=WARN, stdout, logfile
-log4j.logger.org.springframework.oxm=DEBUG
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${airline.root}/WEB-INF/airline.log
-log4j.appender.logfile.MaxFileSize=512KB
-log4j.appender.logfile.MaxBackupIndex=3
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/airline/src/main/webapp/WEB-INF/web.xml b/samples/airline/src/main/webapp/WEB-INF/web.xml
index 38dcdf50..4c28e975 100644
--- a/samples/airline/src/main/webapp/WEB-INF/web.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/web.xml
@@ -8,10 +8,6 @@
         <param-name>webAppRootKey</param-name>
         <param-value>airline.root</param-value>
     </context-param>
-    <context-param>
-        <param-name>log4jConfigLocation</param-name>
-        <param-value>/WEB-INF/log4j.properties</param-value>
-    </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>
@@ -22,9 +18,6 @@
             classpath:org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
         </param-value>
     </context-param>
-    <listener>
-        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-    </listener>
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>