You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/01/16 16:40:14 UTC

svn commit: r1232031 - in /qpid/trunk/qpid/java: broker/src/main/java/fallback-log4j.properties broker/src/main/java/log4j.properties broker/src/main/java/org/apache/qpid/server/Broker.java client/test/example_build.xml module.xml

Author: robbie
Date: Mon Jan 16 15:40:13 2012
New Revision: 1232031

URL: http://svn.apache.org/viewvc?rev=1232031&view=rev
Log:
QPID-3761: rename the fallback config to ensure it isnt just picked up by Log4J automatically scanning the classpath

Added:
    qpid/trunk/qpid/java/broker/src/main/java/fallback-log4j.properties
      - copied, changed from r1232022, qpid/trunk/qpid/java/broker/src/main/java/log4j.properties
Removed:
    qpid/trunk/qpid/java/broker/src/main/java/log4j.properties
Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
    qpid/trunk/qpid/java/client/test/example_build.xml
    qpid/trunk/qpid/java/module.xml

Copied: qpid/trunk/qpid/java/broker/src/main/java/fallback-log4j.properties (from r1232022, qpid/trunk/qpid/java/broker/src/main/java/log4j.properties)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/fallback-log4j.properties?p2=qpid/trunk/qpid/java/broker/src/main/java/fallback-log4j.properties&p1=qpid/trunk/qpid/java/broker/src/main/java/log4j.properties&r1=1232022&r2=1232031&rev=1232031&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/log4j.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/fallback-log4j.properties Mon Jan 16 15:40:13 2012
@@ -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

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java?rev=1232031&r1=1232030&r2=1232031&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java Mon Jan 16 15:40:13 2012
@@ -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
             {

Modified: qpid/trunk/qpid/java/client/test/example_build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/test/example_build.xml?rev=1232031&r1=1232030&r2=1232031&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/test/example_build.xml (original)
+++ qpid/trunk/qpid/java/client/test/example_build.xml Mon Jan 16 15:40:13 2012
@@ -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"/>

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1232031&r1=1232030&r2=1232031&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Mon Jan 16 15:40:13 2012
@@ -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"/>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org