Author: aidan
Date: Wed Apr 23 18:54:20 2008
New Revision: 651133
URL: http://svn.apache.org/viewvc?rev=651133&view=rev
Log:
QPID-832 merge M2.x
Added:
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/mina/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/mina/transport/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/mina/transport/socket/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/support/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/codec/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
incubator/qpid/trunk/qpid/java/common/templates/method/MethodBodyInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/method/version/
incubator/qpid/trunk/qpid/java/common/templates/method/version/MethodBodyClass.vm
incubator/qpid/trunk/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/model/MethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.vm
incubator/qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.vm
incubator/qpid/trunk/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/model/version/
incubator/qpid/trunk/qpid/java/common/templates/model/version/AmqpConstantsClass.vm
incubator/qpid/trunk/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/common/templates/model/version/MethodRegistryClass.vm
incubator/qpid/trunk/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
incubator/qpid/trunk/qpid/java/systests/etc/bin/fail.py
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Removed:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTests.java
incubator/qpid/trunk/qpid/java/common/templates/method/MethodBodyClass.tmpl
incubator/qpid/trunk/qpid/java/common/templates/model/AmqpConstantsClass.tmpl
incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl
incubator/qpid/trunk/qpid/java/common/templates/model/ProtocolVersionListClass.tmpl
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
Modified:
incubator/qpid/trunk/qpid/gentools/build.xml
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
incubator/qpid/trunk/qpid/java/broker/pom.xml
incubator/qpid/trunk/qpid/java/broker/src/main/grammar/SelectorParser.jj
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
incubator/qpid/trunk/qpid/java/client/build.xml
incubator/qpid/trunk/qpid/java/client/pom.xml
incubator/qpid/trunk/qpid/java/client/src/main/grammar/SelectorParser.jj
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_8.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
incubator/qpid/trunk/qpid/java/common/build.xml
incubator/qpid/trunk/qpid/java/common/pom.xml
incubator/qpid/trunk/qpid/java/common/protocol-version.xml
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/Job.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
incubator/qpid/trunk/qpid/java/pom.xml
incubator/qpid/trunk/qpid/java/systests/build.xml
incubator/qpid/trunk/qpid/java/systests/pom.xml
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
incubator/qpid/trunk/qpid/specs/amqp.0-8.xml
incubator/qpid/trunk/qpid/specs/amqp.0-9.xml
Modified: incubator/qpid/trunk/qpid/gentools/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/build.xml?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/build.xml (original)
+++ incubator/qpid/trunk/qpid/gentools/build.xml Wed Apr 23 18:54:20 2008
@@ -28,6 +28,7 @@
<include name="**/*.jar"/>
</fileset>
</classpath>
+
</javac>
</target>
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
(original)
+++
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
Wed Apr 23 18:54:20 2008
@@ -24,6 +24,7 @@
import org.w3c.dom.NodeList;
import java.io.PrintStream;
+import java.util.Collection;
public class AmqpClass implements Printable, NodeAware
{
@@ -169,6 +170,11 @@
public AmqpMethodMap getMethodMap()
{
return _methodMap;
+ }
+
+ public Collection<AmqpMethod> getMethods()
+ {
+ return getMethodMap().values();
}
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
(original)
+++
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
Wed Apr 23 18:54:20 2008
@@ -198,6 +198,24 @@
return true;
}
+
+ public boolean isVersionInterfaceConsistent(AmqpVersionSet
globalVersionSet)
+ {
+ if (!_versionSet.equals(globalVersionSet))
+ {
+ return false;
+ }
+ if (!_domainMap.isVersionConsistent(globalVersionSet))
+ {
+ return false;
+ }
+ if (!_ordinalMap.isVersionConsistent(globalVersionSet))
+ {
+ return false;
+ }
+ return true;
+ }
+
public String getDomain(AmqpVersion version)
{
return _versionToDomainMap.get(version);
@@ -247,4 +265,5 @@
{
return _versionToOrdinalMap;
}
+
}
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
(original)
+++
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
Wed Apr 23 18:54:20 2008
@@ -411,6 +411,20 @@
return true;
}
+ public boolean isVersionInterfaceConsistent(AmqpVersionSet
globalVersionSet)
+ {
+ for (String thisFieldName : _map.keySet())
+ {
+ AmqpField field = _map.get(thisFieldName);
+ if (!field.isVersionInterfaceConsistent(globalVersionSet))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+
public AmqpVersionSet getVersionSet()
{
return _versionSet;
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
(original)
+++
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
Wed Apr 23 18:54:20 2008
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
public class AmqpMethod implements Printable, NodeAware,
VersionConsistencyCheck
{
@@ -39,6 +40,8 @@
private final Map<AmqpVersion, AmqpFieldMap> _versionToFieldsMap = new
HashMap<AmqpVersion, AmqpFieldMap>();
+ private final Map<AmqpVersion, AtomicInteger> _versionToFieldCount = new
HashMap<AmqpVersion, AtomicInteger>();
+
private final String _name;
private final Generator _generator;
@@ -68,7 +71,12 @@
_indexMap.put(index, indexVersionSet);
}
NodeList nList = methodNode.getChildNodes();
- int fieldCntr = _fieldMap.size();
+ AtomicInteger fieldCntr = _versionToFieldCount.get(version);
+ if(fieldCntr == null)
+ {
+ fieldCntr = new AtomicInteger(0);
+ _versionToFieldCount.put(version, fieldCntr);
+ }
for (int i = 0; i < nList.getLength(); i++)
{
Node child = nList.item(i);
@@ -94,9 +102,9 @@
AmqpField versionSpecificField = new AmqpField(fieldName,
_generator);
versionSpecificFieldMap.add(fieldName, versionSpecificField);
- versionSpecificField.addFromNode(child, fieldCntr, version);
+ versionSpecificField.addFromNode(child, fieldCntr.intValue(),
version);
- if (!thisField.addFromNode(child, fieldCntr++, version))
+ if (!thisField.addFromNode(child, fieldCntr.getAndIncrement(),
version))
{
String className =
_generator.prepareClassName(Utils.getNamedAttribute(methodNode.getParentNode(),
Utils.ATTRIBUTE_NAME));
@@ -216,9 +224,14 @@
return parameterVersionMap;
}
- public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
+ public boolean isVersionInterfaceConsistent()
{
- if (!_versionSet.equals(globalVersionSet))
+ return isVersionInterfaceConsistent(_generator.getVersionSet());
+ }
+
+ public boolean isVersionInterfaceConsistent(AmqpVersionSet
globalVersionSet)
+ {
+ if (!_versionSet.equals(globalVersionSet))
{
return false;
}
@@ -230,17 +243,26 @@
{
return false;
}
- if (!_indexMap.isVersionConsistent(globalVersionSet))
- {
- return false;
- }
- if (!_fieldMap.isVersionConsistent(globalVersionSet))
+ if (!_fieldMap.isVersionInterfaceConsistent(globalVersionSet))
{
return false;
}
return true;
}
+ public boolean isVersionConsistent()
+ {
+ return isVersionConsistent(_generator.getVersionSet());
+ }
+
+
+ public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
+ {
+ return isVersionInterfaceConsistent(globalVersionSet)
+ && _indexMap.isVersionConsistent(globalVersionSet)
+ && _fieldMap.isVersionConsistent(globalVersionSet);
+ }
+
public AmqpVersionSet getVersionSet()
{
return _versionSet;
@@ -294,5 +316,36 @@
public boolean isCommon(AmqpField field)
{
return field.getVersionSet().equals(getVersionSet()) &&
field.isTypeAndNameConsistent(_generator);
+ }
+
+ public boolean isConsistentServerMethod()
+ {
+ AmqpVersionSet serverVersions = _serverMethodFlagMap.get(true);
+ return (serverVersions != null) &&
serverVersions.containsAll(_generator.getVersionSet());
+ }
+
+
+ public boolean isConsistentClientMethod()
+ {
+ AmqpVersionSet clientVersions = _clientMethodFlagMap.get(true);
+ return (clientVersions != null) &&
clientVersions.containsAll(_generator.getVersionSet());
+ }
+
+ public boolean isServerMethod(AmqpVersion version)
+ {
+ AmqpVersionSet serverVersions = _serverMethodFlagMap.get(true);
+ return (serverVersions != null) && serverVersions.contains(version);
+ }
+
+
+ public boolean isClientMethod(AmqpVersion version)
+ {
+ AmqpVersionSet clientVersions = _clientMethodFlagMap.get(true);
+ return (clientVersions != null) && clientVersions.contains(version);
+ }
+
+ public boolean inAllVersions()
+ {
+ return _versionSet.containsAll(_generator.getVersionSet());
}
}
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java?rev=651133&r1=651132&r2=651133&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
(original)
+++
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
Wed Apr 23 18:54:20 2008
@@ -26,6 +26,7 @@
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
+import java.util.Collection;
public class AmqpModel implements Printable, NodeAware
{
@@ -116,6 +117,12 @@
public AmqpClassMap getClassMap()
{
return classMap;
+ }
+
+
+ public Collection<AmqpClass> getClasses()
+ {
+ return classMap.values();
}
public SingleVersionModel asSingleVersionModel()
