From 4341d72ec40f8579db0c6e2a4f094dc71fe0e74a Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Fri, 21 Jun 2013 15:39:15 -0400
Subject: [PATCH] VIVO-18 Rename Log4J properties file

---
 webapp/build.xml                                             | 2 +-
 webapp/config/{default.log4j.properties => log4j.properties} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename webapp/config/{default.log4j.properties => log4j.properties} (97%)

diff --git a/webapp/build.xml b/webapp/build.xml
index fdf4a7a70..3e15fe901 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -167,7 +167,7 @@
 		</copy>
 
 		<!-- use the production Log4J properties, unless a debug version exists. -->
-		<condition property="log4j.properties.file" value="debug.log4j.properties" else="default.log4j.properties">
+		<condition property="log4j.properties.file" value="debug.log4j.properties" else="log4j.properties">
 			<available file="${appbase.dir}/config/debug.log4j.properties" />
 		</condition>
 		<copy file="${appbase.dir}/config/${log4j.properties.file}" 
diff --git a/webapp/config/default.log4j.properties b/webapp/config/log4j.properties
similarity index 97%
rename from webapp/config/default.log4j.properties
rename to webapp/config/log4j.properties
index 5dd5339b1..b5cf2bf83 100644
--- a/webapp/config/default.log4j.properties
+++ b/webapp/config/log4j.properties
@@ -20,7 +20,7 @@
 # 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.
+# The "production" version of this file is 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