You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2010/11/22 19:26:32 UTC
svn commit: r1037821 - in /qpid/branches/0.8-release-candidates/qpid: ./
bin/ cpp/docs/api/ cpp/examples/tradedemo/ cpp/include/qmf/engine/ cpp/src/
cpp/src/qmf/engine/ cpp/src/qpid/cluster/ cpp/src/qpid/management/
cpp/src/qpid/store/ms-clfs/ cpp/src/...
Author: rhs
Date: Mon Nov 22 18:26:29 2010
New Revision: 1037821
URL: http://svn.apache.org/viewvc?rev=1037821&view=rev
Log:
merged 1033975 from trunk, this fixes QPID-2914
Modified:
qpid/branches/0.8-release-candidates/qpid/ (props changed)
qpid/branches/0.8-release-candidates/qpid/bin/ (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/ (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/CMakeLists.txt (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp (props changed)
qpid/branches/0.8-release-candidates/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/0.8-release-candidates/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/0.8-release-candidates/qpid/dotnet/build-nant-release (props changed)
qpid/branches/0.8-release-candidates/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/0.8-release-candidates/qpid/java/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/bin/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/client/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/client/src/main/java/client.log4j (props changed)
qpid/branches/0.8-release-candidates/qpid/java/integrationtests/src/resources/sustained-log4j.xml (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/client/etc/qman.log4j (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/0.8-release-candidates/qpid/java/perftests/etc/perftests.log4j (props changed)
qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/systests.log4j (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/0.8-release-candidates/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/tools/etc/test.log4j (props changed)
qpid/branches/0.8-release-candidates/qpid/packaging/windows/ (props changed)
qpid/branches/0.8-release-candidates/qpid/python/ (props changed)
qpid/branches/0.8-release-candidates/qpid/python/examples/api/spout (props changed)
qpid/branches/0.8-release-candidates/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/0.8-release-candidates/qpid/python/qpid/messaging/address.py
qpid/branches/0.8-release-candidates/qpid/python/qpid/tests/messaging/address.py
qpid/branches/0.8-release-candidates/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/0.8-release-candidates/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/0.8-release-candidates/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/0.6-release-windows-installer:926803
/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
+/qpid/trunk/qpid:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/bin:926803
/qpid/branches/0.6-release-windows-installer/qpid/bin:926803,927233
/qpid/branches/java-network-refactor/qpid/bin:805429-825319
-/qpid/trunk/qpid/bin:1035031
+/qpid/trunk/qpid/bin:1033975,1035031
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/docs/api:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/docs/api:926803,927233
/qpid/branches/java-network-refactor/qpid/cpp/docs/api:805429-825319
-/qpid/trunk/qpid/cpp/docs/api:1035509
+/qpid/trunk/qpid/cpp/docs/api:1033975,1035509
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:805429-825319
+/qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/src/CMakeLists.txt:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/CMakeLists.txt:926803,927233,932132
/qpid/branches/java-network-refactor/qpid/cpp/src/CMakeLists.txt:805429-825319
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803,927233
/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:805429-825319
-/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:1034586
+/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:1033975,1034586
Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/dotnet/build-msbuild.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/dotnet/build-msbuild.bat:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/dotnet/build-nant-release
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/dotnet/build-nant-release:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/dotnet/build-nant.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/dotnet/build-nant.bat:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1035026
+/qpid/trunk/qpid/java:1033975,1035026
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1035026,1035880
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1033975,1035026,1035880
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
/qpid/branches/java-broker-0-10/qpid/java/broker/bin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/bin:805429-821809
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/management:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/management:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:787599
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1 +1,2 @@
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/client:795950-829653
/qpid/branches/java-network-refactor/qpid/java/client:805429-821809
/qpid/trunk/qpid/client:796646-796653
-/qpid/trunk/qpid/java/client:1035027-1035028
+/qpid/trunk/qpid/java/client:1033975,1035027-1035028
Propchange: qpid/branches/0.8-release-candidates/qpid/java/client/src/main/java/client.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,3 +3,4 @@
/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
+/qpid/trunk/qpid/java/client/src/main/java/client.log4j:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/integrationtests/src/resources/sustained-log4j.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -3,3 +3,4 @@
/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
+/qpid/trunk/qpid/java/integrationtests/src/resources/sustained-log4j.xml:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/client/etc/qman.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,5 @@
/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/java/management/client/etc/qman.log4j:1033975
/qpid/trunk/qpid/management/client/etc/qman.log4j:796646-796653
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/client/src/main/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:443187-703176
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/main/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/main/java/org/apache/qpid/management:805429-821809
+/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/client/src/test/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:443187-703176
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/test/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/test/java/org/apache/qpid/management:805429-821809
+/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:805429-821809
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/management/eclipse-plugin/src:788755
+/qpid/trunk/qpid/java/management/eclipse-plugin/src:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:805429-821809
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:805429-821809
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:805429-821809
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:805429-821809
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:805429-821809
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/perftests/etc/perftests.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,5 @@
/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/java/perftests/etc/perftests.log4j:1033975
/qpid/trunk/qpid/perftests/etc/perftests.log4j:796646-796653
Propchange: qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:443187-707694
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:805429-821809
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,5 @@
/qpid/branches/0.5.x-dev/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:886720-886722
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:805429-821809
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1033975
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Propchange: qpid/branches/0.8-release-candidates/qpid/java/systests/src/main/java/systests.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,5 @@
/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/java/systests/src/main/java/systests.log4j:1033975
/qpid/trunk/qpid/systests/src/main/java/systests.log4j:796646-796653
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1 +1,2 @@
/qpid/branches/0.5.x-dev/qpid/java/test-profiles:931179
+/qpid/trunk/qpid/java/test-profiles:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/010Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/Excludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/Excludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08Excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaStandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08TransientExcludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/XAExcludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/XAExcludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/clean-dir:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/clean-dir:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/clean-dir:805429-821809
+/qpid/trunk/qpid/java/test-profiles/clean-dir:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.async.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.cluster.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/0.5.x-dev/qpid/java/test-profiles/log4j-test.xml:931179
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-821809
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
+/qpid/trunk/qpid/java/test-profiles/test_resources:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/java/tools/etc/test.log4j
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,4 +2,5 @@
/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/java/tools/etc/test.log4j:1033975
/qpid/trunk/qpid/tools/etc/test.log4j:796646-796653
Propchange: qpid/branches/0.8-release-candidates/qpid/packaging/windows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -2,3 +2,4 @@
/qpid/branches/0.6-release-windows-installer/packaging/windows:926803
/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926803,926865,927233
/qpid/branches/java-network-refactor/qpid/packaging/windows:805429-825319
+/qpid/trunk/qpid/packaging/windows:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,3 +1,4 @@
/qpid/branches/0.5.x-dev/qpid/python:892761,894875
/qpid/branches/java-network-refactor/qpid/python:805429-825319
/qpid/branches/qmfv2/qpid/python:902858,902894
+/qpid/trunk/qpid/python:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/python/examples/api/spout
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,2 +1,3 @@
/qpid/branches/qmfv2/qpid/python/examples/api/spout:902858,902894
/qpid/branches/qpid.rnr/python/examples/api/spout:894071-896158
+/qpid/trunk/qpid/python/examples/api/spout:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,2 +1,3 @@
/qpid/branches/qmfv2/qpid/python/qpid/concurrency.py:902858,902894
/qpid/branches/qpid.rnr/python/qpid/concurrency.py:894071-896158
+/qpid/trunk/qpid/python/qpid/concurrency.py:1033975
Modified: qpid/branches/0.8-release-candidates/qpid/python/qpid/messaging/address.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/python/qpid/messaging/address.py?rev=1037821&r1=1037820&r2=1037821&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/python/qpid/messaging/address.py (original)
+++ qpid/branches/0.8-release-candidates/qpid/python/qpid/messaging/address.py Mon Nov 22 18:26:29 2010
@@ -33,6 +33,7 @@ COMMA = l.define("COMMA", r",")
NUMBER = l.define("NUMBER", r'[+-]?[0-9]*\.?[0-9]+')
TRUE = l.define("TRUE", r'True')
FALSE = l.define("FALSE", r'False')
+NONE = l.define("NONE", r'None')
ID = l.define("ID", r'[a-zA-Z_](?:[a-zA-Z0-9_-]*[a-zA-Z0-9_])?')
STRING = l.define("STRING", r""""(?:[^\\"]|\\.)*"|'(?:[^\\']|\\.)*'""")
ESC = l.define("ESC", r"\\[^ux]|\\x[0-9a-fA-F][0-9a-fA-F]|\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]")
@@ -65,6 +66,8 @@ def tok2obj(tok):
return True
elif tok.type == FALSE:
return False
+ elif tok.type == NONE:
+ return None
else:
return tok.value
@@ -133,7 +136,7 @@ class AddressParser(Parser):
return (key, val)
def value(self):
- if self.matches(NUMBER, STRING, ID, TRUE, FALSE):
+ if self.matches(NUMBER, STRING, ID, TRUE, FALSE, NONE):
return tok2obj(self.eat())
elif self.matches(LBRACE):
return self.map()
Modified: qpid/branches/0.8-release-candidates/qpid/python/qpid/tests/messaging/address.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/python/qpid/tests/messaging/address.py?rev=1037821&r1=1037820&r2=1037821&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/python/qpid/tests/messaging/address.py (original)
+++ qpid/branches/0.8-release-candidates/qpid/python/qpid/tests/messaging/address.py Mon Nov 22 18:26:29 2010
@@ -19,8 +19,8 @@
from qpid.tests import Test
-from qpid.messaging.address import lex, parse, ParseError, EOF, ID, NUMBER, SYM, WSPACE, \
- LEXER
+from qpid.messaging.address import lex, parse, ParseError, EOF, ID, NONE, \
+ NUMBER, SYM, WSPACE, LEXER
from qpid.lexer import Token
from qpid.harness import Skipped
from qpid.tests.parser import ParserBase
@@ -149,6 +149,9 @@ class AddressTests(ParserBase, Test):
def testNegativeNum(self):
self.lex("-3", NUMBER)
+ def testNone(self):
+ self.lex("None", NONE)
+
def testHash(self):
self.valid("foo/bar.#", "foo", "bar.#")
@@ -166,6 +169,10 @@ class AddressTests(ParserBase, Test):
self.valid("name/subject; {key: value,}", "name", "subject",
{"key": "value"})
+ def testOptionsNone(self):
+ self.valid("name/subject; {key: None}", "name", "subject",
+ {"key": None})
+
def testSemiSubject(self):
self.valid("foo.bar/'baz.qux;moo:arf'; {key: value}",
"foo.bar", "baz.qux;moo:arf", {"key": "value"})
Propchange: qpid/branches/0.8-release-candidates/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:1033975
Propchange: qpid/branches/0.8-release-candidates/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 22 18:26:29 2010
@@ -1,2 +1,3 @@
/qpid/branches/qmfv2/qpid/python/tests_0-9/queue.py:902858,902894
/qpid/branches/qpid.rnr/python/tests_0-9/queue.py:894071-896158
+/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:1033975
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org