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

---
 doc/other_servlet_containers.html |  4 ++--
 doc/upgrade-1.6.html              | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/other_servlet_containers.html b/doc/other_servlet_containers.html
index b4fb09bc..9106d737 100644
--- a/doc/other_servlet_containers.html
+++ b/doc/other_servlet_containers.html
@@ -77,9 +77,9 @@
             	<h4>Logging properties for VIVO</h4>
             	<p>
             	    The logging properties for VIVO are determined by the file 
-            	    <code>[vitro-core]/webapp/config/default.log4j.properties</code>.
+            	    <code>[vitro-core]/webapp/config/log4j.properties</code>.
             	    <em>(Note: if <code>debug.log4j.properties</code> exists, 
-            	    it will override <code>default.log4j.properties</code>).</em>  
+            	    it will override <code>log4j.properties</code>).</em>  
             	</p>
             	<p> 
             	    Notice how the location of the log file is determined:
diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html
index bbb4f8b9..d45cc691 100644
--- a/doc/upgrade-1.6.html
+++ b/doc/upgrade-1.6.html
@@ -42,6 +42,7 @@
 	                    <ol class="roman2">
 	                        <li><a href="#more_portable">VIVO becomes more portable</a></li>
 	                        <li><a href="#solr_insecure">Solr is no longer secured</a></li>
+	                        <li><a href="#log4j_properties">Log4J properties file renamed</a></li>
 	                        <li><a href="#BOGUS">ANYTHING ELSE?</a></li>
 	                    </ol>
 					</li>					
@@ -156,6 +157,18 @@
              	            Sites that need to secure Solr are now left to their own devices.
              	        </p>
 
+                	    <h4 id="log4j_properties">Log4J properties file renamed</h4>
+             	        <p>
+             	            In previous releases, the properties file for the VIVO logging system
+             	            was called <code>default.log4j.properties</code>. In release 1.6, this
+             	            file has been renamed to <code>log4j.properties</code>. This is so the 
+             	            developers and implementers will know where to look for the file.
+             	        </p>
+             	        <p>
+             	            Note that <code>debug.log4j.properties</code>, if present, will still 
+             	            override the default.
+             	        </p>
+
                 	    <h4 id="BOGUS">ANYTHING ELSE?</h4>
              	        <p>
              	        </p>