You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2011/03/09 17:15:34 UTC
svn commit: r1079865 - in /qpid/branches/0.10/qpid: ./ cpp/examples/
cpp/examples/old_api/tradedemo/ cpp/include/qmf/engine/ cpp/src/
cpp/src/qmf/engine/ cpp/src/qpid/cluster/ cpp/src/qpid/management/
cpp/src/tests/ doc/book/src/ dotnet/ java/ java/bro...
Author: kgiusti
Date: Wed Mar 9 16:15:32 2011
New Revision: 1079865
URL: http://svn.apache.org/viewvc?rev=1079865&view=rev
Log:
QPID-3128: merge to 0.10 branch.
Added:
qpid/branches/0.10/qpid/doc/book/src/producer-flow-control.xml
- copied unchanged from r1079830, qpid/trunk/qpid/doc/book/src/producer-flow-control.xml
Modified:
qpid/branches/0.10/qpid/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/branches/0.10/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/0.10/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/0.10/qpid/cpp/src/CMakeLists.txt (props changed)
qpid/branches/0.10/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed)
qpid/branches/0.10/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
qpid/branches/0.10/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
qpid/branches/0.10/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/0.10/qpid/dotnet/build-nant-release (props changed)
qpid/branches/0.10/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/0.10/qpid/java/ (props changed)
qpid/branches/0.10/qpid/java/broker/ (props changed)
qpid/branches/0.10/qpid/java/broker/bin/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/0.10/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.10/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/ (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/0.10/qpid/java/test-profiles/ (props changed)
qpid/branches/0.10/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.10/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/0.10/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.10/qpid/packaging/windows/ (props changed)
qpid/branches/0.10/qpid/python/ (props changed)
qpid/branches/0.10/qpid/python/examples/api/spout (props changed)
qpid/branches/0.10/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/0.10/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/0.10/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/0.10/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
/qpid/branches/qpid-2935/qpid:1061302-1072333
-/qpid/trunk/qpid:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples:926803,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/examples:1061302-1072333
-/qpid/trunk/qpid/cpp/examples:1078099,1079385,1079590
+/qpid/trunk/qpid/cpp/examples:1078099,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/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/branches/qpid-2935/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1061302-1072333
-/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h:1061302-1072333
-/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h:1061302-1072333
-/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/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/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333
-/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qmf/engine/Agent.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.h:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/tests/cluster_tests.py:1061302-1072333
-/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1078075,1078733,1078743,1079385,1079590,1079830
Modified: qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml?rev=1079865&r1=1079864&r2=1079865&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml (original)
+++ qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml Wed Mar 9 16:15:32 2011
@@ -56,6 +56,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="LVQ.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue-state-replication.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting-a-cluster.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="producer-flow-control.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Compatibility.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Interoperability-Documentation.xml"/>
Modified: qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml?rev=1079865&r1=1079864&r2=1079865&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml (original)
+++ qpid/branches/0.10/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml Wed Mar 9 16:15:32 2011
@@ -50,7 +50,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="LVQ.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue-state-replication.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting-a-cluster.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ACL.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ACL.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="producer-flow-control.xml"/>
</chapter>
Modified: qpid/branches/0.10/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml?rev=1079865&r1=1079864&r2=1079865&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml (original)
+++ qpid/branches/0.10/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml Wed Mar 9 16:15:32 2011
@@ -65,6 +65,16 @@
</itemizedlist>
</para></listitem>
</itemizedlist>
+
+ <para>
+ The 0.10 C++ Broker supports the following additional Queue configuration options:
+ </para>
+ <itemizedlist>
+ <listitem><para>
+ <xref linkend="producer-flow-control"/>
+ </para></listitem>
+ </itemizedlist>
+
<section role="h3" id="CheatSheetforconfiguringQueueOptions-ApplyingQueueSizingConstraints"><title>
Applying Queue Sizing Constraints
</title>
Propchange: qpid/branches/0.10/qpid/dotnet/build-msbuild.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-msbuild.bat:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-msbuild.bat:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/dotnet/build-msbuild.bat:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/dotnet/build-nant-release
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-nant-release:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-nant-release:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/dotnet/build-nant-release:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/dotnet/build-nant.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-nant.bat:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-nant.bat:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/dotnet/build-nant.bat:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -4,4 +4,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
/qpid/branches/qpid-2935/qpid/java/broker:1061302-1072333
-/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,1078075,1078733,1078743,1079385,1079590
+/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,1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/bin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/bin:805429-821809
/qpid/branches/qpid-2935/qpid/java/broker/bin:1061302-1072333
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -4,4 +4,4 @@
/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/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/management:1061302-1072333
-/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,1078075,1078733,1078743,1079385,1079590
+/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,1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -4,4 +4,4 @@
/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/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:1061302-1072333
-/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,1078075,1078733,1078743,1079385,1079590
+/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,1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1061302-1072333
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/client/src/main/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/client/src/main/java/org/apache/qpid/management:1061302-1072333
-/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/client/src/test/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/client/src/test/java/org/apache/qpid/management:1061302-1072333
-/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1061302-1072333
/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,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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1061302-1072333
/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-747869,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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,5 +3,5 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin:1077869,1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin:1077869,1078075,1078733,1078743,1079385,1079590,1079830
/qpid/trunk/qpid/management/eclipse-plugin:796646-796653
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src:1077869,1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src:1077869,1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1061302-1072333
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,5 +3,5 @@
/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/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1072333
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1078075,1078733,1078743,1079385,1079590,1079830
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Propchange: qpid/branches/0.10/qpid/java/test-profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev/qpid/java/test-profiles:931179
/qpid/branches/qpid-2935/qpid/java/test-profiles:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/08StandaloneExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/CPPExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/Excludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/Excludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/Excludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/JavaExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaStandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/JavaStandaloneExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/JavaTransientExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/XAExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/XAExcludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/clean-dir:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/clean-dir:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/clean-dir:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.async.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.cluster.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.noprefetch.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.excludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/cpp.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/default.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/default.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/java.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java.testprofile:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/log4j-test.xml:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/test-provider.properties:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/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/branches/qpid-2935/qpid/java/test-profiles/test_resources:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test_resources:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/java/test-profiles/test_resources:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/packaging/windows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926865,927233
/qpid/branches/java-network-refactor/qpid/packaging/windows:805429-825319
/qpid/branches/qpid-2935/qpid/packaging/windows:1061302-1072333
-/qpid/trunk/qpid/packaging/windows:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/packaging/windows:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/python:805429-825319
/qpid/branches/qmfv2/qpid/python:902858,902894
/qpid/branches/qpid-2935/qpid/python:1061302-1072333
-/qpid/trunk/qpid/python:1078075,1078733,1078743,1079385,1079434,1079590
+/qpid/trunk/qpid/python:1078075,1078733,1078743,1079385,1079434,1079590,1079830
Propchange: qpid/branches/0.10/qpid/python/examples/api/spout
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,4 +1,4 @@
/qpid/branches/qmfv2/qpid/python/examples/api/spout:902858,902894
/qpid/branches/qpid-2935/qpid/python/examples/api/spout:1061302-1072333
/qpid/branches/qpid.rnr/python/examples/api/spout:894071-896158
-/qpid/trunk/qpid/python/examples/api/spout:1078075,1078733,1078743,1079385,1079434,1079590
+/qpid/trunk/qpid/python/examples/api/spout:1078075,1078733,1078743,1079385,1079434,1079590,1079830
Propchange: qpid/branches/0.10/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,4 +1,4 @@
/qpid/branches/qmfv2/qpid/python/qpid/concurrency.py:902858,902894
/qpid/branches/qpid-2935/qpid/python/qpid/concurrency.py:1061302-1072333
/qpid/branches/qpid.rnr/python/qpid/concurrency.py:894071-896158
-/qpid/trunk/qpid/python/qpid/concurrency.py:1078075,1078733,1078743,1079385,1079434,1079590
+/qpid/trunk/qpid/python/qpid/concurrency.py:1078075,1078733,1078743,1079385,1079434,1079590,1079830
Propchange: qpid/branches/0.10/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/ruby/ext/sasl/extconf.rb:1061302-1072333
-/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:1078075,1078733,1078743,1079385,1079590,1079830
Propchange: qpid/branches/0.10/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:15:32 2011
@@ -1,4 +1,4 @@
/qpid/branches/qmfv2/qpid/python/tests_0-9/queue.py:902858,902894
/qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:1061302-1072333
/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:1078075,1078733,1078743,1079385,1079590
+/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:1078075,1078733,1078743,1079385,1079590,1079830
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org