You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/11 11:19:20 UTC
svn commit: r1567026 [1/4] - in /qpid/trunk/qpid/java: ./
amqp-1-0-client-jms/
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/
amqp-1-0-client/
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/ broker-...
Author: rgodfrey
Date: Tue Feb 11 10:19:17 2014
New Revision: 1567026
URL: http://svn.apache.org/r1567026
Log:
QPID-5504 : refactring of queues, and introduce management node and amqp-management module
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/
- copied from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AmqpManagement.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/model/AmqpManagement.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueue.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntry.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntry.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageMetaDataType
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
- copied unchanged from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
qpid/trunk/qpid/java/broker-plugins/management-amqp/
- copied from r1566719, qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/management-amqp/
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
Modified:
qpid/trunk/qpid/java/ (props changed)
qpid/trunk/qpid/java/amqp-1-0-client/ (props changed)
qpid/trunk/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
qpid/trunk/qpid/java/amqp-1-0-common/ (props changed)
qpid/trunk/qpid/java/broker-core/ (props changed)
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemNodeCreator.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryVisitor.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (props changed)
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageConverter
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/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/QueueBrowserUsesNoAckTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
qpid/trunk/qpid/java/ivy.nexus.xml
qpid/trunk/qpid/java/pom.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
qpid/trunk/qpid/java/test-profiles/ (props changed)
Propchange: qpid/trunk/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/branches/java-broker-amqp-1-0-management/java:r1565711-1566719
Propchange: qpid/trunk/qpid/java/amqp-1-0-client/
('svn:mergeinfo' removed)
Propchange: qpid/trunk/qpid/java/amqp-1-0-client-jms/
('svn:mergeinfo' removed)
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/DestinationImpl.java Tue Feb 11 10:19:17 2014
@@ -24,6 +24,7 @@ import org.apache.qpid.amqp_1_0.jms.Queu
import org.apache.qpid.amqp_1_0.jms.Topic;
import javax.jms.JMSException;
+import java.util.UUID;
import java.util.WeakHashMap;
public class DestinationImpl implements Destination, Queue, Topic
@@ -32,6 +33,7 @@ public class DestinationImpl implements
new WeakHashMap<String, DestinationImpl>();
private final String _address;
+ private String _localTerminus;
protected DestinationImpl(String address)
{
@@ -62,13 +64,24 @@ public class DestinationImpl implements
&& _address.equals(((DestinationImpl)obj)._address);
}
- public static synchronized DestinationImpl createDestination(final String address)
+ public static synchronized DestinationImpl createDestination(String address)
{
- DestinationImpl destination = DESTINATION_CACHE.get(address);
- if(destination == null)
+ DestinationImpl destination;
+ if (address.endsWith("!!"))
{
+ address = address.substring(0, address.length() - 2);
+ String localTerminusName = UUID.randomUUID().toString();
destination = new DestinationImpl(address);
- DESTINATION_CACHE.put(address, destination);
+ destination.setLocalTerminus(localTerminusName);
+ }
+ else
+ {
+ destination = DESTINATION_CACHE.get(address);
+ if (destination == null)
+ {
+ destination = new DestinationImpl(address);
+ DESTINATION_CACHE.put(address, destination);
+ }
}
return destination;
}
@@ -82,4 +95,14 @@ public class DestinationImpl implements
{
return getAddress();
}
+
+ void setLocalTerminus(final String localTerminus)
+ {
+ _localTerminus = localTerminus;
+ }
+
+ String getLocalTerminus()
+ {
+ return _localTerminus;
+ }
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java Tue Feb 11 10:19:17 2014
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.jms.Destination;
import javax.jms.ExceptionListener;
import javax.jms.IllegalStateException;
@@ -159,7 +160,8 @@ public class MessageConsumerImpl impleme
{
try
{
- return _session.getClientSession().createReceiver(_session.toAddress(_destination), AcknowledgeMode.ALO,
+ String targetAddr = _destination.getLocalTerminus() != null ? _destination.getLocalTerminus() : UUID.randomUUID().toString();
+ return _session.getClientSession().createReceiver(_session.toAddress(_destination), targetAddr, AcknowledgeMode.ALO,
_linkName, _durable, getFilters(), null);
}
catch (ConnectionErrorException e)
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageImpl.java Tue Feb 11 10:19:17 2014
@@ -75,6 +75,7 @@ public abstract class MessageImpl implem
private boolean _isFromQueue;
private boolean _isFromTopic;
private long _expiration;
+ private DestinationImpl _replyTo;
protected MessageImpl(Header header,
MessageAnnotations messageAnnotations,
@@ -182,11 +183,12 @@ public abstract class MessageImpl implem
public DestinationImpl getJMSReplyTo() throws JMSException
{
- return toDestination(getReplyTo(), splitCommaSeparateSet((String) getMessageAnnotation(REPLY_TO_TYPE)));
+ return _replyTo != null ? _replyTo : toDestination(getReplyTo(), splitCommaSeparateSet((String) getMessageAnnotation(REPLY_TO_TYPE)));
}
public void setJMSReplyTo(Destination destination) throws NonAMQPDestinationException
{
+ _replyTo = (DestinationImpl) destination;
if( destination==null )
{
setReplyTo(null);
@@ -194,9 +196,16 @@ public abstract class MessageImpl implem
}
else
{
- DecodedDestination dd = toDecodedDestination(destination);
- setReplyTo(dd.getAddress());
- messageAnnotationMap().put(REPLY_TO_TYPE, join(",", dd.getAttributes()));
+ if(_replyTo.getLocalTerminus() != null)
+ {
+ setReplyTo(_replyTo.getLocalTerminus());
+ }
+ else
+ {
+ DecodedDestination dd = toDecodedDestination(destination);
+ setReplyTo(dd.getAddress());
+ messageAnnotationMap().put(REPLY_TO_TYPE, join(",", dd.getAttributes()));
+ }
}
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java Tue Feb 11 10:19:17 2014
@@ -77,7 +77,11 @@ public class MessageProducerImpl impleme
{
try
{
- _sender = _session.getClientSession().createSender(_session.toAddress(_destination), new Session.SourceConfigurator()
+ final String sourceName = _destination.getLocalTerminus() != null
+ ? _destination.getLocalTerminus()
+ : UUID.randomUUID().toString();
+
+ _sender = _session.getClientSession().createSender(sourceName, _session.toAddress(_destination), new Session.SourceConfigurator()
{
public void configureSource(final Source source)
{
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueImpl.java Tue Feb 11 10:19:17 2014
@@ -20,6 +20,7 @@ package org.apache.qpid.amqp_1_0.jms.imp
import org.apache.qpid.amqp_1_0.jms.Queue;
+import java.util.UUID;
import java.util.WeakHashMap;
public class QueueImpl extends DestinationImpl implements Queue
@@ -37,13 +38,24 @@ public class QueueImpl extends Destinati
return getAddress();
}
- public static synchronized QueueImpl createQueue(final String address)
+ public static synchronized QueueImpl createQueue(String address)
{
- QueueImpl queue = QUEUE_CACHE.get(address);
- if(queue == null)
+ QueueImpl queue;
+ if (address.endsWith("!!"))
{
+ address = address.substring(0, address.length() - 2);
+ String localTerminusName = UUID.randomUUID().toString();
queue = new QueueImpl(address);
- QUEUE_CACHE.put(address, queue);
+ queue.setLocalTerminus(localTerminusName);
+ }
+ else
+ {
+ queue = QUEUE_CACHE.get(address);
+ if(queue == null)
+ {
+ queue = new QueueImpl(address);
+ QUEUE_CACHE.put(address, queue);
+ }
}
return queue;
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueReceiverImpl.java Tue Feb 11 10:19:17 2014
@@ -24,6 +24,8 @@ import org.apache.qpid.amqp_1_0.client.R
import org.apache.qpid.amqp_1_0.jms.Queue;
import org.apache.qpid.amqp_1_0.jms.QueueReceiver;
+import java.util.UUID;
+
public class QueueReceiverImpl extends MessageConsumerImpl implements QueueReceiver
{
QueueReceiverImpl(final QueueImpl destination,
@@ -40,7 +42,11 @@ public class QueueReceiverImpl extends M
{
try
{
- return getSession().getClientSession().createMovingReceiver(getSession().toAddress(getDestination()));
+ final String targetAddr =
+ getDestination().getLocalTerminus() != null ? getDestination().getLocalTerminus() : UUID
+ .randomUUID().toString();
+ return getSession().getClientSession().createMovingReceiver(getSession().toAddress(getDestination()),
+ targetAddr);
}
catch (ConnectionErrorException e)
{
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java Tue Feb 11 10:19:17 2014
@@ -460,7 +460,7 @@ public class SessionImpl implements Sess
{
checkClosed();
checkNotTopicSession();
- return new QueueImpl(s);
+ return QueueImpl.valueOf(s);
}
public QueueReceiver createReceiver(final Queue queue) throws JMSException
@@ -488,7 +488,7 @@ public class SessionImpl implements Sess
{
checkClosed();
checkNotQueueSession();
- return new TopicImpl(s);
+ return TopicImpl.valueOf(s);
}
public TopicSubscriber createSubscriber(final Topic topic) throws JMSException
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicImpl.java Tue Feb 11 10:19:17 2014
@@ -20,6 +20,7 @@ package org.apache.qpid.amqp_1_0.jms.imp
import org.apache.qpid.amqp_1_0.jms.Topic;
+import java.util.UUID;
import java.util.WeakHashMap;
public class TopicImpl extends DestinationImpl implements Topic
@@ -38,13 +39,24 @@ public class TopicImpl extends Destinati
return getAddress();
}
- public static synchronized TopicImpl createTopic(final String address)
+ public static synchronized TopicImpl createTopic(String address)
{
- TopicImpl topic = TOPIC_CACHE.get(address);
- if(topic == null)
+ TopicImpl topic;
+ if (address.endsWith("!!"))
{
+ address = address.substring(0, address.length() - 2);
+ String localTerminusName = UUID.randomUUID().toString();
topic = new TopicImpl(address);
- TOPIC_CACHE.put(address, topic);
+ topic.setLocalTerminus(localTerminusName);
+ }
+ else
+ {
+ topic = TOPIC_CACHE.get(address);
+ if(topic == null)
+ {
+ topic = new TopicImpl(address);
+ TOPIC_CACHE.put(address, topic);
+ }
}
return topic;
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java Tue Feb 11 10:19:17 2014
@@ -19,6 +19,7 @@
package org.apache.qpid.amqp_1_0.jms.impl;
import java.util.Map;
+import java.util.UUID;
import javax.jms.InvalidSelectorException;
import javax.jms.JMSException;
import org.apache.qpid.amqp_1_0.client.AcknowledgeMode;
@@ -67,7 +68,9 @@ public class TopicSubscriberImpl extends
try
{
String address = getSession().toAddress(getDestination());
- Receiver receiver = getSession().getClientSession().createReceiver(address,
+ String targetAddress = getDestination().getLocalTerminus() != null ? getDestination().getLocalTerminus() : UUID.randomUUID().toString();
+
+ Receiver receiver = getSession().getClientSession().createReceiver(address, targetAddress,
StdDistMode.COPY, AcknowledgeMode.ALO,
getLinkName(), isDurable(), getFilters(),
null);
Modified: qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java Tue Feb 11 10:19:17 2014
@@ -78,8 +78,14 @@ public class Session
public Sender createSender(final String targetName, final SourceConfigurator configurator)
throws Sender.SenderCreationException, ConnectionClosedException
{
-
final String sourceName = UUID.randomUUID().toString();
+ return createSender(sourceName, targetName, configurator);
+ }
+
+ public Sender createSender(final String sourceName, final String targetName, final SourceConfigurator configurator)
+ throws Sender.SenderCreationException, ConnectionClosedException
+ {
+
return new Sender(this, targetName +"<-"+sourceName, targetName, sourceName, false)
{
@Override
@@ -150,93 +156,118 @@ public class Session
public Receiver createReceiver(final String sourceAddr) throws ConnectionErrorException
{
- return createReceiver(sourceAddr, null, AcknowledgeMode.ALO);
+ return createReceiver(sourceAddr, UUID.randomUUID().toString(), null, AcknowledgeMode.ALO);
}
public Receiver createReceiver(final String queue, final AcknowledgeMode mode)
throws ConnectionErrorException
{
- return createReceiver(queue, null, mode);
+ return createReceiver(queue, UUID.randomUUID().toString(), null, mode);
}
public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName)
throws ConnectionErrorException
{
- return createReceiver(queue, null, mode, linkName);
+ return createReceiver(queue, UUID.randomUUID().toString(), null, mode, linkName);
}
public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName, boolean isDurable)
throws ConnectionErrorException
{
- return createReceiver(queue, null, mode, linkName, isDurable);
+ return createReceiver(queue, UUID.randomUUID().toString(), null, mode, linkName, isDurable);
}
public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName, boolean isDurable,
Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
throws ConnectionErrorException
{
- return createReceiver(queue, null, mode, linkName, isDurable, filters, unsettled);
+ return createReceiver(queue, (DistributionMode) null, mode, linkName, isDurable, filters, unsettled);
}
-
- public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName,
- boolean isDurable, Map<Binary, Outcome> unsettled)
+ public Receiver createReceiver(final String queue, String targetName, final AcknowledgeMode mode, String linkName, boolean isDurable,
+ Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
throws ConnectionErrorException
{
- return createReceiver(queue, null, mode, linkName, isDurable, unsettled);
+ return createReceiver(queue, targetName, null, mode, linkName, isDurable, filters, unsettled);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode)
+ public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName,
+ boolean isDurable, Map<Binary, Outcome> unsettled)
throws ConnectionErrorException
{
- return createReceiver(sourceAddr, mode, AcknowledgeMode.ALO);
+ return createReceiver(queue, UUID.randomUUID().toString(), null, mode, linkName, isDurable, unsettled);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode, String linkName)
+
+ private synchronized Receiver createReceiver(final String sourceAddr,
+ final String targetAddr,
+ DistributionMode mode)
throws ConnectionErrorException
{
- return createReceiver(sourceAddr, mode, AcknowledgeMode.ALO, linkName);
+ return createReceiver(sourceAddr, targetAddr, mode, AcknowledgeMode.ALO);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
- final AcknowledgeMode ackMode)
+ private synchronized Receiver createReceiver(final String sourceAddr,
+ final String targetAddr,
+ DistributionMode mode,
+ final AcknowledgeMode ackMode)
throws ConnectionErrorException
{
- return createReceiver(sourceAddr, mode, ackMode, null);
+ return createReceiver(sourceAddr, targetAddr, mode, ackMode, null);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
- final AcknowledgeMode ackMode, String linkName)
+ private synchronized Receiver createReceiver(final String sourceAddr,
+ final String targetAddr,
+ DistributionMode mode,
+ final AcknowledgeMode ackMode,
+ String linkName)
throws ConnectionErrorException
{
- return createReceiver(sourceAddr,mode, ackMode, linkName, false);
+ return createReceiver(sourceAddr, targetAddr, mode, ackMode, linkName, false);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
- final AcknowledgeMode ackMode, String linkName, boolean isDurable)
+ private synchronized Receiver createReceiver(final String sourceAddr,
+ final String targetAddr,
+ DistributionMode mode,
+ final AcknowledgeMode ackMode,
+ String linkName,
+ boolean isDurable)
throws ConnectionErrorException
{
- return createReceiver(sourceAddr, mode, ackMode, linkName, isDurable, null);
+ return createReceiver(sourceAddr, targetAddr, mode, ackMode, linkName, isDurable, null);
}
- private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
- final AcknowledgeMode ackMode, String linkName, boolean isDurable,
- Map<Binary, Outcome> unsettled)
+ private synchronized Receiver createReceiver(final String sourceAddr,
+ final String targetAddr,
+ DistributionMode mode,
+ final AcknowledgeMode ackMode,
+ String linkName,
+ boolean isDurable,
+ Map<Binary, Outcome> unsettled)
throws ConnectionErrorException
{
return createReceiver(sourceAddr,mode,ackMode, linkName, isDurable, null, unsettled);
}
public synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
+ final AcknowledgeMode ackMode, String linkName, boolean isDurable,
+ Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
+ throws ConnectionErrorException
+ {
+ return createReceiver(sourceAddr, UUID.randomUUID().toString(), mode, ackMode, linkName, isDurable, filters, unsettled);
+ }
+
+ public synchronized Receiver createReceiver(final String sourceAddr, String targetAddr, DistributionMode mode,
final AcknowledgeMode ackMode, String linkName, boolean isDurable,
Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
throws ConnectionErrorException
{
final Target target = new Target();
+ target.setAddress(targetAddr);
final Source source = new Source();
source.setAddress(sourceAddr);
source.setDistributionMode(mode);
@@ -258,12 +289,17 @@ public class Session
public synchronized Receiver createCopyingReceiver(final String sourceAddr) throws ConnectionErrorException
{
- return createReceiver(sourceAddr, StdDistMode.COPY);
+ return createReceiver(sourceAddr, UUID.randomUUID().toString(), StdDistMode.COPY);
}
public synchronized Receiver createMovingReceiver(final String sourceAddr) throws ConnectionErrorException
{
- return createReceiver(sourceAddr, StdDistMode.MOVE);
+ return createReceiver(sourceAddr, UUID.randomUUID().toString(), StdDistMode.MOVE);
+ }
+
+ public synchronized Receiver createMovingReceiver(final String sourceAddr, final String targetAddr) throws ConnectionErrorException
+ {
+ return createReceiver(sourceAddr, UUID.randomUUID().toString(), StdDistMode.MOVE);
}
public Receiver createTemporaryQueueReceiver() throws AmqpErrorException, ConnectionErrorException
Propchange: qpid/trunk/qpid/java/amqp-1-0-common/
('svn:mergeinfo' removed)
Propchange: qpid/trunk/qpid/java/broker-core/
('svn:mergeinfo' removed)
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Tue Feb 11 10:19:17 2014
@@ -43,6 +43,7 @@ import org.apache.qpid.server.queue.AMQQ
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
+import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -428,10 +429,10 @@ public abstract class AbstractExchange i
return queues;
}
- public final int send(final ServerMessage message,
+ public final <M extends ServerMessage<? extends StorableMessageMetaData>> int send(final M message,
final InstanceProperties instanceProperties,
final ServerTransaction txn,
- final Action<MessageInstance<? extends Consumer>> postEnqueueAction)
+ final Action<? super MessageInstance<?, ? extends Consumer>> postEnqueueAction)
{
List<? extends BaseQueue> queues = route(message, instanceProperties);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java Tue Feb 11 10:19:17 2014
@@ -46,6 +46,7 @@ import org.apache.qpid.server.queue.AMQQ
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -335,10 +336,10 @@ public class DefaultExchange implements
return _id;
}
- public final int send(final ServerMessage message,
+ public final <M extends ServerMessage<? extends StorableMessageMetaData>> int send(final M message,
final InstanceProperties instanceProperties,
final ServerTransaction txn,
- final Action<MessageInstance<? extends Consumer>> postEnqueueAction)
+ final Action<? super MessageInstance<?, ? extends Consumer>> postEnqueueAction)
{
final AMQQueue q = _virtualHost.getQueue(message.getRoutingKey());
if(q == null)
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java Tue Feb 11 10:19:17 2014
@@ -21,6 +21,7 @@
package org.apache.qpid.server.message;
import org.apache.qpid.server.consumer.Consumer;
+import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
@@ -37,8 +38,8 @@ public interface MessageDestination exte
* @param postEnqueueAction action to perform on the result of every enqueue (may be null)
* @return the number of queues in which the message was enqueued performed
*/
- int send(ServerMessage message,
+ <M extends ServerMessage<? extends StorableMessageMetaData>> int send(M message,
InstanceProperties instanceProperties,
ServerTransaction txn,
- Action<MessageInstance<? extends Consumer>> postEnqueueAction);
+ Action<? super MessageInstance<?,? extends Consumer>> postEnqueueAction);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java Tue Feb 11 10:19:17 2014
@@ -30,7 +30,7 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.StateChangeListener;
-public interface MessageInstance<C extends Consumer>
+public interface MessageInstance<M extends MessageInstance<M,C>, C extends Consumer>
{
@@ -45,9 +45,9 @@ public interface MessageInstance<C exten
void decrementDeliveryCount();
- void addStateChangeListener(StateChangeListener<MessageInstance<C>, State> listener);
+ void addStateChangeListener(StateChangeListener<? super M,State> listener);
- boolean removeStateChangeListener(StateChangeListener<MessageInstance<C>, State> listener);
+ boolean removeStateChangeListener(StateChangeListener<? super M, State> listener);
boolean acquiredByConsumer();
@@ -71,7 +71,7 @@ public interface MessageInstance<C exten
int getMaximumDeliveryCount();
- int routeToAlternate(Action<MessageInstance<? extends Consumer>> action, ServerTransaction txn);
+ int routeToAlternate(Action<? super MessageInstance<?, ? extends Consumer>> action, ServerTransaction txn);
Filterable asFilterable();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java Tue Feb 11 10:19:17 2014
@@ -32,17 +32,17 @@ import org.apache.qpid.server.store.Tran
import java.util.Collection;
import java.util.EnumSet;
-public interface MessageSource<C extends Consumer> extends TransactionLogResource, MessageNode
+public interface MessageSource<C extends Consumer, S extends MessageSource<C,S>> extends TransactionLogResource, MessageNode
{
- C addConsumer(ConsumerTarget target, FilterManager filters,
+ <T extends ConsumerTarget> C addConsumer(T target, FilterManager filters,
Class<? extends ServerMessage> messageClass,
String consumerName, EnumSet<Consumer.Option> options) throws AMQException;
Collection<C> getConsumers();
- void addConsumerRegistrationListener(ConsumerRegistrationListener listener);
+ void addConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
- void removeConsumerRegistrationListener(ConsumerRegistrationListener listener);
+ void removeConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
AuthorizationHolder getAuthorizationHolder();
@@ -54,10 +54,10 @@ public interface MessageSource<C extends
boolean isExclusive();
- interface ConsumerRegistrationListener
+ interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,Q>>
{
- void consumerAdded(AMQQueue queue, Consumer consumer);
- void consumerRemoved(AMQQueue queue, Consumer consumer);
+ void consumerAdded(Q source, Consumer consumer);
+ void consumerRemoved(Q queue, Consumer consumer);
}
/**
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java Tue Feb 11 10:19:17 2014
@@ -27,9 +27,7 @@ import org.apache.qpid.server.security.A
public interface AccessControlProvider extends ConfiguredObject
{
- public static final String ID = "id";
public static final String DESCRIPTION = "description";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java Tue Feb 11 10:19:17 2014
@@ -29,9 +29,7 @@ import org.apache.qpid.server.security.S
public interface AuthenticationProvider extends ConfiguredObject
{
- public static final String ID = "id";
public static final String DESCRIPTION = "description";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java Tue Feb 11 10:19:17 2014
@@ -43,9 +43,7 @@ public interface Binding extends Configu
public String ARGUMENTS = "arguments";
public String CREATED = "created";
public String DURABLE = "durable";
- public String ID = "id";
public String LIFETIME_POLICY = "lifetimePolicy";
- public String NAME = "name";
public String STATE = "state";
public String TIME_TO_LIVE = "timeToLive";
public String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Tue Feb 11 10:19:17 2014
@@ -48,9 +48,7 @@ public interface Broker extends Configur
String SUPPORTED_PREFERENCES_PROVIDERS_TYPES = "supportedPreferencesProviderTypes";
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Tue Feb 11 10:19:17 2014
@@ -25,12 +25,22 @@ import java.util.Collection;
import java.util.Map;
import java.util.UUID;
+@AmqpManagement(
+ attributes = {
+ ConfiguredObject.ID,
+ ConfiguredObject.NAME
+ },
+ operations = {},
+ creatable = false
+)
/**
* An object that can be "managed" (eg via the web interface) and usually read from configuration.
*/
public interface ConfiguredObject
{
-
+ public static final String ID = "id";
+ public static final String NAME = "name";
+// public static final String TYPE = "type";
/**
* Get the universally unique identifier for the object
*
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java Tue Feb 11 10:19:17 2014
@@ -24,6 +24,32 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+@AmqpManagement(
+ attributes = {
+ Connection.ID,
+ Connection.NAME,
+ Connection.STATE,
+ Connection.DURABLE,
+ Connection.LIFETIME_POLICY,
+ Connection.TIME_TO_LIVE,
+ Connection.CREATED,
+ Connection.UPDATED,
+ Connection.CLIENT_ID,
+ Connection.CLIENT_VERSION,
+ Connection.INCOMING,
+ Connection.LOCAL_ADDRESS,
+ Connection.PRINCIPAL,
+ Connection.PROPERTIES,
+ Connection.REMOTE_ADDRESS,
+ Connection.REMOTE_PROCESS_NAME,
+ Connection.REMOTE_PROCESS_PID,
+ Connection.SESSION_COUNT_LIMIT,
+ Connection.TRANSPORT,
+ Connection.PORT
+ },
+ operations = {},
+ creatable = false
+)
public interface Connection extends ConfiguredObject
{
@@ -59,8 +85,6 @@ public interface Connection extends Conf
// Attributes
- public static final String ID = "id";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java Tue Feb 11 10:19:17 2014
@@ -33,9 +33,7 @@ public interface Consumer extends Config
public String SETTLEMENT_MODE = "settlementMode";
public String CREATED = "created";
public String DURABLE = "durable";
- public String ID = "id";
public String LIFETIME_POLICY = "lifetimePolicy";
- public String NAME = "name";
public String STATE = "state";
public String TIME_TO_LIVE = "timeToLive";
public String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Tue Feb 11 10:19:17 2014
@@ -25,6 +25,22 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+@AmqpManagement(
+ attributes = {
+ Exchange.ID,
+ Exchange.NAME,
+ Exchange.STATE,
+ Exchange.DURABLE,
+ Exchange.LIFETIME_POLICY,
+ Exchange.TIME_TO_LIVE,
+ Exchange.CREATED,
+ Exchange.UPDATED,
+ Exchange.ALTERNATE_EXCHANGE,
+ Exchange.TYPE
+ },
+ operations = {}
+)
+
public interface Exchange extends ConfiguredObject
{
String BINDING_COUNT = "bindingCount";
@@ -47,9 +63,7 @@ public interface Exchange extends Config
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java Tue Feb 11 10:19:17 2014
@@ -27,9 +27,7 @@ public interface Group extends Configure
{
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java Tue Feb 11 10:19:17 2014
@@ -27,9 +27,7 @@ public interface GroupMember extends Con
{
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java Tue Feb 11 10:19:17 2014
@@ -27,9 +27,7 @@ import java.util.Set;
public interface GroupProvider extends ConfiguredObject
{
- public static final String ID = "id";
public static final String DESCRIPTION = "description";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java Tue Feb 11 10:19:17 2014
@@ -28,8 +28,6 @@ import javax.net.ssl.KeyManager;
public interface KeyStore extends ConfiguredObject
{
- String ID = "id";
- String NAME = "name";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java Tue Feb 11 10:19:17 2014
@@ -29,9 +29,7 @@ public interface Plugin extends Configur
//Hack, using it for the class name only for consistency with the other things.
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Tue Feb 11 10:19:17 2014
@@ -29,9 +29,7 @@ public interface Port extends Configured
{
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java Tue Feb 11 10:19:17 2014
@@ -29,8 +29,6 @@ import java.util.Set;
public interface PreferencesProvider extends ConfiguredObject
{
- String ID = "id";
- String NAME = "name";
String TYPE = "type";
String CREATED = "created";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Tue Feb 11 10:19:17 2014
@@ -25,6 +25,40 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.qpid.server.queue.QueueEntryVisitor;
+@AmqpManagement(
+ attributes = {
+ Queue.ID,
+ Queue.NAME,
+ Queue.DESCRIPTION,
+ Queue.STATE,
+ Queue.DURABLE,
+ Queue.LIFETIME_POLICY,
+ Queue.TIME_TO_LIVE,
+ Queue.CREATED,
+ Queue.UPDATED,
+ Queue.QUEUE_TYPE,
+ Queue.ALTERNATE_EXCHANGE,
+ Queue.EXCLUSIVE,
+ Queue.OWNER,
+ Queue.NO_LOCAL,
+ Queue.LVQ_KEY,
+ Queue.SORT_KEY,
+ Queue.MESSAGE_GROUP_KEY,
+ Queue.MESSAGE_GROUP_SHARED_GROUPS,
+ Queue.MAXIMUM_DELIVERY_ATTEMPTS,
+ Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES,
+ Queue.QUEUE_FLOW_RESUME_SIZE_BYTES,
+ Queue.QUEUE_FLOW_STOPPED,
+ Queue.ALERT_THRESHOLD_MESSAGE_AGE,
+ Queue.ALERT_THRESHOLD_MESSAGE_SIZE,
+ Queue.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
+ Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+ Queue.ALERT_REPEAT_GAP,
+ Queue.PRIORITIES
+ },
+ operations = {}
+)
+
public interface Queue extends ConfiguredObject
{
public static final String BINDING_COUNT = "bindingCount";
@@ -69,9 +103,7 @@ public interface Queue extends Configure
- public static final String ID = "id";
public static final String DESCRIPTION = "description";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
@@ -98,7 +130,7 @@ public interface Queue extends Configure
public static final String QUEUE_FLOW_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
public static final String QUEUE_FLOW_STOPPED = "queueFlowStopped";
public static final String SORT_KEY = "sortKey";
- public static final String TYPE = "type";
+ public static final String QUEUE_TYPE = "queueType";
public static final String PRIORITIES = "priorities";
public static final String CREATE_DLQ_ON_CREATION = "x-qpid-dlq-enabled"; // TODO - this value should change
@@ -118,7 +150,7 @@ public interface Queue extends Configure
TIME_TO_LIVE,
CREATED,
UPDATED,
- TYPE,
+ QUEUE_TYPE,
ALTERNATE_EXCHANGE,
EXCLUSIVE,
OWNER,
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java Tue Feb 11 10:19:17 2014
@@ -51,8 +51,6 @@ public interface Session extends Configu
XA_TRANSACTION_BRANCH_SUSPENDS));
- public static final String ID = "id";
- public static final String NAME = "name";
public static final String STATE = "state";
public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java Tue Feb 11 10:19:17 2014
@@ -28,8 +28,6 @@ import javax.net.ssl.TrustManager;
public interface TrustStore extends ConfiguredObject
{
- String ID = "id";
- String NAME = "name";
String DURABLE = "durable";
String LIFETIME_POLICY = "lifetimePolicy";
String STATE = "state";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java Tue Feb 11 10:19:17 2014
@@ -30,9 +30,7 @@ public interface User extends Configured
{
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String UPDATED = "updated";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Tue Feb 11 10:19:17 2014
@@ -31,6 +31,43 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+@AmqpManagement(
+ attributes = {
+ VirtualHost.ID,
+ VirtualHost.NAME,
+ VirtualHost.TYPE,
+ VirtualHost.STATE,
+ VirtualHost.DURABLE,
+ VirtualHost.LIFETIME_POLICY,
+ VirtualHost.TIME_TO_LIVE,
+ VirtualHost.CREATED,
+ VirtualHost.UPDATED,
+ VirtualHost.SUPPORTED_EXCHANGE_TYPES,
+ VirtualHost.SUPPORTED_QUEUE_TYPES,
+ VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED,
+ VirtualHost.HOUSEKEEPING_CHECK_PERIOD,
+ VirtualHost.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS,
+ VirtualHost.QUEUE_FLOW_CONTROL_SIZE_BYTES,
+ VirtualHost.QUEUE_FLOW_RESUME_SIZE_BYTES,
+ VirtualHost.CONFIG_STORE_TYPE,
+ VirtualHost.CONFIG_STORE_PATH,
+ VirtualHost.STORE_TYPE,
+ VirtualHost.STORE_PATH,
+ VirtualHost.STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
+ VirtualHost.STORE_TRANSACTION_IDLE_TIMEOUT_WARN,
+ VirtualHost.STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
+ VirtualHost.STORE_TRANSACTION_OPEN_TIMEOUT_WARN,
+ VirtualHost.QUEUE_ALERT_REPEAT_GAP,
+ VirtualHost.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE,
+ VirtualHost.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE,
+ VirtualHost.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
+ VirtualHost.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+ VirtualHost.CONFIG_PATH
+ },
+ operations = {},
+ managesChildren = true
+)
+
public interface VirtualHost extends ConfiguredObject
{
// Statistics
@@ -81,9 +118,7 @@ public interface VirtualHost extends Con
String SUPPORTED_QUEUE_TYPES = "supportedQueueTypes";
String CREATED = "created";
String DURABLE = "durable";
- String ID = "id";
String LIFETIME_POLICY = "lifetimePolicy";
- String NAME = "name";
String STATE = "state";
String TIME_TO_LIVE = "timeToLive";
String TYPE = "type";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java?rev=1567026&r1=1567025&r2=1567026&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java Tue Feb 11 10:19:17 2014
@@ -26,13 +26,13 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQStoreException;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFinder;
import org.apache.qpid.server.model.Exchange;
@@ -49,8 +49,9 @@ import org.apache.qpid.server.store.Dura
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.util.MapValueConverter;
-final class QueueAdapter extends AbstractAdapter implements Queue,
- AMQQueue.ConsumerRegistrationListener, AMQQueue.NotificationListener
+final class QueueAdapter<Q extends AMQQueue<?,Q,?>> extends AbstractAdapter implements Queue,
+ MessageSource.ConsumerRegistrationListener<Q>,
+ AMQQueue.NotificationListener
{
@SuppressWarnings("serial")
static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
@@ -66,10 +67,11 @@ final class QueueAdapter extends Abstrac
put(DESCRIPTION, String.class);
}});
- private final AMQQueue _queue;
+ private final AMQQueue<?,Q,?> _queue;
+
private final Map<Binding, BindingAdapter> _bindingAdapters =
new HashMap<Binding, BindingAdapter>();
- private Map<Consumer, ConsumerAdapter> _consumerAdapters =
+ private final Map<Consumer, ConsumerAdapter> _consumerAdapters =
new HashMap<Consumer, ConsumerAdapter>();
@@ -77,7 +79,7 @@ final class QueueAdapter extends Abstrac
private QueueStatisticsAdapter _statistics;
private QueueNotificationListener _queueNotificationListener;
- public QueueAdapter(final VirtualHostAdapter virtualHostAdapter, final AMQQueue queue)
+ public QueueAdapter(final VirtualHostAdapter virtualHostAdapter, final AMQQueue<?,Q,?> queue)
{
super(queue.getId(), virtualHostAdapter.getTaskExecutor());
_vhost = virtualHostAdapter;
@@ -124,11 +126,10 @@ final class QueueAdapter extends Abstrac
private void populateConsumers()
{
- Collection<Consumer> actualConsumers = _queue.getConsumers();
+ Collection<? extends Consumer> actualConsumers = _queue.getConsumers();
synchronized (_consumerAdapters)
{
- Iterator<Consumer> iter = _consumerAdapters.keySet().iterator();
for(Consumer consumer : actualConsumers)
{
if(!_consumerAdapters.containsKey(consumer))
@@ -321,7 +322,7 @@ final class QueueAdapter extends Abstrac
{
// TODO
}
- else if(TYPE.equals(name))
+ else if(QUEUE_TYPE.equals(name))
{
// TODO
}
@@ -396,9 +397,10 @@ final class QueueAdapter extends Abstrac
}
else if(LVQ_KEY.equals(name))
{
- if(_queue instanceof ConflationQueue)
+ AMQQueue queue = _queue;
+ if(queue instanceof ConflationQueue)
{
- return ((ConflationQueue)_queue).getConflationKey();
+ return ((ConflationQueue)queue).getConflationKey();
}
}
else if(MAXIMUM_DELIVERY_ATTEMPTS.equals(name))
@@ -427,22 +429,24 @@ final class QueueAdapter extends Abstrac
}
else if(SORT_KEY.equals(name))
{
- if(_queue instanceof SortedQueue)
+ AMQQueue queue = _queue;
+ if(queue instanceof SortedQueue)
{
- return ((SortedQueue)_queue).getSortedPropertyName();
+ return ((SortedQueue)queue).getSortedPropertyName();
}
}
- else if(TYPE.equals(name))
+ else if(QUEUE_TYPE.equals(name))
{
- if(_queue instanceof SortedQueue)
+ AMQQueue queue = _queue;
+ if(queue instanceof SortedQueue)
{
return "sorted";
}
- if(_queue instanceof ConflationQueue)
+ if(queue instanceof ConflationQueue)
{
return "lvq";
}
- if(_queue instanceof AMQPriorityQueue)
+ if(queue instanceof PriorityQueue)
{
return "priority";
}
@@ -486,9 +490,10 @@ final class QueueAdapter extends Abstrac
}
else if(PRIORITIES.equals(name))
{
- if(_queue instanceof AMQPriorityQueue)
+ AMQQueue queue = _queue;
+ if(queue instanceof PriorityQueue)
{
- return ((AMQPriorityQueue)_queue).getPriorities();
+ return ((PriorityQueue)queue).getPriorities();
}
}
return super.getAttribute(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org