Author: robbie Date: Thu Aug 2 09:40:27 2012 New Revision: 1368401 URL: http://svn.apache.org/viewvc?rev=1368401&view=rev Log: QPID-4171: Fix enqueue ordering for persistent messsages
Applied patch from Philip Harvey <[email protected]> and Oleksandr Rudyy <[email protected]> merged from trunk r1367990 Added: qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java - copied unchanged from r1367990, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java 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/AMQChannel.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/txn/AsyncAutoCommitTransaction.java 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/util/InternalBrokerBaseCase.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:r1367990 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1367990 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1367990 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-common/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1367990 Propchange: qpid/branches/0.18/qpid/java/broker/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker:r1367990 Propchange: qpid/branches/0.18/qpid/java/broker/bin/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/bin:r1367990 Modified: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1368401&r1=1368400&r2=1368401&view=diff ============================================================================== --- qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original) +++ qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Thu Aug 2 09:40:27 2012 @@ -138,8 +138,6 @@ public class AMQChannel implements Sessi private final LinkedList<AsyncCommand> _unfinishedCommandsQueue = new LinkedList<AsyncCommand>(); - private static final int UNFINISHED_COMMAND_QUEUE_THRESHOLD = 500; - private UnacknowledgedMessageMap _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(DEFAULT_PREFETCH); // Set of messages being acknowledged in the current transaction @@ -1620,23 +1618,6 @@ public class AMQChannel implements Sessi _unfinishedCommandsQueue.add(new AsyncCommand(future, action)); } - public void completeAsyncCommands() - { - AsyncCommand cmd; - while((cmd = _unfinishedCommandsQueue.peek()) != null && cmd.isReadyForCompletion()) - { - cmd.complete(); - _unfinishedCommandsQueue.poll(); - } - while(_unfinishedCommandsQueue.size() > UNFINISHED_COMMAND_QUEUE_THRESHOLD) - { - cmd = _unfinishedCommandsQueue.poll(); - cmd.awaitReadyForCompletion(); - cmd.complete(); - } - } - - public void sync() { AsyncCommand cmd; 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 Modified: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java?rev=1368401&r1=1368400&r2=1368401&view=diff ============================================================================== --- qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java (original) +++ qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java Thu Aug 2 09:40:27 2012 @@ -44,11 +44,16 @@ import java.util.List; */ public class AsyncAutoCommitTransaction implements ServerTransaction { + static final String QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE = "qpid.strict_order_with_mixed_delivery_mode"; + protected static final Logger _logger = Logger.getLogger(AsyncAutoCommitTransaction.class); private final MessageStore _messageStore; private final FutureRecorder _futureRecorder; + //Set true to ensure strict ordering when enqueing messages with mixed delivery mode, i.e. disable async persistence + private boolean _strictOrderWithMixedDeliveryMode = Boolean.getBoolean(QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE); + public static interface FutureRecorder { public void recordFuture(StoreFuture future, Action action); @@ -129,6 +134,23 @@ public class AsyncAutoCommitTransaction } } + private void addEnqueueFuture(final StoreFuture future, final Action action, boolean persistent) + { + if(action != null) + { + // For persistent messages, do not synchronously invoke postCommit even if the future is completed. + // Otherwise, postCommit (which actually does the enqueuing) might be called on successive messages out of order. + if(future.isComplete() && !persistent && !_strictOrderWithMixedDeliveryMode) + { + action.postCommit(); + } + else + { + _futureRecorder.recordFuture(future, action); + } + } + } + public void dequeue(Collection<QueueEntry> queueEntries, Action postTransactionAction) { Transaction txn = null; @@ -203,7 +225,7 @@ public class AsyncAutoCommitTransaction { future = StoreFuture.IMMEDIATE_FUTURE; } - addFuture(future, postTransactionAction); + addEnqueueFuture(future, postTransactionAction, message.isPersistent()); postTransactionAction = null; } catch (AMQException e) @@ -257,7 +279,7 @@ public class AsyncAutoCommitTransaction { future = StoreFuture.IMMEDIATE_FUTURE; } - addFuture(future, postTransactionAction); + addEnqueueFuture(future, postTransactionAction, message.isPersistent()); postTransactionAction = null; 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:r1367990 Modified: qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=1368401&r1=1368400&r2=1368401&view=diff ============================================================================== --- qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original) +++ qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Thu Aug 2 09:40:27 2012 @@ -254,7 +254,7 @@ public class InternalBrokerBaseCase exte channel.publishContentHeader(_headerBody); } - + channel.sync(); } public void acknowledge(AMQChannel channel, long deliveryTag) 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 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:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1367990 Propchange: qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1367990 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
