From c4062267bdb3db58723aa87089d5cfe9b77f1485 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 7 Jun 2010 15:47:43 +0000
Subject: [PATCH] NIHVIVO-405 modify build.xml to recognize
 debug.log4j.properties if it exists, and to use it instead of
 default.log4j.properties. Clean up svn:ignore properties in webapp/config

---
 webapp/build.xml                       | 13 ++++++++++---
 webapp/config/default.log4j.properties |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/webapp/build.xml b/webapp/build.xml
index c253da84a..d7e0e94dc 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -203,9 +203,16 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			<fileset dir="${webapp.dir}" includes="submodels/**/*" />
 		</copy>
 
-		<copy file="${webapp.dir}/config/default.log4j.properties"
-		      tofile="${build.dir}/war/WEB-INF/classes/log4j.properties"
-		      filtering="true">
+		<!-- use the production Log4J properties, unless a debug version exists. -->
+		<available file="${webapp.dir}/config/debug.log4j.properties"
+		           property="debug.log4j.exists" />
+		<copy tofile="${build.dir}/war/WEB-INF/classes/log4j.properties"
+		      filtering="true"
+		      overwrite="true">
+			<fileset dir="${webapp.dir}/config">
+				<include name="default.log4j.properties" unless="debug.log4j.exists" />
+				<include name="debug.log4j.properties" if="debug.log4j.exists" />
+			</fileset>
 			<filterchain>
 				<expandproperties />
 			</filterchain>
diff --git a/webapp/config/default.log4j.properties b/webapp/config/default.log4j.properties
index 802c5c656..e55941a39 100644
--- a/webapp/config/default.log4j.properties
+++ b/webapp/config/default.log4j.properties
@@ -19,6 +19,9 @@
 #
 # More information can be found here:
 # http://logging.apache.org/log4j/1.2/manual.html
+#
+# The "production" version of this file is default.log4j.properties.
+# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
  
 log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
 log4j.appender.AllAppender.File= ${tomcat.home}/logs/${webapp.name}.all.log