Author: robbie
Date: Fri Aug 3 09:25:06 2012
New Revision: 1368844
URL: http://svn.apache.org/viewvc?rev=1368844&view=rev
Log:
QPID-4182: Set the default minimumAlertRepeatGap value to 30 seconds
Applied patch from Philip Harvey <p...@philharveyonline.com> and Oleksandr
Rudyy<oru...@gmail.com>
merged from trunk r1368506
Modified:
qpid/branches/0.18/qpid/java/ (props changed)
qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/0.18/qpid/java/broker/ (props changed)
qpid/branches/0.18/qpid/java/broker/bin/ (props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
(props changed)
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
(props changed)
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
(props changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props
changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
(props changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
(props changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
(props changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
(props changed)
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
(props changed)
qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(props changed)
qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/ (props changed)
qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile (props
changed)
qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties
(props changed)
qpid/branches/0.18/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults (props
changed)
Propchange: qpid/branches/0.18/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1368506
Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1368506
Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1368506
Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1368506
Propchange: qpid/branches/0.18/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1368506
Propchange: qpid/branches/0.18/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1368506
Modified:
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1368844&r1=1368843&r2=1368844&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Fri Aug 3 09:25:06 2012
@@ -66,6 +66,7 @@ public class ServerConfiguration extends
public static final int JMXPORT_CONNECTORSERVER_OFFSET = 100;
public static final int DEFAULT_HTTP_MANAGEMENT_PORT = 8080;
public static final int DEFAULT_HTTPS_MANAGEMENT_PORT = 8443;
+ public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 30000l;
public static final String QPID_HOME = "QPID_HOME";
public static final String QPID_WORK = "QPID_WORK";
@@ -713,7 +714,7 @@ public class ServerConfiguration extends
public long getMinimumAlertRepeatGap()
{
- return getLongValue("minimumAlertRepeatGap");
+ return getLongValue("minimumAlertRepeatGap",
DEFAULT_MINIMUM_ALERT_REPEAT_GAP);
}
public long getCapacity()
Modified:
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1368844&r1=1368843&r2=1368844&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
(original)
+++
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Fri Aug 3 09:25:06 2012
@@ -270,7 +270,7 @@ public class VirtualHostConfiguration ex
public Long getMinimumAlertRepeatGap()
{
- return getLongValue("queues.minimumAlertRepeatGap");
+ return getLongValue("queues.minimumAlertRepeatGap",
ApplicationRegistry.getInstance().getConfiguration().getMinimumAlertRepeatGap());
}
public long getCapacity()
Propchange:
qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Modified:
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java?rev=1368844&r1=1368843&r2=1368844&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
(original)
+++
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
Fri Aug 3 09:25:06 2012
@@ -176,20 +176,29 @@ public class QueueConfigurationTest exte
assertEquals(1, qConf.getMaximumMessageCount());
}
- public void testGetMinimumAlertRepeatGap() throws ConfigurationException
+ public void testGetMinimumAlertRepeatGap() throws Exception
{
- // Check default value
- QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
- assertEquals(0, qConf.getMinimumAlertRepeatGap());
-
- // Check explicit value
- VirtualHostConfiguration vhostConfig =
overrideConfiguration("minimumAlertRepeatGap", 2);
- qConf = new QueueConfiguration("test", vhostConfig);
- assertEquals(2, qConf.getMinimumAlertRepeatGap());
-
- // Check inherited value
- qConf = new QueueConfiguration("test", _fullHostConf);
- assertEquals(1, qConf.getMinimumAlertRepeatGap());
+ try
+ {
+ ApplicationRegistry registry = new TestApplicationRegistry(new
ServerConfiguration(_env));
+ ApplicationRegistry.initialise(registry);
+ // Check default value
+ QueueConfiguration qConf = new QueueConfiguration("test",
_emptyConf);
+ assertEquals(ServerConfiguration.DEFAULT_MINIMUM_ALERT_REPEAT_GAP,
qConf.getMinimumAlertRepeatGap());
+
+ // Check explicit value
+ VirtualHostConfiguration vhostConfig =
overrideConfiguration("minimumAlertRepeatGap", 2);
+ qConf = new QueueConfiguration("test", vhostConfig);
+ assertEquals(2, qConf.getMinimumAlertRepeatGap());
+
+ // Check inherited value
+ qConf = new QueueConfiguration("test", _fullHostConf);
+ assertEquals(1, qConf.getMinimumAlertRepeatGap());
+ }
+ finally
+ {
+ ApplicationRegistry.remove();
+ }
}
public void testSortQueueConfiguration() throws ConfigurationException
Modified:
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=1368844&r1=1368843&r2=1368844&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
(original)
+++
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Fri Aug 3 09:25:06 2012
@@ -394,7 +394,7 @@ public class ServerConfigurationTest ext
{
// Check default
_serverConfig.initialise();
- assertEquals(0, _serverConfig.getMinimumAlertRepeatGap());
+ assertEquals(30000l, _serverConfig.getMinimumAlertRepeatGap());
// Check value we set
_config.setProperty("minimumAlertRepeatGap", 10L);
Propchange:
qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1368506
Propchange:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1368506
Propchange:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1368506
Propchange:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1368506
Propchange:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1368506
Propchange:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1368506
Propchange:
qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1368506
Propchange:
qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1368506
Propchange:
qpid/branches/0.18/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:r1368506
Propchange:
qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1368506
Propchange: qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1368506
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
