Propchange: qpid/branches/qpid-3890/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:r1302635-1303764
Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/management/eclipse-plugin/src/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Modified: qpid/branches/qpid-3890/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3890/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java?rev=1303774&r1=1303773&r2=1303774&view=diff ============================================================================== --- qpid/branches/qpid-3890/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java (original) +++ qpid/branches/qpid-3890/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java Thu Mar 22 13:39:14 2012 @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.qpid.AMQConnectionClosedException; import org.apache.qpid.AMQDisconnectedException; +import org.apache.qpid.client.AMQConnection; import org.apache.qpid.management.jmx.ManagedConnectionMBeanTest; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.ConnectionException; @@ -62,10 +63,13 @@ public class BrokerClosesClientConnectio { final Class<? extends Exception> expectedLinkedException = isBroker010() ? ConnectionException.class : AMQConnectionClosedException.class; + assertConnectionOpen(); + stopBroker(); JMSException exception = _recordingExceptionListener.awaitException(10000); assertConnectionCloseWasReported(exception, expectedLinkedException); + assertConnectionClosed(); ensureCanCloseWithoutException(); } @@ -79,10 +83,13 @@ public class BrokerClosesClientConnectio return; } + assertConnectionOpen(); + killBroker(); JMSException exception = _recordingExceptionListener.awaitException(10000); assertConnectionCloseWasReported(exception, expectedLinkedException); + assertConnectionClosed(); ensureCanCloseWithoutException(); } @@ -107,6 +114,16 @@ public class BrokerClosesClientConnectio assertEquals("Unexpected linked exception", linkedExceptionClass, exception.getLinkedException().getClass()); } + private void assertConnectionClosed() + { + assertTrue("Connection should be marked as closed", ((AMQConnection)_connection).isClosed()); + } + + private void assertConnectionOpen() + { + assertFalse("Connection should not be marked as closed", ((AMQConnection)_connection).isClosed()); + } + private final class RecordingExceptionListener implements ExceptionListener { private final CountDownLatch _exceptionReceivedLatch = new CountDownLatch(1); Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/java-bdb.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/java-dby.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/java-mms.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/packaging/windows/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/packaging/windows:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/python/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/python/examples/api/spout ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python/examples/api/spout:r1302635-1303764 Propchange: qpid/branches/qpid-3890/qpid/python/qpid/concurrency.py ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1302635-1303764 Modified: qpid/branches/qpid-3890/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3890/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py?rev=1303774&r1=1303773&r2=1303774&view=diff ============================================================================== --- qpid/branches/qpid-3890/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py (original) +++ qpid/branches/qpid-3890/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py Thu Mar 22 13:39:14 2012 @@ -1122,6 +1122,70 @@ class MultiConsumerMsgGroupTests(Base): snd.close() + def test_ttl_expire(self): + """ Verify that expired (TTL) group messages are skipped correctly + """ + snd = self.ssn.sender("msg-group-q; {create:always, delete:sender," + + " node: {x-declare: {arguments:" + + " {'qpid.group_header_key':'THE-GROUP'," + + "'qpid.shared_msg_group':1}}}}") + + groups = ["A","B","C","A","B","C"] + messages = [Message(content={}, properties={"THE-GROUP": g}) for g in groups] + index = 0 + for m in messages: + m.content['index'] = index + index += 1 + if m.properties['THE-GROUP'] == 'B': + m.ttl = 1; + snd.send(m) + + sleep(2) # let all B's expire + + # create consumers on separate sessions: C1,C2 + s1 = self.setup_session() + c1 = s1.receiver("msg-group-q", options={"capacity":0}) + s2 = self.setup_session() + c2 = s2.receiver("msg-group-q", options={"capacity":0}) + + # C1 should acquire A-0, then C2 should acquire C-2, Group B should + # expire and never be fetched + + m1 = c1.fetch(0); + assert m1.properties['THE-GROUP'] == 'A' + assert m1.content['index'] == 0 + + m2 = c2.fetch(0); + assert m2.properties['THE-GROUP'] == 'C' + assert m2.content['index'] == 2 + + m1 = c1.fetch(0); + assert m1.properties['THE-GROUP'] == 'A' + assert m1.content['index'] == 3 + + m2 = c2.fetch(0); + assert m2.properties['THE-GROUP'] == 'C' + assert m2.content['index'] == 5 + + # there should be no more left for either consumer + try: + mx = c1.fetch(0) + assert False # should never get here + except Empty: + pass + try: + mx = c2.fetch(0) + assert False # should never get here + except Empty: + pass + + c1.session.acknowledge() + c2.session.acknowledge() + c1.close() + c2.close() + snd.close() + + class StickyConsumerMsgGroupTests(Base): """ Tests for the behavior of sticky-consumer message groups. These tests Propchange: qpid/branches/qpid-3890/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:r1302635-1303764 Modified: qpid/branches/qpid-3890/qpid/tools/src/py/qpid-config URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3890/qpid/tools/src/py/qpid-config?rev=1303774&r1=1303773&r2=1303774&view=diff ============================================================================== --- qpid/branches/qpid-3890/qpid/tools/src/py/qpid-config (original) +++ qpid/branches/qpid-3890/qpid/tools/src/py/qpid-config Thu Mar 22 13:39:14 2012 @@ -481,7 +481,7 @@ class BrokerManager: if LVQ_KEY in args: print "--lvq-key=%s" % args[LVQ_KEY], if QUEUE_EVENT_GENERATION in args: print "--generate-queue-events=%s" % args[QUEUE_EVENT_GENERATION], if q.altExchange: - print "--alternate-exchange=%s" % q._altExchange_.name, + print "--alternate-exchange=%s" % q.altExchange, if FLOW_STOP_SIZE in args: print "--flow-stop-size=%s" % args[FLOW_STOP_SIZE], if FLOW_RESUME_SIZE in args: print "--flow-resume-size=%s" % args[FLOW_RESUME_SIZE], if FLOW_STOP_COUNT in args: print "--flow-stop-count=%s" % args[FLOW_STOP_COUNT], --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
