Author: kwall
Date: Tue Mar 3 14:56:40 2015
New Revision: 1663717
URL: http://svn.apache.org/r1663717
Log:
merge from trunk
Added:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConnectionValidator.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ConnectionValidator.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFilterFactory.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFilterFactory.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNode.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNode.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/
- copied from r1663687,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/
- copied from r1663687,
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/resources/
- copied from r1663687,
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/resources/
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
- copied unchanged from r1663687,
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
Removed:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/resources/system.properties
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/ (props changed)
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/README.txt
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedAttribute.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttribute.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/DerivedAttribute.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedAttribute.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RemoteReplicationNode.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStore.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/ColumnDefDialog.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/RowNumberLimitDialog.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/aclfile/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addStore.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(contents, props changed)
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/CPPExcludes
(contents, props changed)
Propchange: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 14:56:40 2015
@@ -9,4 +9,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1643238-1659605
+/qpid/trunk/qpid/java:1643238-1663687
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/README.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/README.txt?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/README.txt (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/README.txt Tue Mar 3
14:56:40 2015
@@ -7,7 +7,7 @@ Some initial helper info can be found be
==== Building the code and running the tests ====
-Here are some example Maven build commands that you may find usefull.
+Here are some example Maven build commands that you may find useful.
Clean previous builds output and install all modules to local repository
without
running any of the unit or system tests.
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/AmqpMessageImpl.java
Tue Mar 3 14:56:40 2015
@@ -27,6 +27,7 @@ import java.util.ListIterator;
import org.apache.qpid.amqp_1_0.jms.AmqpMessage;
import org.apache.qpid.amqp_1_0.type.Section;
+import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
import org.apache.qpid.amqp_1_0.type.messaging.ApplicationProperties;
import org.apache.qpid.amqp_1_0.type.messaging.DeliveryAnnotations;
import org.apache.qpid.amqp_1_0.type.messaging.Footer;
@@ -36,6 +37,8 @@ import org.apache.qpid.amqp_1_0.type.mes
public class AmqpMessageImpl extends MessageImpl implements AmqpMessage
{
+ private static final List<Section> EMPTY_MESSAGE =
+ Collections.<Section>singletonList(new AmqpValue(null));
private List<Section> _sections;
protected AmqpMessageImpl(Header header,
@@ -57,7 +60,7 @@ public class AmqpMessageImpl extends Mes
new DeliveryAnnotations(new HashMap()),
new MessageAnnotations(new HashMap()), new Properties(), new
ApplicationProperties(new HashMap()), new Footer(Collections.EMPTY_MAP),
session);
- _sections = new ArrayList<Section>();
+ _sections = EMPTY_MESSAGE;
}
public int getSectionCount()
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
Tue Mar 3 14:56:40 2015
@@ -771,6 +771,16 @@ public class ConnectionFactoryImpl imple
return _sslEnabledProtocols;
}
+ public SSLContext getSslContext()
+ {
+ return _sslContext;
+ }
+
+ public void setSslContext(final SSLContext sslContext)
+ {
+ _sslContext = sslContext;
+ }
+
public void setSslEnabledProtocols(final String sslEnabledProtocols)
{
_sslEnabledProtocols = sslEnabledProtocols;
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
Tue Mar 3 14:56:40 2015
@@ -226,6 +226,13 @@ class MessageFactory
messageAnnotations,
properties,appProperties,body,footer, _session);
}
}
+ else if(body.size() == 0)
+ {
+ message = new AmqpMessageImpl(header,
+ deliveryAnnotations,
+ messageAnnotations,
properties,appProperties,
+
Collections.<Section>singletonList(new AmqpValue(null)),footer, _session);
+ }
else
{
message = new AmqpMessageImpl(header,
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java
Tue Mar 3 14:56:40 2015
@@ -20,21 +20,89 @@
*/
package org.apache.qpid.amqp_1_0.client;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
import org.apache.qpid.amqp_1_0.type.Binary;
import org.apache.qpid.amqp_1_0.type.DeliveryState;
import org.apache.qpid.amqp_1_0.type.Section;
+import org.apache.qpid.amqp_1_0.type.messaging.AmqpSequence;
import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
import org.apache.qpid.amqp_1_0.type.messaging.ApplicationProperties;
+import org.apache.qpid.amqp_1_0.type.messaging.Data;
+import org.apache.qpid.amqp_1_0.type.messaging.DeliveryAnnotations;
+import org.apache.qpid.amqp_1_0.type.messaging.Footer;
import org.apache.qpid.amqp_1_0.type.messaging.Header;
+import org.apache.qpid.amqp_1_0.type.messaging.MessageAnnotations;
import org.apache.qpid.amqp_1_0.type.messaging.Properties;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
public class Message
{
+
+ private static final Map<Class<? extends Section>, Collection<Class<?
extends Section>>> VALID_NEXT_SECTIONS = new HashMap<>();
+
+ static
+ {
+ VALID_NEXT_SECTIONS.put(null, Arrays.asList(Header.class,
+ DeliveryAnnotations.class,
+ MessageAnnotations.class,
+ Properties.class,
+
ApplicationProperties.class,
+ AmqpValue.class,
+ AmqpSequence.class,
+ Data.class));
+
+ VALID_NEXT_SECTIONS.put(Header.class,
Arrays.asList(DeliveryAnnotations.class,
+
MessageAnnotations.class,
+ Properties.class,
+
ApplicationProperties.class,
+ AmqpValue.class,
+ AmqpSequence.class,
+ Data.class));
+
+ VALID_NEXT_SECTIONS.put(DeliveryAnnotations.class,
Arrays.asList(MessageAnnotations.class,
+
Properties.class,
+
ApplicationProperties.class,
+
AmqpValue.class,
+
AmqpSequence.class,
+
Data.class));
+
+ VALID_NEXT_SECTIONS.put(MessageAnnotations.class,
Arrays.asList(Properties.class,
+
ApplicationProperties.class,
+
AmqpValue.class,
+
AmqpSequence.class,
+
Data.class));
+
+ VALID_NEXT_SECTIONS.put(Properties.class,
Arrays.asList(ApplicationProperties.class,
+
AmqpValue.class,
+
AmqpSequence.class,
+ Data.class));
+
+
+ VALID_NEXT_SECTIONS.put(ApplicationProperties.class,
Arrays.asList(AmqpValue.class,
+
AmqpSequence.class,
+
Data.class));
+
+ VALID_NEXT_SECTIONS.put(AmqpValue.class, Arrays.<Class<? extends
Section>>asList(Footer.class, null));
+
+ VALID_NEXT_SECTIONS.put(AmqpSequence.class,
Arrays.asList(AmqpSequence.class,
+
Footer.class, null));
+
+ VALID_NEXT_SECTIONS.put(Data.class, Arrays.asList(Data.class,
Footer.class, null));
+
+ VALID_NEXT_SECTIONS.put(Footer.class, Collections.<Class<? extends
Section>>singletonList(null));
+
+
+ }
+
+
private Binary _deliveryTag;
private List<Section> _payload = new ArrayList<Section>();
private Boolean _resume;
@@ -49,7 +117,12 @@ public class Message
public Message(Collection<Section> sections)
{
- _payload.addAll(sections);
+ this(sections, true);
+ }
+
+ public Message(Collection<Section> sections, boolean validate)
+ {
+ _payload.addAll(validate ? validateOrReorder(sections) : sections);
}
public Message(Section section)
@@ -63,6 +136,106 @@ public class Message
}
+ private static Collection<Section> validateOrReorder(final
Collection<Section> providedSections)
+ {
+ Collection<Section> validatedSections;
+ if(providedSections == null)
+ {
+ validatedSections = Collections.emptyList();
+ }
+ else if(isValidOrder(providedSections))
+ {
+ validatedSections = providedSections;
+ }
+ else
+ {
+ validatedSections = reorderSections(providedSections);
+ }
+ return validatedSections;
+ }
+
+ private static Collection<Section> reorderSections(final
Collection<Section> providedSections)
+ {
+ Collection<Section> validSections = new ArrayList<>();
+ List<Section> originalSection = new ArrayList<>(providedSections);
+ validSections.addAll(getAndRemoveSections(Header.class,
originalSection, false));
+ validSections.addAll(getAndRemoveSections(DeliveryAnnotations.class,
originalSection, false));
+ validSections.addAll(getAndRemoveSections(MessageAnnotations.class,
originalSection, false));
+ validSections.addAll(getAndRemoveSections(Properties.class,
originalSection, false));
+ validSections.addAll(getAndRemoveSections(ApplicationProperties.class,
originalSection, false));
+
+ final List<AmqpValue> valueSections =
getAndRemoveSections(AmqpValue.class, originalSection, false);
+ final List<AmqpSequence> sequenceSections =
getAndRemoveSections(AmqpSequence.class, originalSection, true);
+ final List<Data> dataSections = getAndRemoveSections(Data.class,
originalSection, true);
+
+ if(valueSections.isEmpty() && sequenceSections.isEmpty() &&
dataSections.isEmpty())
+ {
+ throw new IllegalArgumentException("Message must contain one of
Data, AmqpValue or AmqpSequence");
+ }
+ if((!valueSections.isEmpty() && (!sequenceSections.isEmpty() ||
!dataSections.isEmpty()))
+ || (!sequenceSections.isEmpty() && !dataSections.isEmpty()))
+ {
+ throw new IllegalArgumentException("Only one type of content Data,
AmqpValue or AmqpSequence can be used");
+ }
+ validSections.addAll(valueSections);
+ validSections.addAll(sequenceSections);
+ validSections.addAll(dataSections);
+
+ validSections.addAll(getAndRemoveSections(Footer.class,
originalSection, false));
+
+ if(!originalSection.isEmpty())
+ {
+ throw new IllegalArgumentException("Invalid section type: " +
originalSection.get(0).getClass().getName());
+ }
+ return validSections;
+ }
+
+ private static <T extends Section> List<T> getAndRemoveSections(Class<T>
clazz,
+
List<Section> sections,
+ boolean
allowMultiple)
+ {
+ List<T> desiredSections = new ArrayList<>();
+ ListIterator<Section> iterator = sections.listIterator();
+ while(iterator.hasNext())
+ {
+ Section s = iterator.next();
+ if(s.getClass() == clazz)
+ {
+ desiredSections.add((T)s);
+ iterator.remove();
+ }
+ }
+ if(desiredSections.size() > 1 && !allowMultiple)
+ {
+ throw new IllegalArgumentException("Multiple " +
clazz.getSimpleName() + " sections are not allowed");
+ }
+ return desiredSections;
+ }
+
+ private static boolean isValidOrder(final Collection<Section>
providedSections)
+ {
+ Class<? extends Section> previousSection = null;
+ final Iterator<? extends Section> it = providedSections.iterator();
+ while(it.hasNext())
+ {
+ Collection<Class<? extends Section>> validSections =
VALID_NEXT_SECTIONS.get(previousSection);
+ Section next = it.next();
+ Class<? extends Section> sectionClass = next.getClass();
+ if(validSections == null || !validSections.contains(sectionClass))
+ {
+ return false;
+ }
+ else
+ {
+ previousSection = sectionClass;
+ }
+ }
+ Collection<Class<? extends Section>> validSections =
VALID_NEXT_SECTIONS.get(previousSection);
+ return validSections != null && validSections.contains(null);
+ }
+
+
+
public Binary getDeliveryTag()
{
return _deliveryTag;
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
Tue Mar 3 14:56:40 2015
@@ -38,8 +38,10 @@ import org.apache.qpid.amqp_1_0.transpor
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.Binary;
import org.apache.qpid.amqp_1_0.type.DeliveryState;
+import org.apache.qpid.amqp_1_0.type.ErrorCondition;
import org.apache.qpid.amqp_1_0.type.Outcome;
import org.apache.qpid.amqp_1_0.type.Section;
+import org.apache.qpid.amqp_1_0.type.Symbol;
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
import org.apache.qpid.amqp_1_0.type.messaging.Modified;
@@ -58,6 +60,20 @@ import org.apache.qpid.amqp_1_0.type.tra
public class Receiver implements DeliveryStateHandler
{
+ private static final ErrorCondition UNKNOWN_ERROR_CONDITION = new
ErrorCondition()
+ {
+ @Override
+ public Symbol getValue()
+ {
+ return Symbol.valueOf("Unknown");
+ }
+
+ @Override
+ public String toString()
+ {
+ return getValue().toString();
+ }
+ };
private ReceivingLinkEndpoint _endpoint;
private int _id;
private static final UnsignedInteger DEFAULT_INITIAL_CREDIT =
UnsignedInteger.valueOf(100);
@@ -196,16 +212,20 @@ public class Receiver implements Deliver
{
throw new
ConnectionErrorException(AmqpError.INTERNAL_ERROR,"Interrupted while waiting
for detach following failed attach");
}
- throw new ConnectionErrorException(getError().getCondition(),
- getError().getDescription() ==
null
- ? "AMQP error: '" +
getError().getCondition().toString()
+
+ Error error = getError() == null
+ ? new Error(UNKNOWN_ERROR_CONDITION, "Unknown")
+ : getError();
+
+
+ ErrorCondition condition = error.getCondition() == null ?
UNKNOWN_ERROR_CONDITION : error.getCondition();
+
+ throw new ConnectionErrorException(condition,
+ error.getDescription() == null
+ ? "AMQP error: '" +
condition.toString()
+ "' when attempting
to create a receiver"
+ (source != null ? "
from: '" + source.getAddress() +"'" : "")
- :
getError().getDescription());
- }
- else
- {
-
+ :
error.getDescription());
}
}
@@ -318,7 +338,7 @@ public class Receiver implements Deliver
// todo - throw a sensible error
e.printStackTrace(); //To change body of catch
statement use File | Settings | File Templates.
}
- m = new Message(sections);
+ m = new Message(sections, false);
m.setDeliveryTag(deliveryTag);
m.setResume(resume);
m.setReceiver(this);
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
Tue Mar 3 14:56:40 2015
@@ -451,6 +451,7 @@ public class ConnectionEndpoint implemen
if (!_closedForInput)
{
_closedForInput = true;
+ _logger.received(_remoteAddress,(short)-1,"Underlying connection
closed");
switch (_state)
{
case UNOPENED:
@@ -466,7 +467,6 @@ public class ConnectionEndpoint implemen
break;
default:
}
-
if (_receivingSessions != null)
{
for (int i = 0; i < _receivingSessions.length; i++)
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
Tue Mar 3 14:56:40 2015
@@ -25,8 +25,8 @@ package org.apache.qpid.amqp_1_0.type.me
import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor;
import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.messaging.*;
+import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.amqp_1_0.type.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
public class AmqpValueConstructor extends DescribedTypeConstructor<AmqpValue>
@@ -49,16 +49,7 @@ public class AmqpValueConstructor extend
public AmqpValue construct(Object underlying)
{
-
- if(underlying instanceof Object)
- {
- return new AmqpValue((Object)underlying);
- }
- else
- {
- // TODO - error
- return null;
- }
+ return new AmqpValue(underlying);
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
Tue Mar 3 14:56:40 2015
@@ -21,6 +21,7 @@ package org.apache.qpid.server.virtualho
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -42,6 +43,8 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHostAlias;
import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.LinkRegistry;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.stats.StatisticsCounter;
@@ -81,6 +84,15 @@ public class BDBHAReplicaVirtualHostImpl
@ManagedAttributeField
private int _housekeepingThreadCount;
+ @ManagedAttributeField
+ private List<String> _enabledConnectionValidators;
+
+ @ManagedAttributeField
+ private List<String> _disabledConnectionValidators;
+
+ @ManagedAttributeField
+ private List<String> _globalAddressDomains;
+
@ManagedObjectFactoryConstructor
public BDBHAReplicaVirtualHostImpl(final Map<String, Object> attributes,
VirtualHostNode<?> virtualHostNode)
{
@@ -162,6 +174,12 @@ public class BDBHAReplicaVirtualHostImpl
}
@Override
+ public String getRedirectHost(final AmqpPort<?> port)
+ {
+ return null;
+ }
+
+ @Override
public boolean isQueue_deadLetterQueueEnabled()
{
return false;
@@ -448,6 +466,47 @@ public class BDBHAReplicaVirtualHostImpl
{
}
+ @Override
+ public boolean authoriseCreateConnection(final AMQConnectionModel<?, ?>
connection)
+ {
+ return false;
+ }
+
+ @Override
+ public List<String> getEnabledConnectionValidators()
+ {
+ return _enabledConnectionValidators;
+ }
+
+ @Override
+ public List<String> getDisabledConnectionValidators()
+ {
+ return _disabledConnectionValidators;
+ }
+
+ @Override
+ public List<String> getGlobalAddressDomains()
+ {
+ return _globalAddressDomains;
+ }
+
+ @Override
+ public String getLocalAddress(final String routingAddress)
+ {
+ String localAddress = routingAddress;
+ if(getGlobalAddressDomains() != null)
+ {
+ for(String domain : getGlobalAddressDomains())
+ {
+ if(localAddress.length() > routingAddress.length() -
domain.length() && routingAddress.startsWith(domain + "/"))
+ {
+ localAddress = routingAddress.substring(domain.length());
+ }
+ }
+ }
+ return localAddress;
+ }
+
private void throwUnsupportedForReplica()
{
throw new IllegalStateException("The virtual host state of " +
getState()
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
Tue Mar 3 14:56:40 2015
@@ -25,7 +25,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.RemoteReplicationNode;
-@ManagedObject(category=false, managesChildren=false, creatable=false)
+@ManagedObject(category=false, creatable=false)
public interface BDBHARemoteReplicationNode<X extends
BDBHARemoteReplicationNode<X>> extends RemoteReplicationNode<X>
{
String GROUP_NAME = "groupName";
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
Tue Mar 3 14:56:40 2015
@@ -34,10 +34,11 @@ define(["dojo/_base/xhr",
show: function (data)
{
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
-
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
- registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ parser.parse(this.containerNode).then(function(instances)
+ {
+
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
Tue Mar 3 14:56:40 2015
@@ -22,10 +22,12 @@ define(["dijit/registry", "qpid/common/u
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null);
-
-
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
-
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ util.parseHtmlIntoDiv(data.containerNode,
"virtualhost/sizemonitoring/edit.html",
+ function()
+ {
+
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
Tue Mar 3 14:56:40 2015
@@ -22,10 +22,12 @@ define(["qpid/common/util", "qpid/common
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null);
-
-
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
-
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ util.parseHtmlIntoDiv(data.containerNode,
"virtualhost/bdb_ha/edit.html",
+ function()
+ {
+
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+
registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen",
util.numericOrContextVarRegexp);
+ });
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
Tue Mar 3 14:56:40 2015
@@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query"
function BDB(data)
{
- util.buildUI(data.containerNode, data.parent,
"virtualhost/bdb_ha/show.html", fields, this);
-
- this[localTransactionSynchronizationPolicy]= query("." +
localTransactionSynchronizationPolicy, data.containerNode)[0];
- this[remoteTransactionSynchronizationPolicy]= query("."+
remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+ var that = this;
+ util.buildUI(data.containerNode, data.parent,
"virtualhost/bdb_ha/show.html", fields, this,
+ function()
+ {
+ that[localTransactionSynchronizationPolicy]= query("." +
localTransactionSynchronizationPolicy, data.containerNode)[0];
+ that[remoteTransactionSynchronizationPolicy]= query("."+
remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+ });
}
BDB.prototype.update = function(data)
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
Tue Mar 3 14:56:40 2015
@@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/regis
return {
show: function(data)
{
- util.buildEditUI(data.containerNode,
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"],
data.data);
- registry.byId("editVirtualHostNode.storePath").set("disabled",
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ util.parseHtmlIntoDiv(data.containerNode,
"virtualhostnode/filebased/edit.html",
+ function()
+ {
+ registry.byId("editVirtualHostNode.storePath").set("disabled",
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ });
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
Tue Mar 3 14:56:40 2015
@@ -37,15 +37,21 @@ define(["dojo/_base/xhr",
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
- // lookup field
- this.groupChoice = registry.byId("addVirtualHostNode.group");
- this.virtualHostNodeBdbhaTypeFieldsContainer =
dom.byId("addVirtualHostNode.bdbha.typeFields");
-
- // add callback
- this.groupChoice.on("change",
function(type){that._groupChoiceChanged(type,
that.virtualHostNodeBdbhaTypeFieldsContainer,
"qpid/management/virtualhostnode/bdb_ha/add/");});
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ // lookup field
+ that.groupChoice = registry.byId("addVirtualHostNode.group");
+ that.virtualHostNodeBdbhaTypeFieldsContainer =
dom.byId("addVirtualHostNode.bdbha.typeFields");
+ // add callback
+ that.groupChoice.on("change",
+ function(type)
+ {
+ that._groupChoiceChanged(type,
+
that.virtualHostNodeBdbhaTypeFieldsContainer,
+
"qpid/management/virtualhostnode/bdb_ha/add/");
+ });
+ });
},
_groupChoiceChanged: function(type, typeFieldsContainer, urlStem)
{
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
Tue Mar 3 14:56:40 2015
@@ -33,15 +33,15 @@ define(["dojo/_base/xhr",
show: function(data)
{
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
-
- registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
-
registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen",
util.nameOrContextVarRegexp);
- registry.byId("addVirtualHostNode.helperAddress").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
- registry.byId("addVirtualHostNode.address").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
-
- dom.byId("addVirtualHostNode.uploadFields").style.display = "none";
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
+
registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen",
util.nameOrContextVarRegexp);
+
registry.byId("addVirtualHostNode.helperAddress").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
+ registry.byId("addVirtualHostNode.address").set("regExpGen",
util.nodeAddressOrContextVarRegexp);
+ dom.byId("addVirtualHostNode.uploadFields").style.display =
"none";
+ });
}
};
}
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Tue Mar 3 14:56:40 2015
@@ -37,8 +37,15 @@ define(["dojo/_base/xhr",
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML:
template}, data.containerNode);
- parser.parse(this.containerNode);
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that._postParse(data);
+ });
+ },
+ _postParse: function(data)
+ {
+ var that=this;
this.addVirtualHostNodeAddress =
registry.byId("addVirtualHostNode.address");
this.addVirtualHostNodeAddress.set("regExpGen",
util.nodeAddressOrContextVarRegexp);
@@ -72,7 +79,6 @@ define(["dojo/_base/xhr",
registry.byId("addVirtualHostNode.groupName").set("regExpGen",
util.nameOrContextVarRegexp);
dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
-
},
_updatePermittedNodesJson: function ()
{
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
Tue Mar 3 14:56:40 2015
@@ -26,14 +26,16 @@ define(["qpid/common/util",
"dojo/domReady!"],
function (util, registry, Memory, ObjectStore, win)
{
- var fields = [ "storePath", "name", "groupName", "address",
- "designatedPrimary", "priority", "quorumOverride"];
-
return {
show: function(data)
{
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode,
"virtualhostnode/bdb_ha/edit.html",
+ function(){that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
var node = data.data;
- util.buildEditUI(data.containerNode,
"virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, node);
if ( !(data.data.state == "ERRORED" || data.data.state ==
"STOPPED"))
{
registry.byId("editVirtualHostNode.storePath").set("disabled", true);
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Tue Mar 3 14:56:40 2015
@@ -82,11 +82,14 @@ define(["dojo/_base/xhr",
function BDBHA(data)
{
- var containerNode = data.containerNode;
this.parent = data.parent;
var that = this;
- util.buildUI(data.containerNode, data.parent,
"virtualhostnode/bdb_ha/show.html", nodeFields, this);
-
+ util.buildUI(data.containerNode, data.parent,
"virtualhostnode/bdb_ha/show.html", nodeFields, this,
function(){that._postParse(data);});
+ };
+ BDBHA.prototype._postParse = function(data)
+ {
+ var that = this;
+ var containerNode = data.containerNode;
this.designatedPrimaryContainer = findNode("designatedPrimaryContainer",
containerNode);
this.priorityContainer = findNode("priorityContainer", containerNode);
this.quorumOverrideContainer = findNode("quorumOverrideContainer",
containerNode);
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
Tue Mar 3 14:56:40 2015
@@ -117,11 +117,11 @@
<div data-dojo-type="dojo/store/Memory"
data-dojo-id="nodePriorityStore"
data-dojo-props="data: [
{id: '0', name: 'Never'},
- {id: '1', name:
'Default', selected: '1'},
+ {id: '1', name:
'Default'},
{id: '2', name: 'High'},
{id: '3', name:
'Highest'}
]"></div>
- <input id="editVirtualHostNode.priority"
data-dojo-type="dijit/form/FilteringSelect" value="1"
+ <input id="editVirtualHostNode.priority"
data-dojo-type="dijit/form/FilteringSelect"
data-dojo-props="
name: 'priority',
required: false,
@@ -135,9 +135,9 @@
<div class="formLabel-labelCell tableContainer-labelCell">Required
minimum number of nodes: </div>
<div class="formLabel-controlCell tableContainer-valueCell">
<div data-dojo-type="dojo/store/Memory"
data-dojo-id="nodeQuorumOverrideStore"
- data-dojo-props="data: [{id: '0', name: 'Majority', selected:
'1'}]"></div>
+ data-dojo-props="data: [{id: '0', name: 'Majority'}]"></div>
<input type="text" id="editVirtualHostNode.quorumOverride"
- data-dojo-type="dijit/form/FilteringSelect" value="0"
+ data-dojo-type="dijit/form/FilteringSelect"
data-dojo-props="
name: 'quorumOverride',
required: false,
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
Tue Mar 3 14:56:40 2015
@@ -278,6 +278,13 @@ public class AttributeAnnotationValidato
return true;
}
+
+
if(typeUtils.isSameType(type,elementUtils.getTypeElement("java.lang.Object").asType()))
+ {
+ return true;
+ }
+
+
if(typeUtils.isSameType(type,
elementUtils.getTypeElement("java.lang.String").asType()))
{
return true;
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Tue Mar 3 14:56:40 2015
@@ -23,9 +23,12 @@ package org.apache.qpid.server;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
import java.util.concurrent.TimeoutException;
import javax.security.auth.Subject;
@@ -34,6 +37,7 @@ import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
@@ -154,6 +158,8 @@ public class Broker implements BrokerShu
private void startupImpl(final BrokerOptions options) throws Exception
{
+
populateSystemPropertiesFromDefaults(options.getInitialSystemProperties());
+
String storeLocation = options.getConfigurationStoreLocation();
String storeType = options.getConfigurationStoreType();
@@ -321,6 +327,37 @@ public class Broker implements BrokerShu
}
}
+ public static void populateSystemPropertiesFromDefaults(final String
initialProperties) throws IOException
+ {
+ URL initialPropertiesLocation;
+ if(initialProperties == null)
+ {
+ initialPropertiesLocation =
Broker.class.getClassLoader().getResource("system.properties");
+ }
+ else
+ {
+ initialPropertiesLocation = (new
File(initialProperties)).toURI().toURL();
+ }
+
+ Properties props = new Properties(QpidProperties.asProperties());
+ if(initialPropertiesLocation != null)
+ {
+
+ try(InputStream inStream = initialPropertiesLocation.openStream())
+ {
+ props.load(inStream);
+ }
+ }
+
+ Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
+ propertyNames.removeAll(System.getProperties().stringPropertyNames());
+ for (String propName : propertyNames)
+ {
+ System.setProperty(propName, props.getProperty(propName));
+ }
+ }
+
+
private class ShutdownService implements Runnable
{
public void run()
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
Tue Mar 3 14:56:40 2015
@@ -78,6 +78,7 @@ public class BrokerOptions
private boolean _overwriteConfigurationStore;
private Map<String, String> _configProperties = new
HashMap<String,String>();
private boolean _startupLoggedToSystemOut = true;
+ private String _initialSystemProperties;
public Map<String, Object> convertToSystemConfigAttributes()
{
@@ -390,4 +391,24 @@ public class BrokerOptions
{
this._startupLoggedToSystemOut = startupLoggedToSystemOut;
}
+
+ /**
+ * Get the location of initial JVM system properties to set. This can be
URL or a file path
+ *
+ * @return the location of initial JVM system properties to set.
+ */
+ public String getInitialSystemProperties()
+ {
+ return _initialSystemProperties;
+ }
+
+ /**
+ * Set the location of initial properties file to set as JVM system
properties. This can be URL or a file path
+ *
+ * @param initialSystemProperties the location of initial JVM system
properties.
+ */
+ public void setInitialSystemProperties(String initialSystemProperties)
+ {
+ _initialSystemProperties = initialSystemProperties;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
