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 2010/06/04 16:37:50 UTC
svn commit: r951419 - in /qpid/trunk/qpid/java:
client/src/main/java/client.log4j
integrationtests/src/resources/sustained-log4j.xml
management/client/etc/qman.log4j perftests/etc/perftests.log4j
systests/src/main/java/systests.log4j tools/etc/test.log4j
Author: robbie
Date: Fri Jun 4 14:37:50 2010
New Revision: 951419
URL: http://svn.apache.org/viewvc?rev=951419&view=rev
Log:
QPID-2599: restore log4j settings files which are not named log4j.xml or log4j.properties and so need not be removed completely since they wont be automatically applied by log4j if found on the classpath like the others will
Added:
qpid/trunk/qpid/java/client/src/main/java/client.log4j (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/client/src/main/java/client.log4j
qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml
qpid/trunk/qpid/java/management/client/etc/qman.log4j (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/management/client/etc/qman.log4j
qpid/trunk/qpid/java/perftests/etc/perftests.log4j (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/perftests/etc/perftests.log4j
qpid/trunk/qpid/java/systests/src/main/java/systests.log4j (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/systests/src/main/java/systests.log4j
qpid/trunk/qpid/java/tools/etc/test.log4j (props changed)
- copied unchanged from r943338, qpid/trunk/qpid/java/tools/etc/test.log4j
Propchange: qpid/trunk/qpid/java/client/src/main/java/client.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/client/src/main/java/client.log4j:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/client.log4j:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/client.log4j:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/client/src/main/java/client.log4j:805429-821809
+/qpid/trunk/qpid/client/src/main/java/client.log4j:796646-796653
Propchange: qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/integrationtests/src/resources/sustained-log4j.xml:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/integrationtests/src/resources/sustained-log4j.xml:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/integrationtests/src/resources/sustained-log4j.xml:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/integrationtests/src/resources/sustained-log4j.xml:805429-821809
+/qpid/trunk/qpid/integrationtests/src/resources/sustained-log4j.xml:796646-796653
Propchange: qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: qpid/trunk/qpid/java/management/client/etc/qman.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/management/client/etc/qman.log4j:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/management/client/etc/qman.log4j:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/management/client/etc/qman.log4j:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/management/client/etc/qman.log4j:805429-821809
+/qpid/trunk/qpid/management/client/etc/qman.log4j:796646-796653
Propchange: qpid/trunk/qpid/java/perftests/etc/perftests.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/perftests/etc/perftests.log4j:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/perftests/etc/perftests.log4j:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/perftests/etc/perftests.log4j:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/perftests/etc/perftests.log4j:805429-821809
+/qpid/trunk/qpid/perftests/etc/perftests.log4j:796646-796653
Propchange: qpid/trunk/qpid/java/systests/src/main/java/systests.log4j
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/trunk/qpid/java/systests/src/main/java/systests.log4j
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: qpid/trunk/qpid/java/systests/src/main/java/systests.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/systests.log4j:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/0.5.x-dev/systests/src/main/java/systests.log4j:886720-886722
+/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/systests.log4j:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/systests.log4j:805429-821809
+/qpid/trunk/qpid/systests/src/main/java/systests.log4j:796646-796653
Propchange: qpid/trunk/qpid/java/systests/src/main/java/systests.log4j
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: qpid/trunk/qpid/java/tools/etc/test.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 4 14:37:50 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/qpid/java/tools/etc/test.log4j:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/0.5.x-dev/tools/etc/test.log4j:886720-886722
+/qpid/branches/java-broker-0-10/qpid/java/tools/etc/test.log4j:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/tools/etc/test.log4j:805429-821809
+/qpid/trunk/qpid/tools/etc/test.log4j:796646-796653
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org