Author: rgodfrey
Date: Tue Jul 16 10:49:37 2013
New Revision: 1503651
URL: http://svn.apache.org/r1503651
Log:
QPID-4659 : [Java Broker] move amqp 0-8 implementation into a plugin
Added:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/
- copied from r1503522,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactory.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImpl.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicAckMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicCancelMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicQosHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRejectMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelCloseHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelFlowHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionCloseOkMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionTuneOkMethodHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxCommitHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxRollbackHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/TxSelectHandler.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterRegistry.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
- copied unchanged from r1503522,
qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
- copied unchanged from r1503522,
qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/
- copied from r1503522,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
- copied unchanged from r1503625,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
- copied unchanged from r1503625,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockAMQMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
- copied unchanged from r1503625,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
- copied unchanged from r1503625,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
- copied unchanged from r1503625,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
- copied unchanged from r1503523,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/v0_8/SubscriptionFactoryImplTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
- copied unchanged from r1503522,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/
qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/
Modified:
qpid/trunk/qpid/java/bdbstore/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
qpid/trunk/qpid/java/broker/build.xml
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
qpid/trunk/qpid/java/ivy.nexus.xml
qpid/trunk/qpid/java/perftests/build.xml
qpid/trunk/qpid/java/systests/build.xml
Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Tue Jul 16 10:49:37 2013
@@ -17,10 +17,10 @@
- under the License.
-->
<project name="bdbstore" xmlns:ivy="antlib:org.apache.ivy.ant" default="build">
- <property name="module.depends" value="common broker" />
- <property name="module.test.depends" value="client common/tests
broker/tests management/common systests broker-plugins/management-jmx
broker-plugins/memory-store broker-plugins/amqp-0-10-protocol" />
+ <property name="module.depends" value="common broker
broker-plugins/amqp-0-8-protocol" />
+ <property name="module.test.depends" value="client common/tests
broker/tests management/common systests broker-plugins/management-jmx
broker-plugins/memory-store broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol" />
<property name="module.genpom" value="true"/>
- <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sje=provided"/>
+ <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided
-Sje=provided"/>
<import file="../module.xml" />
Added: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml?rev=1503651&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml (added)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml Tue Jul 16
10:49:37 2013
@@ -0,0 +1,33 @@
+<!--
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -->
+<project name="Qpid Broker-Plugins AMQP 0-8 Protocol" default="build">
+ <property name="module.depends" value="common broker" />
+ <property name="module.test.depends" value="common/tests broker/tests" />
+
+ <property name="module.genpom" value="true"/>
+ <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided"/>
+ <property name="broker-plugins-amqp-0-8-protocol.libs" value="" />
+
+ <property name="broker.plugin" value="true"/>
+
+ <import file="../../module.xml" />
+
+ <target name="bundle" depends="bundle-tasks"/>
+
+</project>
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml Tue
Jul 16 10:49:37 2013
@@ -17,11 +17,11 @@
- under the License.
-->
<project name="Qpid Broker-Plugins AMQP 0.8 to 0.10 MessageConversion"
default="build">
- <property name="module.depends" value="common broker
broker-plugins/amqp-0-10-protocol" />
+ <property name="module.depends" value="common broker
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" />
<property name="module.test.depends" value="common/tests broker/tests" />
<property name="module.genpom" value="true"/>
- <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided"/>
+ <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided
-Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
<property name="broker-plugins-amqp-msg-conv-0-8-to-0-10-libs" value="" />
<property name="broker.plugin" value="true"/>
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml
(original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml Tue
Jul 16 10:49:37 2013
@@ -17,11 +17,11 @@
- under the License.
-->
<project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion"
default="build">
- <property name="module.depends" value="common broker amqp-1-0-common
broker-plugins/amqp-1-0-protocol" />
+ <property name="module.depends" value="common broker amqp-1-0-common
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" />
<property name="module.test.depends" value="common/tests broker/tests" />
<property name="module.genpom" value="true"/>
- <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-amqp-1-0-common=provided
-Sqpid-broker-plugins-amqp-1-0-protocol=provided"/>
+ <property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-amqp-1-0-common=provided
-Sqpid-broker-plugins-amqp-1-0-protocol=provided
-Sqpid-broker-plugins-amqp-0-8-protocol=provided"/>
<property name="broker-plugins-amqp-msg-conv-0-8-to-1-0-libs" value="" />
<property name="broker.plugin" value="true"/>
Modified: qpid/trunk/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Tue Jul 16 10:49:37 2013
@@ -25,9 +25,9 @@
<property name="module.genpom" value="true"/>
<!-- Add dependencies to the broker pom for the broker-plugins and
bdbstore modules -->
- <property name="module.maven.depends"
value="broker-plugins/management-http broker-plugins/management-jmx
broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore
bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/amqp-0-10-protocol
broker-plugins/amqp-msg-conv-0-8-to-0-10"/>
+ <property name="module.maven.depends"
value="broker-plugins/management-http broker-plugins/management-jmx
broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore
bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10"/>
<!-- Make them runtime dependencies, make bdbstore modules optional -->
- <property name="module.genpom.args"
value="-Sqpid-broker-plugins-management-http=runtime
-Sqpid-broker-plugins-management-jmx=runtime
-Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime
-Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx
-Sqpid-broker-plugins-jdbc-provider-bone=runtime
-Oqpid-broker-plugins-jdbc-provider-bone
-Sqpid-broker-plugins-jdbc-store=runtime
-Sqpid-broker-plugins-derby-store=runtime
-Sqpid-broker-plugins-amqp-1-0-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime
-Sqpid-broker-plugins-amqp-0-10-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime"/>
+ <property name="module.genpom.args"
value="-Sqpid-broker-plugins-management-http=runtime
-Sqpid-broker-plugins-management-jmx=runtime
-Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime
-Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx
-Sqpid-broker-plugins-jdbc-provider-bone=runtime
-Oqpid-broker-plugins-jdbc-provider-bone
-Sqpid-broker-plugins-jdbc-store=runtime
-Sqpid-broker-plugins-derby-store=runtime
-Sqpid-broker-plugins-amqp-1-0-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime
-Sqpid-broker-plugins-amqp-0-8-protocol=runtime
-Sqpid-broker-plugins-amqp-0-10-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime"/>
<import file="../module.xml"/>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
Tue Jul 16 10:49:37 2013
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging.actors;
import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
Tue Jul 16 10:49:37 2013
@@ -24,7 +24,6 @@ import org.apache.commons.configuration.
import org.apache.qpid.AMQException;
import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.NullRootMessageLogger;
import org.apache.qpid.server.util.BrokerTestHelper;
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
Tue Jul 16 10:49:37 2013
@@ -22,7 +22,6 @@ import junit.framework.TestCase;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
import org.apache.qpid.server.queue.QueueEntry.EntryState;
import org.apache.qpid.server.subscription.MockSubscription;
import org.apache.qpid.server.subscription.Subscription;
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
Tue Jul 16 10:49:37 2013
@@ -23,7 +23,6 @@ import java.util.Collections;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
import org.apache.qpid.server.message.ServerMessage;
import java.util.Arrays;
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Tue Jul 16 10:49:37 2013
@@ -99,6 +99,7 @@ broker-plugins-management-jmx.test.libs=
broker-plugins-jdbc-store.test.libs=${test.libs}
broker-plugins-derby-store.test.libs=${test.libs}
broker-plugins-memory-store.test.libs=${test.libs}
+broker-plugins-amqp-0-8-protocol.test.libs=${test.libs}
broker-plugins-amqp-0-10-protocol.test.libs=${test.libs}
broker-plugins-amqp-1-0-protocol.test.libs=${test.libs}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
Tue Jul 16 10:49:37 2013
@@ -1,5 +1,5 @@
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.qpid.url;
@@ -61,7 +61,8 @@ public class BindingURLParser
}
//<exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
- public synchronized void parse(String url,AMQBindingURL bindingURL)
throws URISyntaxException
+ public synchronized void
+ parse(String url,AMQBindingURL bindingURL) throws URISyntaxException
{
_url = (url + END_OF_URL_MARKER_CHAR).toCharArray();
_bindingURL = bindingURL;
@@ -442,7 +443,7 @@ public class BindingURLParser
public static void main(String[] args)
{
-
+
String[] urls = new String[]
{
"topic://amq.topic//myTopic?routingkey='stocks.#'",
Modified: qpid/trunk/qpid/java/ivy.nexus.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.nexus.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.nexus.xml (original)
+++ qpid/trunk/qpid/java/ivy.nexus.xml Tue Jul 16 10:49:37 2013
@@ -63,6 +63,12 @@
<artifact name="qpid-broker-plugins-amqp-0-10-protocol" type="jar.asc"
ext="jar.asc"/>
<artifact name="qpid-broker-plugins-amqp-0-10-protocol" type="source"
ext="jar" e:classifier="sources"/>
<artifact name="qpid-broker-plugins-amqp-0-10-protocol" type="source.asc"
ext="jar.asc" e:classifier="sources"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="pom"
ext="pom"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="pom.asc"
ext="pom.asc"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="jar"
ext="jar"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="jar.asc"
ext="jar.asc"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="source"
ext="jar" e:classifier="sources"/>
+ <artifact name="qpid-broker-plugins-amqp-0-8-protocol" type="source.asc"
ext="jar.asc" e:classifier="sources"/>
<artifact name="qpid-broker-plugins-amqp-1-0-protocol" type="pom"
ext="pom"/>
<artifact name="qpid-broker-plugins-amqp-1-0-protocol" type="pom.asc"
ext="pom.asc"/>
<artifact name="qpid-broker-plugins-amqp-1-0-protocol" type="jar"
ext="jar"/>
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Tue Jul 16 10:49:37 2013
@@ -33,7 +33,7 @@
</condition>
<property name="module.depends" value="client common"/>
- <property name="module.test.depends" value="systests broker
broker-plugins/memory-store broker-plugins/derby-store common/tests
management/common ${perftests.optional.test.depends}"/>
+ <property name="module.test.depends" value="systests broker
broker-plugins/memory-store broker-plugins/derby-store common/tests
management/common broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol
${perftests.optional.test.depends}"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/systests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1503651&r1=1503650&r2=1503651&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Tue Jul 16 10:49:37 2013
@@ -34,7 +34,7 @@ nn - or more contributor license agreeme
<!-- The jca module is unusual in that it produces a jar with the name ra
rather than jca. Unfortunately this means we
need to add both jca (finds jca's jar dependencies) and ra (to find
the qpid-ra jar file itself). -->
- <property name="module.depends" value="client management/common broker
broker/tests common amqp-1-0-common common/tests jca ra
broker-plugins/access-control broker-plugins/management-http
broker-plugins/management-jmx broker-plugins/memory-store
broker-plugins/derby-store broker-plugins/amqp-0-10-protocol
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10
broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
+ <property name="module.depends" value="client management/common broker
broker/tests common amqp-1-0-common common/tests jca ra
broker-plugins/access-control broker-plugins/management-http
broker-plugins/management-jmx broker-plugins/memory-store
broker-plugins/derby-store broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol
broker-plugins/amqp-msg-conv-0-8-to-0-10
broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 ${systests.optional.depends}"/>
<property name="module.test.src" location="src/main/java"/>
<property name="module.test.excludes"
value="**/DropInTest.java,**/TestClientControlledTest.java"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
