QPID-3761: rename the fallback config to ensure it isnt just picked up by Log4J automatically scanning the classpath

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1232031 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 8 deletions

diff --git a/java/broker/src/main/java/log4j.properties b/java/broker/src/main/java/fallback-log4j.properties
index 6788c65463..7b95a89924 100644
--- a/java/broker/src/main/java/log4j.properties
+++ b/java/broker/src/main/java/fallback-log4j.properties
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/java/broker/src/main/java/org/apache/qpid/server/Broker.java b/java/broker/src/main/java/org/apache/qpid/server/Broker.java
index 1632effaf0..6a135d1196 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/Broker.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/Broker.java
@@ -409,12 +409,12 @@ public class Broker
         else
         {
             System.err.println("Logging configuration error: unable to read file " + logConfigFile.getAbsolutePath());
-            System.err.println("Using the fallback internal log4j.properties configuration");
+            System.err.println("Using the fallback internal fallback-log4j.properties configuration");
 
-            InputStream propsFile = this.getClass().getResourceAsStream("/log4j.properties");
+            InputStream propsFile = this.getClass().getResourceAsStream("/fallback-log4j.properties");
             if(propsFile == null)
             {
-                throw new IOException("Unable to load the fallback internal log4j.properties configuration file");
+                throw new IOException("Unable to load the fallback internal fallback-log4j.properties configuration file");
             }
             else
             {
diff --git a/java/client/test/example_build.xml b/java/client/test/example_build.xml
index 329c12982c..dda3cb4263 100644
--- a/java/client/test/example_build.xml
+++ b/java/client/test/example_build.xml
@@ -73,7 +73,7 @@
         </javac>
 
         <copy todir="${example.classes}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
+            <!-- copy any non java src files into the build tree, e.g. properties files -->
             <fileset dir="${example.src}">
                 <exclude name="**/*.java"/>
                 <exclude name="**/package.html"/>
diff --git a/java/module.xml b/java/module.xml
index 349fb91e4a..a3b8606525 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -264,7 +264,7 @@
       <classpath refid="module.class.path"/>
     </javac>
 
-    <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
+    <!-- copy any non java src files into the build tree, e.g. properties files -->
     <copy todir="${module.classes}" verbose="true">
       <fileset dir="${module.src}">
         <exclude name="**/*.java"/>
@@ -285,7 +285,7 @@
       <classpath refid="module.test.path"/>
     </javac>
 
-    <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
+    <!-- copy any non java src files into the build tree, e.g. properties files -->
     <copy todir="${module.test.classes}" verbose="true">
       <fileset dir="${module.test.src}">
         <exclude name="**/*.java"/>