You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/03/01 16:50:31 UTC
svn commit: r1295635 [3/3] - in
/qpid/branches/rg-amqp-1-0-sandbox/qpid/java: ./
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker/
broker/bin/ broker/src/main/java/
broker/src/main/java/org/apache/qpid/server/ broker/src/main/java...
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java Thu Mar 1 15:50:27 2012
@@ -20,10 +20,11 @@
package org.apache.qpid.server.queue;
import java.util.Arrays;
-import java.util.Calendar;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -128,11 +129,10 @@ public class SortedQueueTest extends Qpi
final TestConsumerThread consumerThread = new TestConsumerThread(sessionMode, queue);
consumerThread.start();
- final Calendar cal = Calendar.getInstance(Locale.UK);
for(String value : VALUES)
{
- final Message msg = _producerSession.createTextMessage(String.valueOf(cal.getTimeInMillis()));
+ final Message msg = _producerSession.createMessage();
msg.setStringProperty(TEST_SORT_KEY, value);
producer.send(msg);
_producerSession.commit();
@@ -273,22 +273,22 @@ public class SortedQueueTest extends Qpi
_consumerConnection.start();
//Receive 3 in sorted order
- received = receiveAndValidateMessage(consumer, "1");
+ received = assertReceiveAndValidateMessage(consumer, "1");
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "2");
+ received = assertReceiveAndValidateMessage(consumer, "2");
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "3");
+ received = assertReceiveAndValidateMessage(consumer, "3");
received.acknowledge();
//Send 1
sendAndCommitMessage(producer,"4");
//Receive 1 and recover
- received = receiveAndValidateMessage(consumer, "4");
+ received = assertReceiveAndValidateMessage(consumer, "4");
consumerSession.recover();
//Receive same 1
- received = receiveAndValidateMessage(consumer, "4");
+ received = assertReceiveAndValidateMessage(consumer, "4");
received.acknowledge();
//Send 3 out of order
@@ -296,33 +296,39 @@ public class SortedQueueTest extends Qpi
sendAndCommitMessage(producer,"6");
sendAndCommitMessage(producer,"5");
- //Receive 1 of 3 (out of order due to pre-fetch) and recover
- received = receiveAndValidateMessage(consumer, "7");
+ //Receive 1 of 3 (possibly out of order due to pre-fetch)
+ final Message messageBeforeRollback = assertReceiveMessage(consumer);
consumerSession.recover();
if (isBroker010())
{
//Receive 3 in sorted order (not as per JMS recover)
- received = receiveAndValidateMessage(consumer, "5");
+ received = assertReceiveAndValidateMessage(consumer, "5");
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "6");
+ received = assertReceiveAndValidateMessage(consumer, "6");
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "7");
+ received = assertReceiveAndValidateMessage(consumer, "7");
received.acknowledge();
}
else
{
- //Receive 3 in partial sorted order due to recover
- received = receiveAndValidateMessage(consumer, "7");
+ //First message will be the one rolled-back (as per JMS spec).
+ final String messageKeyDeliveredBeforeRollback = messageBeforeRollback.getStringProperty(TEST_SORT_KEY);
+ received = assertReceiveAndValidateMessage(consumer, messageKeyDeliveredBeforeRollback);
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "5");
+
+ //Remaining two messages will be sorted
+ final SortedSet<String> keys = new TreeSet<String>(Arrays.asList("5", "6", "7"));
+ keys.remove(messageKeyDeliveredBeforeRollback);
+
+ received = assertReceiveAndValidateMessage(consumer, keys.first());
received.acknowledge();
- received = receiveAndValidateMessage(consumer, "6");
+ received = assertReceiveAndValidateMessage(consumer, keys.last());
received.acknowledge();
}
}
- protected Queue createQueue() throws AMQException, JMSException
+ private Queue createQueue() throws AMQException, JMSException
{
final Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put(AMQQueueFactory.QPID_QUEUE_SORT_KEY, TEST_SORT_KEY);
@@ -345,15 +351,22 @@ public class SortedQueueTest extends Qpi
_producerSession.commit();
}
- private Message receiveAndValidateMessage(final MessageConsumer consumer, final String expectedKey) throws JMSException
+ private Message assertReceiveAndValidateMessage(final MessageConsumer consumer, final String expectedKey) throws JMSException
{
- final Message received = (TextMessage) consumer.receive(10000);
- assertNotNull("Received message is unexpectedly null", received);
+ final Message received = assertReceiveMessage(consumer);
assertEquals("Received message with unexpected sorted key value", expectedKey,
received.getStringProperty(TEST_SORT_KEY));
return received;
}
+ private Message assertReceiveMessage(final MessageConsumer consumer)
+ throws JMSException
+ {
+ final Message received = (TextMessage) consumer.receive(10000);
+ assertNotNull("Received message is unexpectedly null", received);
+ return received;
+ }
+
private class TestConsumerThread extends Thread
{
private boolean _stopped = false;
@@ -388,9 +401,8 @@ public class SortedQueueTest extends Qpi
conn.start();
- TextMessage msg;
- Calendar cal = Calendar.getInstance(Locale.UK);
- while((msg = (TextMessage) consumer.receive(1000)) != null)
+ Message msg;
+ while((msg = consumer.receive(1000)) != null)
{
if(_sessionType == Session.SESSION_TRANSACTED)
{
@@ -427,9 +439,7 @@ public class SortedQueueTest extends Qpi
}
_count++;
- LOGGER.debug("Message consumed at : " + cal.getTimeInMillis());
LOGGER.debug("Message consumed with key: " + msg.getStringProperty(TEST_SORT_KEY));
- LOGGER.debug("Message consumed with text: " + msg.getText());
LOGGER.debug("Message consumed with consumed index: " + _consumed);
}
@@ -439,8 +449,8 @@ public class SortedQueueTest extends Qpi
}
catch(JMSException e)
{
- e.printStackTrace();
- }
+ LOGGER.error("Exception in listener", e);
+ }
}
public synchronized boolean isStopped()
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java Thu Mar 1 15:50:27 2012
@@ -70,6 +70,11 @@ public class AcknowledgeTest extends Qpi
// These should all end up being prefetched by session
sendMessage(_consumerSession, _queue, 1);
+ if(!transacted)
+ {
+ ((AMQSession)_consumerSession).sync();
+ }
+
assertEquals("Wrong number of messages on queue", 1,
((AMQSession) _consumerSession).getQueueDepth((AMQDestination) _queue));
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Thu Mar 1 15:50:27 2012
@@ -101,10 +101,4 @@ public class AMQSessionTest extends Qpid
assertEquals("Queue names should match from QueueReceiver with selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
}
- public static void stopVmBrokers()
- {
- _queue = null;
- _topic = null;
- _session = null;
- }
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu Mar 1 15:50:27 2012
@@ -721,7 +721,7 @@ public class DurableSubscriptionTest ext
msg = session.createTextMessage("testResubscribeWithChangedSelectorAndRestart2");
msg.setBooleanProperty("Match", false);
producer.send(msg);
-
+ ((AMQSession)session).sync();
// should be 1 or 2 messages on queue now
// (1 for the java broker due to use of server side selectors, and 2 for the cpp broker due to client side selectors only)
AMQQueue queue = new AMQQueue("amq.topic", "clientid" + ":" + "testResubscribeWithChangedSelectorNoClose");
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Mar 1 15:50:27 2012
@@ -46,6 +46,7 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
+import javax.jms.Topic;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -56,6 +57,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.ConnectionURL;
@@ -1101,6 +1103,15 @@ public class QpidBrokerTestCase extends
return new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, getTestQueueName());
}
+ /**
+ * Return a Topic specific for this test.
+ * Uses getTestQueueName() as the name of the topic
+ * @return
+ */
+ public Topic getTestTopic()
+ {
+ return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, getTestQueueName());
+ }
protected void tearDown() throws java.lang.Exception
{
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes Thu Mar 1 15:50:27 2012
@@ -23,10 +23,6 @@ org.apache.qpid.test.client.destination.
// QPID-3576: Java client issue. MessageConsumer#close() time-out.
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testDeleteOptions
-//This test requires SSL, but SSL is only enabled for the C++ broker in the cpp.ssl test profile
-//which runs *all* the tests with SSL, so this one can be excluded safely enough
-org.apache.qpid.test.unit.client.AMQSSLConnectionTest#*
-
org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
org.apache.qpid.client.ResetMessageListenerTest#*
@@ -178,3 +174,5 @@ org.apache.qpid.server.queue.MessageGrou
org.apache.qpid.server.queue.MessageGroupQueueTest#testConsumerCloseWithRelease
org.apache.qpid.server.queue.MessageGroupQueueTest#testGroupAssignmentSurvivesEmpty
+// CPP Broker does not implement message conversion from 0-9-1
+org.apache.qpid.server.message.MessageProtocolConversionTest#*
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/Excludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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/JavaBDBExcludes:1180001-1230000
+/qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:1180001-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes?rev=1295635&r1=1295634&r2=1295635&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes Thu Mar 1 15:50:27 2012
@@ -21,8 +21,10 @@
//Exclude the following from brokers using the 0-8/0-9/0-9-1 protocols
//======================================================================
-// This test requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently
+// These tests requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently
org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
+org.apache.qpid.server.message.MessageProtocolConversionTest#*
+
// QPID-2478 test fails when run against broker using 0-8/9
org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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/JavaPre010Excludes:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-bdb-spawn.0-9-1.testprofile:1180001-1230000
+/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:1180001-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-bdb.0-9-1.testprofile:1180001-1230000
+/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:1180001-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-dby-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-dby.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-mms-spawn.0-10.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-mms-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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-mms.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/test_resources:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1235000
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 15:50:27 2012
@@ -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/testprofile.defaults:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1230000
+/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1235000
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org