Author: robbie
Date: Wed Nov 28 19:11:36 2012
New Revision: 1414871
URL: http://svn.apache.org/viewvc?rev=1414871&view=rev
Log:
QPID-4474: quote the name within the JMX ObjectName for the BDBHAMessageStore
MBean
merge from trunk r1413676
Modified:
qpid/branches/0.20/qpid/ (props changed)
qpid/branches/0.20/qpid/cpp/docs/api/ (props changed)
qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
(props changed)
qpid/branches/0.20/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/0.20/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/0.20/qpid/cpp/src/ (props changed)
qpid/branches/0.20/qpid/cpp/src/CMakeLists.txt (props changed)
qpid/branches/0.20/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/0.20/qpid/cpp/src/qpid/acl/ (props changed)
qpid/branches/0.20/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/0.20/qpid/cpp/src/qpid/management/ManagementAgent.cpp
(props changed)
qpid/branches/0.20/qpid/cpp/src/qpid/management/ManagementAgent.h (props
changed)
qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
(props changed)
qpid/branches/0.20/qpid/cpp/src/tests/ (props changed)
qpid/branches/0.20/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/0.20/qpid/doc/book/ (props changed)
qpid/branches/0.20/qpid/doc/book/src/java-broker/ (props changed)
qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
qpid/branches/0.20/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
qpid/branches/0.20/qpid/java/ (props changed)
qpid/branches/0.20/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/0.20/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/0.20/qpid/java/bdbstore/ (props changed)
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
qpid/branches/0.20/qpid/java/broker/ (props changed)
qpid/branches/0.20/qpid/java/broker-plugins/management-http/ (props
changed)
qpid/branches/0.20/qpid/java/broker/bin/ (props changed)
qpid/branches/0.20/qpid/java/broker/src/ (props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
(props changed)
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
(props changed)
qpid/branches/0.20/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(props changed)
qpid/branches/0.20/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/ (props changed)
qpid/branches/0.20/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.20/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.20/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/0.20/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.20/qpid/java/test-profiles/JavaPre010Excludes (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/JavaTransientExcludes (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.async.testprofile (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.cluster.testprofile (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.noprefetch.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.ssl.excludes (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.ssl.testprofile (props
changed)
qpid/branches/0.20/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-dby.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/java-mms.0-9-1.testprofile
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.20/qpid/java/test-profiles/test-provider.properties
(props changed)
qpid/branches/0.20/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.20/qpid/java/test-profiles/testprofile.defaults (props
changed)
qpid/branches/0.20/qpid/packaging/windows/ (props changed)
qpid/branches/0.20/qpid/packaging/windows/installer.proj (props changed)
qpid/branches/0.20/qpid/python/ (props changed)
qpid/branches/0.20/qpid/python/examples/api/spout (props changed)
qpid/branches/0.20/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/0.20/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
(props changed)
Propchange: qpid/branches/0.20/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/docs/api/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/docs/api:r1413676
Propchange:
qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/CMakeLists.txt:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/qpid/acl/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/acl:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:r1413676
Propchange:
qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/tests/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests:r1413676
Propchange: qpid/branches/0.20/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:r1413676
Propchange: qpid/branches/0.20/qpid/doc/book/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/doc/book:r1413676
Propchange: qpid/branches/0.20/qpid/doc/book/src/java-broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/doc/book/src/java-broker:r1413676
Modified:
qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
(original)
+++
qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
Wed Nov 28 19:11:36 2012
@@ -506,7 +506,7 @@ amqp://guest:guest@clientid/test?brokerl
<para>Qpid exposes the BDB HA store information via its JMX interface and
provides APIs to remove a Node from
the group, update a Node IP address, and assign a Node as the designated
primary.</para>
<para>An instance of the <classname>BDBHAMessageStore</classname> MBean is
instantiated by the broker for the each virtualhost using the HA store.</para>
- <para>The reference to this MBean can be obtained via JMX API using an
ObjectName like
<emphasis>org.apache.qpid:type=BDBHAMessageStore,name=<virtualhost
name></emphasis>
+ <para>The reference to this MBean can be obtained via JMX API using an
ObjectName like
<emphasis>org.apache.qpid:type=BDBHAMessageStore,name="<virtualhost
name>"</emphasis>
where <virtualhost name> is the name of a specific
virtualhost on the broker.</para>
<table border="1">
<title>Mbean <classname>BDBHAMessageStore</classname> attributes</title>
@@ -630,7 +630,7 @@ JMXServiceURL url = new JMXServiceURL("
JMXConnector jmxConnector = JMXConnectorFactory.connect(url, environment);
MBeanServerConnection mbsc = jmxConnector.getMBeanServerConnection();
-ObjectName queueObjectName = new
ObjectName("org.apache.qpid:type=BDBHAMessageStore,name=test");
+ObjectName queueObjectName = new
ObjectName("org.apache.qpid:type=BDBHAMessageStore,name=\"test\"");
String state = (String)mbsc.getAttribute(queueObjectName, "NodeState");
System.out.println("Node state:" + state);
Modified:
qpid/branches/0.20/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
Files
qpid/branches/0.20/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
(original) and
qpid/branches/0.20/qpid/doc/book/src/java-broker/images/HA-BDBHAMessageStore-MBean-jconsole.png
Wed Nov 28 19:11:36 2012 differ
Propchange: qpid/branches/0.20/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1413676
Propchange: qpid/branches/0.20/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1413676
Propchange: qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1413676
Propchange: qpid/branches/0.20/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1413676
Propchange: qpid/branches/0.20/qpid/java/bdbstore/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/bdbstore:r1413676
Modified:
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
(original)
+++
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
Wed Nov 28 19:11:36 2012
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import javax.management.JMException;
+import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.CompositeType;
@@ -91,7 +92,7 @@ public class BDBHAMessageStoreManagerMBe
@Override
public String getObjectInstanceName()
{
- return _store.getName();
+ return ObjectName.quote(_store.getName());
}
@Override
Modified:
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
(original)
+++
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java
Wed Nov 28 19:11:36 2012
@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.Set;
import javax.jms.Connection;
+import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
@@ -54,7 +55,7 @@ public class HAClusterManagementTest ext
private static final Set<String> NON_MASTER_STATES = new
HashSet<String>(Arrays.asList(REPLICA.toString(), DETACHED.toString(),
UNKNOWN.toString()));;
private static final String VIRTUAL_HOST = "test";
- private static final String MANAGED_OBJECT_QUERY =
"org.apache.qpid:type=BDBHAMessageStore,name=" + VIRTUAL_HOST;
+ private static final String MANAGED_OBJECT_QUERY =
"org.apache.qpid:type=BDBHAMessageStore,name=" + ObjectName.quote(VIRTUAL_HOST);
private static final int NUMBER_OF_NODES = 4;
private final HATestClusterCreator _clusterCreator = new
HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES);
Modified:
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
(original)
+++
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
Wed Nov 28 19:11:36 2012
@@ -27,6 +27,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Session;
+import javax.management.ObjectName;
import org.apache.qpid.jms.ConnectionURL;
import org.apache.qpid.server.store.berkeleydb.jmx.ManagedBDBHAMessageStore;
@@ -41,7 +42,7 @@ public class HAClusterTwoNodeTest extend
private static final String VIRTUAL_HOST = "test";
- private static final String MANAGED_OBJECT_QUERY =
"org.apache.qpid:type=BDBHAMessageStore,name=" + VIRTUAL_HOST;
+ private static final String MANAGED_OBJECT_QUERY =
"org.apache.qpid:type=BDBHAMessageStore,name=" + ObjectName.quote(VIRTUAL_HOST);
private static final int NUMBER_OF_NODES = 2;
private final HATestClusterCreator _clusterCreator = new
HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES);
Modified:
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java?rev=1414871&r1=1414870&r2=1414871&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
(original)
+++
qpid/branches/0.20/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
Wed Nov 28 19:11:36 2012
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import javax.management.JMException;
+import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeType;
import javax.management.openmbean.TabularData;
@@ -84,7 +85,7 @@ public class BDBHAMessageStoreManagerMBe
{
when(_store.getName()).thenReturn(TEST_STORE_NAME);
- String expectedObjectName =
"org.apache.qpid:type=BDBHAMessageStore,name=" + TEST_STORE_NAME;
+ String expectedObjectName =
"org.apache.qpid:type=BDBHAMessageStore,name=" +
ObjectName.quote(TEST_STORE_NAME);
assertEquals(expectedObjectName, _mBean.getObjectName().toString());
}
Propchange: qpid/branches/0.20/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1413676
Propchange: qpid/branches/0.20/qpid/java/broker-plugins/management-http/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-plugins/management-http:r1413676
Propchange: qpid/branches/0.20/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1413676
Propchange: qpid/branches/0.20/qpid/java/broker/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1413676
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1413676
Propchange:
qpid/branches/0.20/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1413676
Propchange:
qpid/branches/0.20/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1413676
Propchange: qpid/branches/0.20/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1413676
Propchange: qpid/branches/0.20/qpid/packaging/windows/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows:r1413676
Propchange: qpid/branches/0.20/qpid/packaging/windows/installer.proj
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows/installer.proj:r1413676
Propchange: qpid/branches/0.20/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1413676
Propchange: qpid/branches/0.20/qpid/python/examples/api/spout
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/examples/api/spout:r1413676
Propchange: qpid/branches/0.20/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1413676
Propchange: qpid/branches/0.20/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:r1413676
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
