diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:12:10 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:12:10 +0000 |
commit | 78a00e2a3a1bbc7486de0fad72603617958062c3 (patch) | |
tree | 75526f90e858d5cc3f8d228e4e1c3c42c7808a10 | |
parent | 0ed130958f49a4d4cc5307c6d6f00d04da5f834d (diff) | |
download | qpid-python-78a00e2a3a1bbc7486de0fad72603617958062c3.tar.gz |
Merging from trunk r1617322:1617736 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620337 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java | 7 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java | 130 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java | 2 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java | 72 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java | 2 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html | 4 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html | 4 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html | 4 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html | 4 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java | 48 | ||||
-rw-r--r-- | qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java | 55 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java | 250 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java) | 90 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostRestTest.java) | 5 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java) | 22 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java) | 10 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java) | 185 | ||||
-rw-r--r-- | qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java (renamed from qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java) | 38 | ||||
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java | 119 | ||||
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java | 3 | ||||
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java | 2 | ||||
-rw-r--r-- | qpid/java/broker-core/src/main/resources/initial-config.json | 3 | ||||
-rw-r--r-- | qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java | 2 | ||||
-rw-r--r-- | qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java | 2 | ||||
-rw-r--r-- | qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java | 9 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java | 8 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java | 48 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java | 32 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java | 6 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java | 29 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java | 8 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java | 9 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java | 9 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java | 9 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java | 2 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java | 6 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java | 3 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java | 3 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java | 8 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java | 13 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js | 39 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js | 12 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html | 4 | ||||
-rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html | 4 | ||||
-rw-r--r-- | qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java | 17 | ||||
-rw-r--r-- | qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java | 6 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java) | 4 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/endtoend.json (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/perftests.systests.properties (renamed from qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties) | 0 | ||||
-rw-r--r-- | qpid/java/qpid-systests-parent/pom.xml | 14 | ||||
-rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 17 | ||||
-rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java | 98 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/AMQTestConnection_0_10.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/SessionCreateTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BindingLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/LastValueQueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java | 141 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogViewerTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java) | 33 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java) | 78 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSDestinationTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSReplyToTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/LVQTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/utils/ConversationFactory.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/test/utils/QpidClientConnection.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/transport/MaxFrameSizeTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/util/ClasspathScanner.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitor.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitorTest.java (renamed from qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8En (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8Jp (renamed from qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp) | 0 | ||||
-rw-r--r-- | qpid/java/systests/src/test/resources/systests.log4j (renamed from qpid/java/systests/src/main/java/systests.log4j) | 0 | ||||
-rwxr-xr-x | qpid/java/test-profiles/CPPExcludes | 2 | ||||
-rw-r--r-- | qpid/java/test-profiles/JavaJsonExcludes | 2 | ||||
-rw-r--r-- | qpid/java/test-profiles/JavaTransientExcludes | 1 | ||||
-rw-r--r-- | qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java | 27 |
280 files changed, 1011 insertions, 773 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java index b94c672133..670f358a26 100644 --- a/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java +++ b/qpid/java/amqp-1-0-client-jms/example/src/main/java/org/apache/qpid/amqp_1_0/jms/example/Hello.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.amqp_1_0.jms.example; +import java.io.InputStream; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -51,11 +52,11 @@ public class Hello private void runExample() { - try + try(InputStream propertiesStream = getClass().getResourceAsStream("hello.properties")) { - // Read the hello.properties JNDI properties file and use contents to create the InitialContext. Properties properties = new Properties(); - properties.load(getClass().getResourceAsStream("hello.properties")); + // Read the hello.properties JNDI properties file and use contents to create the InitialContext. + properties.load(propertiesStream); Context context = new InitialContext(properties); // Alternatively, JNDI information can be supplied by setting the "java.naming.factory.initial" // system property to value "org.apache.qpid.amqp_1_0.jms.jndi.PropertiesFileInitialContextFactory" diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java index 92115dd39f..d045ae01fa 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java @@ -95,7 +95,7 @@ import org.apache.qpid.server.util.DaemonThreadFactory; public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChangeListener { public static final String MASTER_TRANSFER_TIMEOUT_PROPERTY_NAME = "qpid.bdb.ha.master_transfer_interval"; - public static final String DB_PING_SOCKET_TIMEOUT_PROPERTY_NAME = "qpid.bdb.ha.db_ping_socket_timeout"; + public static final String DB_PING_SOCKET_TIMEOUT_PROPERTY_NAME = "qpid.bdb.replication.db_ping_socket_timeout"; public static final String REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME = "qpid.bdb.ha.remote_node_monitor_interval"; private static final Logger LOGGER = Logger.getLogger(ReplicatedEnvironmentFacade.class); @@ -289,10 +289,20 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan { try { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Closing replicated environment"); + } + closeEnvironment(); } finally { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Deregistering environment home " + _environmentDirectory); + } + EnvHomeRegistry.getInstance().deregisterHome(_environmentDirectory); } } @@ -823,6 +833,11 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan private void closeEnvironment() { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Closing JE environment for " + _prettyGroupNodeName); + } + // Clean the log before closing. This makes sure it doesn't contain // redundant data. Closing without doing this means the cleaner may not // get a chance to finish. @@ -1094,15 +1109,6 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan return environment; } - NodeState getRemoteNodeState(ReplicationNode repNode) throws IOException, ServiceConnectFailedException - { - if (repNode == null) - { - throw new IllegalArgumentException("Node cannot be null"); - } - return new DbPing(repNode, (String)_configuration.getGroupName(), DB_PING_SOCKET_TIMEOUT).getNodeState(); - } - public int getNumberOfElectableGroupMembers() { if (_state.get() != State.OPEN) @@ -1181,6 +1187,105 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan } } + Set<String> getPermittedNodes() + { + return Collections.unmodifiableSet(_permittedNodes); + } + + public static NodeState getRemoteNodeState(String groupName, ReplicationNode repNode) throws IOException, ServiceConnectFailedException + { + if (repNode == null) + { + throw new IllegalArgumentException("Node cannot be null"); + } + return new DbPing(repNode, groupName, DB_PING_SOCKET_TIMEOUT).getNodeState(); + } + + public static Set<String> convertApplicationStateBytesToPermittedNodeList(byte[] applicationState) + { + if (applicationState == null || applicationState.length == 0) + { + return Collections.emptySet(); + } + + ObjectMapper objectMapper = new ObjectMapper(); + try + { + Map<String, Object> settings = objectMapper.readValue(applicationState, Map.class); + return new HashSet<String>((Collection<String>)settings.get(PERMITTED_NODE_LIST)); + } + catch (Exception e) + { + throw new RuntimeException("Unexpected exception on de-serializing of application state", e); + } + } + + public static void connectToHelperNodeAndCheckPermittedHosts(String nodeName, String hostPort, String groupName, String helperNodeName, String helperHostPort) + { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug(String.format("Requesting state of the node '%s' at '%s'", helperNodeName, helperHostPort)); + } + + if (helperNodeName == null || "".equals(helperNodeName)) + { + throw new IllegalConfigurationException(String.format("A helper node is not specified for node '%s'" + + " joining the group '%s'", nodeName, groupName)); + } + + Collection<String> permittedNodes = null; + try + { + ReplicationNodeImpl node = new ReplicationNodeImpl(helperNodeName, helperHostPort); + NodeState state = getRemoteNodeState(groupName, node); + byte[] applicationState = state.getAppState(); + permittedNodes = convertApplicationStateBytesToPermittedNodeList(applicationState); + } + catch (IOException e) + { + throw new IllegalConfigurationException(String.format("Cannot connect to '%s'", helperHostPort), e); + } + catch (ServiceConnectFailedException e) + { + throw new IllegalConfigurationException(String.format("Failure to connect to '%s'", helperHostPort), e); + } + catch (Exception e) + { + throw new RuntimeException(String.format("Unexpected exception on attempt to retrieve state from '%s' at '%s'", + helperNodeName, helperHostPort), e); + } + + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug(String.format("Attribute 'permittedNodes' on node '%s' is set to '%s'", helperNodeName, String.valueOf(permittedNodes))); + } + + if (permittedNodes==null || !permittedNodes.contains(hostPort)) + { + throw new IllegalConfigurationException(String.format("Node from '%s' is not permitted!", hostPort)); + } + } + + private void findMasterNodeStateAndApplyPermittedNodes(Collection<NodeState> nodeStates) + { + if (ReplicatedEnvironment.State.MASTER != _environment.getState()) + { + for (NodeState nodeState : nodeStates) + { + if (nodeState.getNodeState() == ReplicatedEnvironment.State.MASTER) + { + byte[] applicationState = nodeState.getAppState(); + Set<String> permittedNodes = convertApplicationStateBytesToPermittedNodeList(applicationState); + if (!_permittedNodes.equals(permittedNodes)) + { + setPermittedNodes(permittedNodes); + } + break; + } + } + } + } + private void registerAppStateMonitorIfPermittedNodesSpecified() { if (!_permittedNodes.isEmpty()) @@ -1286,8 +1391,9 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan executeDatabasePingerOnNodeChangesIfMaster(nodeStates); notifyGroupListenerAboutNodeStates(nodeStates); - } + findMasterNodeStateAndApplyPermittedNodes(nodeStates.values()); + } } finally { @@ -1384,7 +1490,7 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan NodeState nodeStateObject = null; try { - nodeStateObject = getRemoteNodeState(node); + nodeStateObject = getRemoteNodeState((String)_configuration.getGroupName(), node); } catch (IOException | ServiceConnectFailedException e ) { diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java index 12511ad9e0..ac8d33685a 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java @@ -38,7 +38,7 @@ public interface BDBVirtualHost<X extends BDBVirtualHost<X>> extends VirtualHost Math.min(200l*1024l*1024l, Runtime.getRuntime().maxMemory()/20l)); - @ManagedAttribute(mandatory = true) + @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}messages") String getStorePath(); @ManagedAttribute(mandatory = true, defaultValue = "0") diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index cacb04736c..5489493f74 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -20,11 +20,9 @@ */ package org.apache.qpid.server.virtualhostnode.berkeleydb; -import java.io.IOException; import java.net.InetSocketAddress; import java.security.PrivilegedAction; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -43,10 +41,8 @@ import com.sleepycat.je.rep.ReplicatedEnvironment; import com.sleepycat.je.rep.ReplicationNode; import com.sleepycat.je.rep.StateChangeEvent; import com.sleepycat.je.rep.StateChangeListener; -import com.sleepycat.je.rep.util.DbPing; import com.sleepycat.je.rep.util.ReplicationGroupAdmin; import com.sleepycat.je.rep.utilint.HostPortPair; -import com.sleepycat.je.rep.utilint.ServiceDispatcher; import org.apache.log4j.Logger; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -73,7 +69,6 @@ import org.apache.qpid.server.store.berkeleydb.replication.ReplicationGroupListe import org.apache.qpid.server.util.ServerScopedRuntimeException; import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl; import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; -import org.codehaus.jackson.map.ObjectMapper; @ManagedObject( category = false, type = BDBHAVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE ) public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtualHostNodeImpl> implements @@ -263,7 +258,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu { try { - connectToHelperNodeAndCheckPermittedHosts(getHelperNodeName(), getHelperAddress(), getAddress()); + ReplicatedEnvironmentFacade.connectToHelperNodeAndCheckPermittedHosts(getName(), getAddress(), getGroupName(), getHelperNodeName(), getHelperAddress()); } catch(IllegalConfigurationException e) { @@ -706,71 +701,6 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu return getAddress().equals(getHelperAddress()); } - private void connectToHelperNodeAndCheckPermittedHosts(String helperNodeName, String helperHostPort, String hostPort) - { - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug(String.format("Requesting state of the node '%s' at '%s'", helperNodeName, helperHostPort)); - } - - if (_helperNodeName == null || "".equals(_helperNodeName)) - { - throw new IllegalConfigurationException(String.format("An attribute '%s' is not set in node '%s'" - + " on joining the group '%s'", HELPER_NODE_NAME, getName(), getGroupName())); - } - - Collection<String> permittedNodes = null; - try - { - ReplicatedEnvironmentFacade.ReplicationNodeImpl node = new ReplicatedEnvironmentFacade.ReplicationNodeImpl(helperNodeName, helperHostPort); - NodeState state = new DbPing(node, getGroupName(), ReplicatedEnvironmentFacade.DB_PING_SOCKET_TIMEOUT).getNodeState(); - byte[] applicationState = state.getAppState(); - permittedNodes = bytesToPermittedNodeList(applicationState); - } - catch (IOException e) - { - throw new IllegalConfigurationException(String.format("Cannot connect to '%s'", helperHostPort), e); - } - catch (ServiceDispatcher.ServiceConnectFailedException e) - { - throw new IllegalConfigurationException(String.format("Failure to connect to '%s'", helperHostPort), e); - } - catch (Exception e) - { - throw new RuntimeException(String.format("Unexpected exception on attempt to retrieve state from '%s' at '%s'", - helperNodeName, helperHostPort), e); - } - - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug(String.format("Attribute 'permittedNodes' on node '%s' is set to '%s'", helperNodeName, String.valueOf(permittedNodes))); - } - - if (permittedNodes != null && !permittedNodes.isEmpty() && !permittedNodes.contains(hostPort)) - { - throw new IllegalConfigurationException(String.format("Node from '%s' is not permitted!", hostPort)); - } - } - - private Collection<String> bytesToPermittedNodeList(byte[] applicationState) - { - if (applicationState == null || applicationState.length == 0) - { - return Collections.emptySet(); - } - - ObjectMapper objectMapper = new ObjectMapper(); - try - { - Map<String, Object> settings = objectMapper.readValue(applicationState, Map.class); - return (Collection<String>)settings.get(ReplicatedEnvironmentFacade.PERMITTED_NODE_LIST); - } - catch (Exception e) - { - throw new RuntimeException("Unexpected exception on de-serializing of application state", e); - } - } - private class RemoteNodesDiscoverer implements ReplicationGroupListener { @Override diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java index 763b59146b..61b0d1882a 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java @@ -26,6 +26,6 @@ public interface BDBVirtualHostNode<X extends BDBVirtualHostNode<X>> extends org { String STORE_PATH = "storePath"; - @ManagedAttribute(mandatory = true) + @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}config") String getStorePath(); } diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html index f9e9d0a82f..9ce23084c5 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html @@ -20,15 +20,13 @@ --> <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter store path'" /> </div> </div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html index b08c734e35..820a94e754 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html @@ -81,15 +81,13 @@ </div> </div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter store path'" /> </div> </div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html index 3d06d15d5c..1d3b2a1906 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html @@ -45,15 +45,13 @@ </div> </div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter store path'" /> </div> </div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html index c18ca34fdb..189eb6f7b6 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html @@ -45,15 +45,13 @@ </div> </div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="editVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter configuration store path'" /> </div> </div> diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java index 44fc19e14f..5ed533f1e5 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java @@ -656,7 +656,8 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase permittedNodes.add("localhost:" + getNextAvailable(TEST_NODE_PORT + 1)); firstNode.setPermittedNodes(permittedNodes); - NodeState nodeState = firstNode.getRemoteNodeState(new ReplicatedEnvironmentFacade.ReplicationNodeImpl(TEST_NODE_NAME, TEST_NODE_HOST_PORT)); + ReplicatedEnvironmentFacade.ReplicationNodeImpl replicationNode = new ReplicatedEnvironmentFacade.ReplicationNodeImpl(TEST_NODE_NAME, TEST_NODE_HOST_PORT); + NodeState nodeState = ReplicatedEnvironmentFacade.getRemoteNodeState(TEST_GROUP_NAME, replicationNode); ObjectMapper objectMapper = new ObjectMapper(); @@ -708,10 +709,52 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase firstNode.setPermittedNodes(permittedNodes); String nodeName = TEST_NODE_NAME + "_1"; + createIntruder(nodeName, node1NodeHostPort); + assertTrue("Intruder node was not detected", intruderLatch.await(10, TimeUnit.SECONDS)); + } + + public void testIntruderNodeDetectionOnMasterAndReplicaNodes() throws Exception + { + final CountDownLatch intruderLatch = new CountDownLatch(2); + ReplicationGroupListener listener = new NoopReplicationGroupListener() + { + @Override + public void onIntruderNode(ReplicationNode node) + { + intruderLatch.countDown(); + } + }; + + ReplicatedEnvironmentFacade firstNode = createMaster(listener); + int replica1Port = getNextAvailable(TEST_NODE_PORT + 1); + String node2NodeHostPort = "localhost:" + replica1Port; + String nodeName2 = TEST_NODE_NAME + "_1"; + ReplicatedEnvironmentFacade secondNode = createReplica(nodeName2, node2NodeHostPort, listener); + + Set<String> permittedNodes = new HashSet<String>(); + permittedNodes.add("localhost:" + TEST_NODE_PORT); + permittedNodes.add(nodeName2); + firstNode.setPermittedNodes(permittedNodes); + + int counter = 0; + while(secondNode.getPermittedNodes().isEmpty() && counter < 100) + { + counter++; + Thread.sleep(50); + } + assertEquals("Permitted nodes are not set on a replica", permittedNodes, secondNode.getPermittedNodes()); + + int intruderPort = getNextAvailable(replica1Port+ 1); + createIntruder("intruder", "localhost:" + intruderPort); + assertTrue("Intruder node was not detected", intruderLatch.await(10, TimeUnit.SECONDS)); + } + + private void createIntruder(String nodeName, String node1NodeHostPort) + { File environmentPathFile = new File(_storePath, nodeName); environmentPathFile.mkdirs(); - ReplicationConfig replicationConfig = new ReplicationConfig(TEST_GROUP_NAME, TEST_NODE_NAME + "_1", node1NodeHostPort); + ReplicationConfig replicationConfig = new ReplicationConfig(TEST_GROUP_NAME, nodeName, node1NodeHostPort); replicationConfig.setHelperHosts(TEST_NODE_HOST_PORT); EnvironmentConfig envConfig = new EnvironmentConfig(); @@ -730,7 +773,6 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase intruder.close(); } } - assertTrue("Intruder node was not detected", intruderLatch.await(10, TimeUnit.SECONDS)); } private ReplicatedEnvironmentFacade createMaster() throws Exception diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java index 45527313e6..ef1021160c 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java @@ -24,7 +24,6 @@ import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.*; import java.util.Collections; -import java.util.List; import java.util.Map; import org.apache.qpid.server.logging.EventLogger; @@ -34,7 +33,6 @@ import org.apache.qpid.server.logging.messages.HighAvailabilityMessages; import org.apache.qpid.server.model.SystemConfig; import org.apache.qpid.test.utils.QpidTestCase; import org.hamcrest.Description; -import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; /** @@ -360,22 +358,51 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends QpidTestCase reset(_eventLogger); node2 = (BDBHAVirtualHostNodeImpl)_helper.recoverHaVHN(node2.getId(), node2Attributes); - _helper.assertNodeRole(node2, "REPLICA"); - + _helper.assertNodeRole(node2, "REPLICA", "MASTER"); waitForNodeDetachedField(remoteNode, false); - ArgumentCaptor<LogSubject> subjectArgument = ArgumentCaptor.forClass(LogSubject.class); - ArgumentCaptor<LogMessage> messageArgument = ArgumentCaptor.forClass(LogMessage.class); - verify(_eventLogger, times(2)).message(subjectArgument.capture(), messageArgument.capture()); - - assertEquals("Unexpected subject", node1.getVirtualHostNodeLogSubject(), subjectArgument.getValue()); + final String expectedMessage = HighAvailabilityMessages.ATTACHED(node2.getName(), groupName, "REPLICA").toString(); + final String expectedMessage2 = HighAvailabilityMessages.ATTACHED(node2.getName(), groupName, "UNKNOWN").toString(); + final String expectedMessage3 = HighAvailabilityMessages.ATTACHED(node2.getName(), groupName, "MASTER").toString(); + ArgumentMatcher<LogMessage> matcher = new ArgumentMatcher<LogMessage>() + { + private String _messageErrorDescription = null; + private String _hierarchyErrorDescription = null; - String expectedMessage = HighAvailabilityMessages.ATTACHED(node2.getName(), groupName, "REPLICA").toString(); - String expectedMessage2 = HighAvailabilityMessages.ATTACHED(node2.getName(), groupName, "UNKNOWN").toString(); + @Override + public boolean matches(Object argument) + { + LogMessage logMessage = (LogMessage)argument; + String actualMessage = logMessage.toString(); + boolean expectedMessageMatches = expectedMessage.equals(actualMessage) + || expectedMessage2.equals(actualMessage) || expectedMessage3.equals(actualMessage); + if (!expectedMessageMatches) + { + _messageErrorDescription = "Actual message does not match any expected: " + actualMessage; + } + boolean expectedHierarchyMatches = HighAvailabilityMessages.ATTACHED_LOG_HIERARCHY.equals(logMessage.getLogHierarchy()); + if (!expectedHierarchyMatches) + { + _hierarchyErrorDescription = "Actual hierarchy does not match expected: " + logMessage.getLogHierarchy(); + } + return expectedMessageMatches && expectedHierarchyMatches; + } - List<LogMessage> capturedValues = messageArgument.getAllValues(); - String m = capturedValues.get(0).toString(); - assertTrue("Unexpected attached message :" + m, m.equals(expectedMessage) || m.equals(expectedMessage2)); + @Override + public void describeTo(Description description) + { + if (_messageErrorDescription != null) + { + description.appendText(_messageErrorDescription); + } + if (_hierarchyErrorDescription != null) + { + description.appendText(_hierarchyErrorDescription); + } + } + }; + verify(_eventLogger).message(argThat(new LogSubjectMatcher(node1.getVirtualHostNodeLogSubject())), + argThat(matcher)); } private void waitForNodeDetachedField(BDBHARemoteReplicationNodeImpl remoteNode, boolean expectedDetached) throws InterruptedException { diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java deleted file mode 100644 index ef5cc7c464..0000000000 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.qpid.server.store.berkeleydb; - -import java.io.File; -import java.util.Set; - -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Queue; -import javax.jms.Session; - -import org.apache.log4j.Logger; -import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.url.URLSyntaxException; - -/** - * The HA white box tests test the BDB cluster where the test retains the knowledge of the - * individual test nodes. It uses this knowledge to examine the nodes to ensure that they - * remain in the correct state throughout the test. - * - * @see HAClusterBlackboxTest - */ -public class HAClusterWhiteboxTest extends QpidBrokerTestCase -{ - protected static final Logger LOGGER = Logger.getLogger(HAClusterWhiteboxTest.class); - - private static final String VIRTUAL_HOST = "test"; - - private final int NUMBER_OF_NODES = 3; - private final HATestClusterCreator _clusterCreator = new HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); - - @Override - protected void setUp() throws Exception - { - _brokerType = BrokerType.SPAWNED; - - assertTrue(isJavaBroker()); - assertTrue(isBrokerStorePersistent()); - - setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties"); - - _clusterCreator.configureClusterNodes(); - _clusterCreator.startCluster(); - - super.setUp(); - } - - @Override - public void startBroker() throws Exception - { - // Don't start default broker provided by QBTC. - } - - public void testClusterPermitsConnectionToOnlyOneNode() throws Exception - { - int connectionSuccesses = 0; - int connectionFails = 0; - - for (int brokerPortNumber : getBrokerPortNumbers()) - { - try - { - getConnection(_clusterCreator.getConnectionUrlForSingleNodeWithoutRetry(brokerPortNumber)); - connectionSuccesses++; - } - catch(JMSException e) - { - assertTrue(e.getMessage().contains("Virtual host '" + VIRTUAL_HOST + "' is not active")); - connectionFails++; - } - } - - assertEquals("Unexpected number of failed connections", NUMBER_OF_NODES - 1, connectionFails); - assertEquals("Unexpected number of successful connections", 1, connectionSuccesses); - } - - public void testClusterThatLosesNodeStillAllowsConnection() throws Exception - { - final Connection initialConnection = getConnectionToNodeInCluster(); - assertNotNull(initialConnection); - - closeConnectionAndKillBroker(initialConnection); - - final Connection subsequentConnection = getConnectionToNodeInCluster(); - assertNotNull(subsequentConnection); - - // verify that JMS persistence operations are working - assertProducingConsuming(subsequentConnection); - - closeConnection(initialConnection); - } - - public void testClusterThatLosesAllButOneNodeRefusesConnection() throws Exception - { - final Connection initialConnection = getConnectionToNodeInCluster(); - assertNotNull(initialConnection); - - closeConnectionAndKillBroker(initialConnection); - - final Connection subsequentConnection = getConnectionToNodeInCluster(); - assertNotNull(subsequentConnection); - final int subsequentPortNumber = _clusterCreator.getBrokerPortNumberFromConnection(subsequentConnection); - - killBroker(subsequentPortNumber); - - final Connection finalConnection = getConnectionToNodeInCluster(); - assertNull(finalConnection); - - closeConnection(initialConnection); - } - - public void testClusterWithRestartedNodeStillAllowsConnection() throws Exception - { - final Connection connection = getConnectionToNodeInCluster(); - assertNotNull(connection); - - final int brokerPortNumber = _clusterCreator.getBrokerPortNumberFromConnection(connection); - connection.close(); - - _clusterCreator.stopNode(brokerPortNumber); - _clusterCreator.startNode(brokerPortNumber); - - final Connection subsequentConnection = getConnectionToNodeInCluster(); - assertNotNull(subsequentConnection); - } - - public void testClusterLosingNodeRetainsData() throws Exception - { - final Connection initialConnection = getConnectionToNodeInCluster(); - - final String queueNamePrefix = getTestQueueName(); - final String inbuiltExchangeQueueUrl = "direct://amq.direct/" + queueNamePrefix + "1/" + queueNamePrefix + "1?durable='true'"; - final String customExchangeQueueUrl = "direct://my.exchange/" + queueNamePrefix + "2/" + queueNamePrefix + "2?durable='true'"; - - populateBrokerWithData(initialConnection, inbuiltExchangeQueueUrl, customExchangeQueueUrl); - - closeConnectionAndKillBroker(initialConnection); - - final Connection subsequentConnection = getConnectionToNodeInCluster(); - - assertNotNull("no valid connection obtained", subsequentConnection); - - checkBrokerData(subsequentConnection, inbuiltExchangeQueueUrl, customExchangeQueueUrl); - } - - public void xtestRecoveryOfOutOfDateNode() throws Exception - { - /* - * TODO: Implement - * - * Cant yet find a way to control cleaning in a deterministic way to allow provoking - * a node to become out of date. We do now know that even a new joiner to the group - * can throw the InsufficientLogException, so ensuring an existing cluster of nodes has - * done *any* cleaning and then adding a new node should be sufficient to cause this. - */ - } - - private void populateBrokerWithData(final Connection connection, final String... queueUrls) throws JMSException, Exception - { - populateBrokerWithData(connection, 1, queueUrls); - } - - private void populateBrokerWithData(final Connection connection, int noOfMessages, final String... queueUrls) throws JMSException, Exception - { - final Session session = connection.createSession(true, Session.SESSION_TRANSACTED); - for (final String queueUrl : queueUrls) - { - final Queue queue = session.createQueue(queueUrl); - session.createConsumer(queue).close(); - sendMessage(session, queue, noOfMessages); - } - } - - private void checkBrokerData(final Connection connection, final String... queueUrls) throws JMSException - { - connection.start(); - final Session session = connection.createSession(true, Session.SESSION_TRANSACTED); - for (final String queueUrl : queueUrls) - { - final Queue queue = session.createQueue(queueUrl); - final MessageConsumer consumer = session.createConsumer(queue); - final Message message = consumer.receive(1000); - session.commit(); - assertNotNull("Queue " + queue + " should have message", message); - assertEquals("Queue " + queue + " message has unexpected content", 0, message.getIntProperty(INDEX)); - } - } - - private Connection getConnectionToNodeInCluster() throws URLSyntaxException - { - Connection connection = null; - Set<Integer> runningBrokerPorts = getBrokerPortNumbers(); - - for (int brokerPortNumber : runningBrokerPorts) - { - try - { - connection = getConnection(_clusterCreator.getConnectionUrlForSingleNodeWithRetry(brokerPortNumber)); - break; - } - catch(JMSException je) - { - assertTrue(je.getMessage().contains("Virtual host '" + VIRTUAL_HOST + "' is not active")); - } - } - return connection; - } - - private void closeConnectionAndKillBroker(final Connection initialConnection) throws Exception - { - final int initialPortNumber = _clusterCreator.getBrokerPortNumberFromConnection(initialConnection); - initialConnection.close(); - - killBroker(initialPortNumber); // kill awaits the death of the child - } - - private void closeConnection(final Connection initialConnection) - { - try - { - initialConnection.close(); - } - catch(Exception e) - { - // ignore. - // java.net.SocketException is seen sometimes on active connection - } - } -} diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index fab889a49f..fab889a49f 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java index 491856d953..491856d953 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java index 1e7c79f7da..301375d0fb 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import java.io.File; import java.io.IOException; @@ -39,7 +39,6 @@ import org.apache.qpid.server.model.RemoteReplicationNode; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade; import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost; import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHARemoteReplicationNode; @@ -47,7 +46,6 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; import org.apache.qpid.systest.rest.Asserts; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; -import org.apache.qpid.util.FileUtils; public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase { @@ -60,7 +58,6 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase private int _node3HaPort; private String _hostName; - private File _storeBaseDir; private String _baseNodeRestUrl; @Override @@ -72,8 +69,6 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase _hostName = getTestName(); _baseNodeRestUrl = "virtualhostnode/"; - _storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis()); - _node1HaPort = findFreePort(); _node2HaPort = getNextAvailable(_node1HaPort + 1); _node3HaPort = getNextAvailable(_node2HaPort + 1); @@ -82,22 +77,6 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase } @Override - public void tearDown() throws Exception - { - try - { - super.tearDown(); - } - finally - { - if (_storeBaseDir != null) - { - FileUtils.delete(_storeBaseDir, true); - } - } - } - - @Override protected void customizeConfiguration() throws IOException { super.customizeConfiguration(); @@ -247,38 +226,67 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase assertEquals("Unexpected number of remote nodes on " + NODE2, 1, data.size()); } - public void testIntruderProtection() throws Exception + public void testIntruderBDBHAVHNNotAllowedNoConnect() throws Exception { createHANode(NODE1, _node1HaPort, _node1HaPort); assertNode(NODE1, _node1HaPort, _node1HaPort, NODE1); - String virtualHostRestUrl = "virtualhost/" + NODE1 + "/" + _hostName; - - Map<String,Object> hostData = new HashMap<String,Object>(); - hostData.put(BDBHAVirtualHost.PERMITTED_NODES, Arrays.asList( "localhost:" + _node1HaPort, "localhost:" + _node3HaPort)); - getRestTestHelper().submitRequest(virtualHostRestUrl, "PUT", hostData, 200); - // add permitted node Map<String, Object> node3Data = createNodeAttributeMap(NODE3, _node3HaPort, _node1HaPort); - node3Data.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, NODE1); getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE3, "PUT", node3Data, 201); assertNode(NODE3, _node3HaPort, _node1HaPort, NODE1); assertRemoteNodes(NODE1, NODE3); + int intruderPort = getNextAvailable(_node3HaPort + 1); + // try to add not permitted node - Map<String, Object> nodeData = createNodeAttributeMap(NODE2, _node2HaPort, _node1HaPort); - nodeData.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, NODE1); + Map<String, Object> nodeData = createNodeAttributeMap(NODE2, intruderPort, _node1HaPort); getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE2, "PUT", nodeData, 409); assertRemoteNodes(NODE1, NODE3); + } + + public void testIntruderProtection() throws Exception + { + createHANode(NODE1, _node1HaPort, _node1HaPort); + assertNode(NODE1, _node1HaPort, _node1HaPort, NODE1); + + Map<String,Object> nodeData = getRestTestHelper().getJsonAsSingletonList(_baseNodeRestUrl + NODE1); + String node1StorePath = (String)nodeData.get(BDBHAVirtualHostNode.STORE_PATH); + long transactionId = ((Number)nodeData.get(BDBHAVirtualHostNode.LAST_KNOWN_REPLICATION_TRANSACTION_ID)).longValue(); + + // add permitted node + Map<String, Object> node3Data = createNodeAttributeMap(NODE3, _node3HaPort, _node1HaPort); + getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE3, "PUT", node3Data, 201); + assertNode(NODE3, _node3HaPort, _node1HaPort, NODE1); + assertRemoteNodes(NODE1, NODE3); + + // Ensure PINGDB is created + // in order to exclude hanging of environment + // when environment.close is called whilst PINGDB is created. + // On node joining, a record is updated in PINGDB + // if lastTransactionId is incremented then node ping task was executed + int counter = 0; + long newTransactionId = transactionId; + while(newTransactionId == transactionId && counter<50) + { + nodeData = getRestTestHelper().getJsonAsSingletonList(_baseNodeRestUrl + NODE1); + newTransactionId = ((Number)nodeData.get(BDBHAVirtualHostNode.LAST_KNOWN_REPLICATION_TRANSACTION_ID)).longValue(); + if (newTransactionId != transactionId) + { + break; + } + counter++; + Thread.sleep(100l); + } //connect intruder node String nodeName = NODE2; - String nodeHostPort = (String)nodeData.get(BDBHAVirtualHostNode.ADDRESS); - File environmentPathFile = new File((String)nodeData.get(BDBHAVirtualHostNode.STORE_PATH), nodeName); + String nodeHostPort = "localhost:" + getNextAvailable(_node3HaPort + 1); + File environmentPathFile = new File(node1StorePath, nodeName); environmentPathFile.mkdirs(); ReplicationConfig replicationConfig = new ReplicationConfig((String)nodeData.get(BDBHAVirtualHostNode.GROUP_NAME), nodeName, nodeHostPort); - replicationConfig.setHelperHosts((String)nodeData.get(BDBHAVirtualHostNode.HELPER_ADDRESS)); + replicationConfig.setHelperHosts((String)nodeData.get(BDBHAVirtualHostNode.ADDRESS)); EnvironmentConfig envConfig = new EnvironmentConfig(); envConfig.setAllowCreate(true); envConfig.setTransactional(true); @@ -291,9 +299,13 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase } finally { - intruder.close(); + if (intruder != null) + { + intruder.close(); + } } waitForAttributeChanged(_baseNodeRestUrl + NODE1, VirtualHostNode.STATE, State.ERRORED.name()); + waitForAttributeChanged(_baseNodeRestUrl + NODE3, VirtualHostNode.STATE, State.ERRORED.name()); } private void createHANode(String nodeName, int nodePort, int helperPort) throws Exception @@ -302,6 +314,8 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase int responseCode = getRestTestHelper().submitRequest(_baseNodeRestUrl + nodeName, "PUT", nodeData); assertEquals("Unexpected response code for virtual host node " + nodeName + " creation request", 201, responseCode); + String hostExpectedState = nodePort == helperPort ? State.ACTIVE.name(): State.UNAVAILABLE.name(); + waitForAttributeChanged("virtualhost/" + nodeName + "/" + _hostName, BDBHAVirtualHost.STATE, hostExpectedState); } private Map<String, Object> createNodeAttributeMap(String nodeName, int nodePort, int helperPort) throws Exception @@ -309,14 +323,13 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase Map<String, Object> nodeData = new HashMap<String, Object>(); nodeData.put(BDBHAVirtualHostNode.NAME, nodeName); nodeData.put(BDBHAVirtualHostNode.TYPE, "BDB_HA"); - nodeData.put(BDBHAVirtualHostNode.STORE_PATH, _storeBaseDir.getPath() + File.separator + nodeName); nodeData.put(BDBHAVirtualHostNode.GROUP_NAME, _hostName); nodeData.put(BDBHAVirtualHostNode.ADDRESS, "localhost:" + nodePort); nodeData.put(BDBHAVirtualHostNode.HELPER_ADDRESS, "localhost:" + helperPort); nodeData.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, NODE1); Map<String,String> context = new HashMap<>(); nodeData.put(BDBHAVirtualHostNode.CONTEXT, context); - String bluePrint = HATestClusterCreator.getBlueprint("localhost", _node1HaPort, _node2HaPort, _node3HaPort); + String bluePrint = GroupCreator.getBlueprint("localhost", _node1HaPort, _node2HaPort, _node3HaPort); context.put(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, bluePrint); return nodeData; } @@ -330,7 +343,6 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase Map<String, Object> nodeData = getRestTestHelper().getJsonAsSingletonList(_baseNodeRestUrl + nodeName + "?depth=0"); assertEquals("Unexpected name", nodeName, nodeData.get(BDBHAVirtualHostNode.NAME)); assertEquals("Unexpected type", "BDB_HA", nodeData.get(BDBHAVirtualHostNode.TYPE)); - assertEquals("Unexpected path", new File(_storeBaseDir, nodeName).getPath(), nodeData.get(BDBHAVirtualHostNode.STORE_PATH)); assertEquals("Unexpected address", "localhost:" + nodePort, nodeData.get(BDBHAVirtualHostNode.ADDRESS)); assertEquals("Unexpected helper address", "localhost:" + nodeHelperPort, nodeData.get(BDBHAVirtualHostNode.HELPER_ADDRESS)); assertEquals("Unexpected group name", _hostName, nodeData.get(BDBHAVirtualHostNode.GROUP_NAME)); diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostRestTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java index 334544e334..07ce033a55 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostRestTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import static org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost.LOCAL_TRANSACTION_SYNCHRONIZATION_POLICY; import static org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost.REMOTE_TRANSACTION_SYNCHRONIZATION_POLICY; @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade; import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; import org.apache.qpid.systest.rest.Asserts; @@ -60,7 +59,7 @@ public class BDBHAVirtualHostRestTest extends QpidRestTestCase _storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis()); _nodeHaPort = getNextAvailable(getRestTestHelper().getHttpPort() + 1); _virtualhostUrl = "virtualhost/" + _nodeName + "/" + _hostName; - _bluePrint = HATestClusterCreator.getBlueprint("localhost", _nodeHaPort); + _bluePrint = GroupCreator.getBlueprint("localhost", _nodeHaPort); super.setUp(); } diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java index ebc32b482a..e78ef34759 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import java.io.File; import java.io.IOException; @@ -46,6 +46,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionURL; +import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.server.management.plugin.HttpManagement; import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.Port; @@ -67,9 +68,9 @@ import org.junit.Assert; import com.sleepycat.je.rep.ReplicationConfig; -public class HATestClusterCreator +public class GroupCreator { - protected static final Logger LOGGER = Logger.getLogger(HATestClusterCreator.class); + protected static final Logger LOGGER = Logger.getLogger(GroupCreator.class); private static final String MANY_BROKER_URL_FORMAT = "amqp://guest:guest@/%s?brokerlist='%s'&failover='roundrobin?cyclecount='%d''"; private static final String BROKER_PORTION_FORMAT = "tcp://localhost:%d?connectdelay='%d',retries='%d'"; @@ -94,7 +95,7 @@ public class HATestClusterCreator private int _bdbHelperPort; private int _primaryBrokerPort; - public HATestClusterCreator(QpidBrokerTestCase testcase, String virtualHostName, int numberOfNodes) + public GroupCreator(QpidBrokerTestCase testcase, String virtualHostName, int numberOfNodes) { _testcase = testcase; _virtualHostName = virtualHostName; @@ -291,7 +292,12 @@ public class HATestClusterCreator return new HashSet<Integer>(_brokerPortToBdbPortMap.values()); } - public AMQConnectionURL getConnectionUrlForAllClusterNodes() throws Exception + public ConnectionURL getConnectionUrlForAllClusterNodes() throws Exception + { + return getConnectionUrlForAllClusterNodes(FAILOVER_CONNECTDELAY, FAILOVER_RETRIES, FAILOVER_CYCLECOUNT); + } + + public ConnectionURL getConnectionUrlForAllClusterNodes(int connectDelay, int retries, final int cyclecount) throws Exception { final StringBuilder brokerList = new StringBuilder(); @@ -299,14 +305,14 @@ public class HATestClusterCreator { int brokerPortNumber = itr.next(); - brokerList.append(String.format(BROKER_PORTION_FORMAT, brokerPortNumber, FAILOVER_CONNECTDELAY, FAILOVER_RETRIES)); + brokerList.append(String.format(BROKER_PORTION_FORMAT, brokerPortNumber, connectDelay, retries)); if (itr.hasNext()) { brokerList.append(";"); } } - return new AMQConnectionURL(String.format(MANY_BROKER_URL_FORMAT, _virtualHostName, brokerList, FAILOVER_CYCLECOUNT)); + return new AMQConnectionURL(String.format(MANY_BROKER_URL_FORMAT, _virtualHostName, brokerList, cyclecount)); } public AMQConnectionURL getConnectionUrlForSingleNodeWithoutRetry(final int brokerPortNumber) throws URLSyntaxException @@ -434,7 +440,7 @@ public class HATestClusterCreator int status = restHelper.submitRequest(url, "PUT", attributeMap); if (status != 200) { - throw new Exception("Unexpected http status when updating " + getNodeNameForBrokerPort(remoteNodePort) + " attribute's : " + status); + throw new Exception("Unexpected http status when updating " + getNodeNameForBrokerPort(remoteNodePort) + " attribute(s) : " + status); } } diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java index 0ab10cc318..c6f005c0e7 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import static com.sleepycat.je.rep.ReplicatedEnvironment.State.DETACHED; import static com.sleepycat.je.rep.ReplicatedEnvironment.State.MASTER; @@ -52,11 +52,11 @@ import org.junit.Assert; /** * System test verifying the ability to control a cluster via the Management API. * - * @see HAClusterBlackboxTest + * @see MultiNodeTest */ -public class HAClusterManagementTest extends QpidBrokerTestCase +public class JMXManagementTest extends QpidBrokerTestCase { - protected static final Logger LOGGER = Logger.getLogger(HAClusterManagementTest.class); + protected static final Logger LOGGER = Logger.getLogger(JMXManagementTest.class); private static final Set<String> NON_MASTER_STATES = new HashSet<String>(Arrays.asList(REPLICA.toString(), DETACHED.toString(), UNKNOWN.toString()));; private static final String VIRTUAL_HOST = "test"; @@ -64,7 +64,7 @@ public class HAClusterManagementTest extends QpidBrokerTestCase private static final String MANAGED_OBJECT_QUERY = "org.apache.qpid:type=BDBHAMessageStore,name=" + ObjectName.quote(VIRTUAL_HOST); private static final int NUMBER_OF_NODES = 4; - private final HATestClusterCreator _clusterCreator = new HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); + private final GroupCreator _clusterCreator = new GroupCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); private final JMXTestUtils _jmxUtils = new JMXTestUtils(this); private ConnectionURL _brokerFailoverUrl; diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java index 9867ce2eca..d6ba419de1 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java @@ -17,17 +17,20 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import java.io.File; import java.util.Collections; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; import javax.jms.Session; import org.apache.log4j.Logger; @@ -41,20 +44,23 @@ import org.apache.qpid.test.utils.TestUtils; /** * The HA black box tests test the BDB cluster as a opaque unit. Client connects to * the cluster via a failover url - * - * @see HAClusterWhiteboxTest */ -public class HAClusterBlackboxTest extends QpidBrokerTestCase +public class MultiNodeTest extends QpidBrokerTestCase { - protected static final Logger LOGGER = Logger.getLogger(HAClusterBlackboxTest.class); + protected static final Logger LOGGER = Logger.getLogger(MultiNodeTest.class); private static final String VIRTUAL_HOST = "test"; private static final int NUMBER_OF_NODES = 3; - private final HATestClusterCreator _clusterCreator = new HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); + private final GroupCreator _groupCreator = new GroupCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); private FailoverAwaitingListener _failoverListener; - private ConnectionURL _brokerFailoverUrl; + + /** Used when expectation is client will (re)-connect */ + private ConnectionURL _positiveFailoverUrl; + + /** Used when expectation is client will not (re)-connect */ + private ConnectionURL _negativeFailoverUrl; @Override protected void setUp() throws Exception @@ -66,11 +72,12 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties"); - _clusterCreator.configureClusterNodes(); + _groupCreator.configureClusterNodes(); - _brokerFailoverUrl = _clusterCreator.getConnectionUrlForAllClusterNodes(); + _positiveFailoverUrl = _groupCreator.getConnectionUrlForAllClusterNodes(); + _negativeFailoverUrl = _groupCreator.getConnectionUrlForAllClusterNodes(200, 0, 2); - _clusterCreator.startCluster(); + _groupCreator.startCluster(); _failoverListener = new FailoverAwaitingListener(); super.setUp(); @@ -84,14 +91,14 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase public void testLossOfMasterNodeCausesClientToFailover() throws Exception { - final Connection connection = getConnection(_brokerFailoverUrl); + final Connection connection = getConnection(_positiveFailoverUrl); ((AMQConnection)connection).setConnectionListener(_failoverListener); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); LOGGER.info("Active connection port " + activeBrokerPort); - _clusterCreator.stopNode(activeBrokerPort); + _groupCreator.stopNode(activeBrokerPort); LOGGER.info("Node is stopped"); _failoverListener.awaitFailoverCompletion(20000); LOGGER.info("Listener has finished"); @@ -101,103 +108,175 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase public void testLossOfReplicaNodeDoesNotCauseClientToFailover() throws Exception { - LOGGER.info("Connecting to " + _brokerFailoverUrl); - final Connection connection = getConnection(_brokerFailoverUrl); - LOGGER.info("Got connection to cluster"); + final Connection connection = getConnection(_positiveFailoverUrl); ((AMQConnection)connection).setConnectionListener(_failoverListener); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); LOGGER.info("Active connection port " + activeBrokerPort); - final int inactiveBrokerPort = _clusterCreator.getPortNumberOfAnInactiveBroker(connection); + final int inactiveBrokerPort = _groupCreator.getPortNumberOfAnInactiveBroker(connection); LOGGER.info("Stopping inactive broker on port " + inactiveBrokerPort); - _clusterCreator.stopNode(inactiveBrokerPort); + _groupCreator.stopNode(inactiveBrokerPort); _failoverListener.assertNoFailoverCompletionWithin(2000); - // any op to ensure connection remains - connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + assertProducingConsuming(connection); + } + + public void testLossOfQuorumCausesClientDisconnection() throws Exception + { + final Connection connection = getConnection(_negativeFailoverUrl); + + ((AMQConnection)connection).setConnectionListener(_failoverListener); + + Set<Integer> ports = _groupCreator.getBrokerPortNumbersForNodes(); + + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); + ports.remove(activeBrokerPort); + + // Stop all other nodes + for (Integer p : ports) + { + _groupCreator.stopNode(p); + } + + try + { + Session session = connection.createSession(true, Session.SESSION_TRANSACTED); + Destination destination = session.createQueue(getTestQueueName()); + session.createConsumer(destination).close(); + fail("Exception not thrown - creating durable queue should fail without quorum"); + } + catch(JMSException jms) + { + // PASS + } + + // New connections should now fail as vhost will be unavailable + try + { + getConnection(_negativeFailoverUrl); + fail("Exception not thrown"); + } + catch (JMSException je) + { + // PASS + } + } + + public void testPersistentMessagesAvailableAfterFailover() throws Exception + { + final Connection connection = getConnection(_positiveFailoverUrl); + + ((AMQConnection)connection).setConnectionListener(_failoverListener); + + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); + + Session producingSession = connection.createSession(true, Session.SESSION_TRANSACTED); + Destination queue = producingSession.createQueue(getTestQueueName()); + producingSession.createConsumer(queue).close(); + sendMessage(producingSession, queue, 10); + + _groupCreator.stopNode(activeBrokerPort); + LOGGER.info("Old master (broker port " + activeBrokerPort + ") is stopped"); + + _failoverListener.awaitFailoverCompletion(20000); + LOGGER.info("Failover has finished"); + + final int activeBrokerPortAfterFailover = _groupCreator.getBrokerPortNumberFromConnection(connection); + LOGGER.info("New master (broker port " + activeBrokerPort + ") after failover"); + + Session consumingSession = connection.createSession(true, Session.SESSION_TRANSACTED); + MessageConsumer consumer = consumingSession.createConsumer(queue); + + connection.start(); + for(int i = 0; i < 10; i++) + { + Message m = consumer.receive(RECEIVE_TIMEOUT); + assertNotNull("Message " + i + " is not received", m); + assertEquals("Unexpected message received", i, m.getIntProperty(INDEX)); + } + consumingSession.commit(); } public void testTransferMasterFromLocalNode() throws Exception { - final Connection connection = getConnection(_brokerFailoverUrl); + final Connection connection = getConnection(_positiveFailoverUrl); ((AMQConnection)connection).setConnectionListener(_failoverListener); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); LOGGER.info("Active connection port " + activeBrokerPort); - final int inactiveBrokerPort = _clusterCreator.getPortNumberOfAnInactiveBroker(connection); + final int inactiveBrokerPort = _groupCreator.getPortNumberOfAnInactiveBroker(connection); LOGGER.info("Update role attribute on inactive broker on port " + inactiveBrokerPort); - Map<String, Object> attributes = _clusterCreator.getNodeAttributes(inactiveBrokerPort); + Map<String, Object> attributes = _groupCreator.getNodeAttributes(inactiveBrokerPort); assertEquals("Inactive broker has unexpected role", "REPLICA", attributes.get(BDBHAVirtualHostNode.ROLE)); - _clusterCreator.setNodeAttributes(inactiveBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.ROLE, "MASTER")); + _groupCreator.setNodeAttributes(inactiveBrokerPort, + Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.ROLE, "MASTER")); _failoverListener.awaitFailoverCompletion(20000); LOGGER.info("Listener has finished"); - attributes = _clusterCreator.getNodeAttributes(inactiveBrokerPort); + attributes = _groupCreator.getNodeAttributes(inactiveBrokerPort); assertEquals("Inactive broker has unexpected role", "MASTER", attributes.get(BDBHAVirtualHostNode.ROLE)); assertProducingConsuming(connection); - _clusterCreator.awaitNodeToAttainRole(activeBrokerPort, "REPLICA"); + _groupCreator.awaitNodeToAttainRole(activeBrokerPort, "REPLICA"); } public void testTransferMasterFromRemoteNode() throws Exception { - final Connection connection = getConnection(_brokerFailoverUrl); + final Connection connection = getConnection(_positiveFailoverUrl); ((AMQConnection)connection).setConnectionListener(_failoverListener); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); LOGGER.info("Active connection port " + activeBrokerPort); - final int inactiveBrokerPort = _clusterCreator.getPortNumberOfAnInactiveBroker(connection); + final int inactiveBrokerPort = _groupCreator.getPortNumberOfAnInactiveBroker(connection); LOGGER.info("Update role attribute on inactive broker on port " + inactiveBrokerPort); - _clusterCreator.awaitNodeToAttainRole(activeBrokerPort, inactiveBrokerPort, "REPLICA"); - Map<String, Object> attributes = _clusterCreator.getNodeAttributes(activeBrokerPort, inactiveBrokerPort); + _groupCreator.awaitNodeToAttainRole(activeBrokerPort, inactiveBrokerPort, "REPLICA"); + Map<String, Object> attributes = _groupCreator.getNodeAttributes(activeBrokerPort, inactiveBrokerPort); assertEquals("Inactive broker has unexpected role", "REPLICA", attributes.get(BDBHAVirtualHostNode.ROLE)); - _clusterCreator.setNodeAttributes(activeBrokerPort, inactiveBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.ROLE, "MASTER")); + _groupCreator.setNodeAttributes(activeBrokerPort, inactiveBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.ROLE, "MASTER")); _failoverListener.awaitFailoverCompletion(20000); LOGGER.info("Listener has finished"); - attributes = _clusterCreator.getNodeAttributes(inactiveBrokerPort); + attributes = _groupCreator.getNodeAttributes(inactiveBrokerPort); assertEquals("Inactive broker has unexpected role", "MASTER", attributes.get(BDBHAVirtualHostNode.ROLE)); assertProducingConsuming(connection); - _clusterCreator.awaitNodeToAttainRole(activeBrokerPort, "REPLICA"); + _groupCreator.awaitNodeToAttainRole(activeBrokerPort, "REPLICA"); } public void testQuorumOverride() throws Exception { - final Connection connection = getConnection(_brokerFailoverUrl); - - ((AMQConnection)connection).setConnectionListener(_failoverListener); + final Connection connection = getConnection(_positiveFailoverUrl); - Set<Integer> ports = _clusterCreator.getBrokerPortNumbersForNodes(); + Set<Integer> ports = _groupCreator.getBrokerPortNumbersForNodes(); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); ports.remove(activeBrokerPort); // Stop all other nodes for (Integer p : ports) { - _clusterCreator.stopNode(p); + _groupCreator.stopNode(p); } - Map<String, Object> attributes = _clusterCreator.getNodeAttributes(activeBrokerPort); + Map<String, Object> attributes = _groupCreator.getNodeAttributes(activeBrokerPort); assertEquals("Broker has unexpected quorum override", new Integer(0), attributes.get(BDBHAVirtualHostNode.QUORUM_OVERRIDE)); - _clusterCreator.setNodeAttributes(activeBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.QUORUM_OVERRIDE, 1)); + _groupCreator.setNodeAttributes(activeBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.QUORUM_OVERRIDE, 1)); - attributes = _clusterCreator.getNodeAttributes(activeBrokerPort); + attributes = _groupCreator.getNodeAttributes(activeBrokerPort); assertEquals("Broker has unexpected quorum override", new Integer(1), attributes.get(BDBHAVirtualHostNode.QUORUM_OVERRIDE)); assertProducingConsuming(connection); @@ -205,24 +284,24 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase public void testPriority() throws Exception { - final Connection connection = getConnection(_brokerFailoverUrl); + final Connection connection = getConnection(_positiveFailoverUrl); ((AMQConnection)connection).setConnectionListener(_failoverListener); - final int activeBrokerPort = _clusterCreator.getBrokerPortNumberFromConnection(connection); + final int activeBrokerPort = _groupCreator.getBrokerPortNumberFromConnection(connection); LOGGER.info("Active connection port " + activeBrokerPort); int priority = 1; Integer highestPriorityBrokerPort = null; - Set<Integer> ports = _clusterCreator.getBrokerPortNumbersForNodes(); + Set<Integer> ports = _groupCreator.getBrokerPortNumbersForNodes(); for (Integer port : ports) { if (activeBrokerPort != port.intValue()) { priority = priority + 1; highestPriorityBrokerPort = port; - _clusterCreator.setNodeAttributes(port, port, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.PRIORITY, priority)); - Map<String, Object> attributes = _clusterCreator.getNodeAttributes(port, port); + _groupCreator.setNodeAttributes(port, port, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.PRIORITY, priority)); + Map<String, Object> attributes = _groupCreator.getNodeAttributes(port, port); assertEquals("Broker has unexpected priority", priority, attributes.get(BDBHAVirtualHostNode.PRIORITY)); } } @@ -230,12 +309,12 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase LOGGER.info("Broker on port " + highestPriorityBrokerPort + " has the highest priority of " + priority); LOGGER.info("Shutting down the MASTER"); - _clusterCreator.stopNode(activeBrokerPort); + _groupCreator.stopNode(activeBrokerPort); _failoverListener.awaitFailoverCompletion(20000); LOGGER.info("Listener has finished"); - Map<String, Object> attributes = _clusterCreator.getNodeAttributes(highestPriorityBrokerPort, highestPriorityBrokerPort); + Map<String, Object> attributes = _groupCreator.getNodeAttributes(highestPriorityBrokerPort, highestPriorityBrokerPort); assertEquals("Inactive broker has unexpected role", "MASTER", attributes.get(BDBHAVirtualHostNode.ROLE)); assertProducingConsuming(connection); diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java index 8df419c3a7..0f8a1609de 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.qpid.server.store.berkeleydb; +package org.apache.qpid.server.store.berkeleydb.replication; import java.io.File; @@ -30,14 +30,14 @@ import org.apache.qpid.server.store.berkeleydb.jmx.ManagedBDBHAMessageStore; import org.apache.qpid.test.utils.JMXTestUtils; import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class HAClusterTwoNodeTest extends QpidBrokerTestCase +public class TwoNodeTest extends QpidBrokerTestCase { private static final String VIRTUAL_HOST = "test"; private static final String MANAGED_OBJECT_QUERY = "org.apache.qpid:type=BDBHAMessageStore,name=" + ObjectName.quote(VIRTUAL_HOST); private static final int NUMBER_OF_NODES = 2; - private final HATestClusterCreator _clusterCreator = new HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); + private final GroupCreator _groupCreator = new GroupCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES); private final JMXTestUtils _jmxUtils = new JMXTestUtils(this); private ConnectionURL _brokerFailoverUrl; @@ -75,21 +75,21 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase private void startCluster(boolean designedPrimary) throws Exception { setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties"); - _clusterCreator.configureClusterNodes(); - _clusterCreator.setDesignatedPrimaryOnFirstBroker(designedPrimary); - _brokerFailoverUrl = _clusterCreator.getConnectionUrlForAllClusterNodes(); - _clusterCreator.startCluster(); + _groupCreator.configureClusterNodes(); + _groupCreator.setDesignatedPrimaryOnFirstBroker(designedPrimary); + _brokerFailoverUrl = _groupCreator.getConnectionUrlForAllClusterNodes(); + _groupCreator.startCluster(); } public void testMasterDesignatedPrimaryCanBeRestartedWithoutReplica() throws Exception { startCluster(true); final Connection initialConnection = getConnection(_brokerFailoverUrl); - int masterPort = _clusterCreator.getBrokerPortNumberFromConnection(initialConnection); + int masterPort = _groupCreator.getBrokerPortNumberFromConnection(initialConnection); assertProducingConsuming(initialConnection); initialConnection.close(); - _clusterCreator.stopCluster(); - _clusterCreator.startNode(masterPort); + _groupCreator.stopCluster(); + _groupCreator.startNode(masterPort); final Connection secondConnection = getConnection(_brokerFailoverUrl); assertProducingConsuming(secondConnection); secondConnection.close(); @@ -101,8 +101,8 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase final Connection initialConnection = getConnection(_brokerFailoverUrl); assertProducingConsuming(initialConnection); initialConnection.close(); - _clusterCreator.stopCluster(); - _clusterCreator.startClusterParallel(); + _groupCreator.stopCluster(); + _groupCreator.startClusterParallel(); final Connection secondConnection = getConnection(_brokerFailoverUrl); assertProducingConsuming(secondConnection); secondConnection.close(); @@ -111,7 +111,7 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase public void testDesignatedPrimaryContinuesAfterSecondaryStopped() throws Exception { startCluster(true); - _clusterCreator.stopNode(_clusterCreator.getBrokerPortNumberOfSecondaryNode()); + _groupCreator.stopNode(_groupCreator.getBrokerPortNumberOfSecondaryNode()); final Connection connection = getConnection(_brokerFailoverUrl); assertNotNull("Expected to get a valid connection to primary", connection); assertProducingConsuming(connection); @@ -120,7 +120,7 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase public void testPersistentOperationsFailOnNonDesignatedPrimaryAfterSecondaryStopped() throws Exception { startCluster(false); - _clusterCreator.stopNode(_clusterCreator.getBrokerPortNumberOfSecondaryNode()); + _groupCreator.stopNode(_groupCreator.getBrokerPortNumberOfSecondaryNode()); try { @@ -139,7 +139,7 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase public void testSecondaryDoesNotBecomePrimaryWhenDesignatedPrimaryStopped() throws Exception { startCluster(true); - _clusterCreator.stopNode(_clusterCreator.getBrokerPortNumberOfPrimary()); + _groupCreator.stopNode(_groupCreator.getBrokerPortNumberOfPrimary()); try { @@ -155,18 +155,18 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase public void testInitialDesignatedPrimaryStateOfNodes() throws Exception { startCluster(true); - final ManagedBDBHAMessageStore primaryStoreBean = getStoreBeanForNodeAtBrokerPort(_clusterCreator.getBrokerPortNumberOfPrimary()); + final ManagedBDBHAMessageStore primaryStoreBean = getStoreBeanForNodeAtBrokerPort(_groupCreator.getBrokerPortNumberOfPrimary()); assertTrue("Expected primary node to be set as designated primary", primaryStoreBean.getDesignatedPrimary()); - final ManagedBDBHAMessageStore secondaryStoreBean = getStoreBeanForNodeAtBrokerPort(_clusterCreator.getBrokerPortNumberOfSecondaryNode()); + final ManagedBDBHAMessageStore secondaryStoreBean = getStoreBeanForNodeAtBrokerPort(_groupCreator.getBrokerPortNumberOfSecondaryNode()); assertFalse("Expected secondary node to NOT be set as designated primary", secondaryStoreBean.getDesignatedPrimary()); } public void testSecondaryDesignatedAsPrimaryAfterOriginalPrimaryStopped() throws Exception { startCluster(true); - final ManagedBDBHAMessageStore storeBean = getStoreBeanForNodeAtBrokerPort(_clusterCreator.getBrokerPortNumberOfSecondaryNode()); - _clusterCreator.stopNode(_clusterCreator.getBrokerPortNumberOfPrimary()); + final ManagedBDBHAMessageStore storeBean = getStoreBeanForNodeAtBrokerPort(_groupCreator.getBrokerPortNumberOfSecondaryNode()); + _groupCreator.stopNode(_groupCreator.getBrokerPortNumberOfPrimary()); assertFalse("Expected node to NOT be set as designated primary", storeBean.getDesignatedPrimary()); storeBean.setDesignatedPrimary(true); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java index c3fd0ba428..7801cf3d42 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java @@ -62,9 +62,8 @@ public class InternalMessage extends AbstractServerMessageImpl<InternalMessage, _contentSize = msg.getMetaData().getContentSize(); ByteBuffer buf = msg.getContent(0, _contentSize); - try + try(ObjectInputStream is = new ObjectInputStream(new ByteBufferInputStream(buf))) { - ObjectInputStream is = new ObjectInputStream(new ByteBufferInputStream(buf)); _messageBody = is.readObject(); } @@ -128,9 +127,8 @@ public class InternalMessage extends AbstractServerMessageImpl<InternalMessage, internalHeader = new InternalMessageHeader(header); } ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); - try + try (ObjectOutputStream os = new ObjectOutputStream(bytesOut)) { - ObjectOutputStream os = new ObjectOutputStream(bytesOut); os.writeObject(bodyObject); byte[] bytes = bytesOut.toByteArray(); @@ -181,76 +179,79 @@ public class InternalMessage extends AbstractServerMessageImpl<InternalMessage, final Object messageBody) { - ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); - try + + try(ByteArrayOutputStream bytesOut = new ByteArrayOutputStream()) { - ObjectOutputStream os = new ObjectOutputStream(bytesOut); - os.writeObject(messageBody); - final byte[] bytes = bytesOut.toByteArray(); + try(ObjectOutputStream os = new ObjectOutputStream(bytesOut)) + { + os.writeObject(messageBody); + final byte[] bytes = bytesOut.toByteArray(); - final InternalMessageMetaData metaData = InternalMessageMetaData.create(persistent, header, bytes.length); + final InternalMessageMetaData metaData = + InternalMessageMetaData.create(persistent, header, bytes.length); - return new StoredMessage<InternalMessageMetaData>() - { - @Override - public InternalMessageMetaData getMetaData() + return new StoredMessage<InternalMessageMetaData>() { - return metaData; - } + @Override + public InternalMessageMetaData getMetaData() + { + return metaData; + } - @Override - public long getMessageNumber() - { - return messageNumber; - } + @Override + public long getMessageNumber() + { + return messageNumber; + } - @Override - public void addContent(final int offsetInMessage, final ByteBuffer src) - { - throw new UnsupportedOperationException(); - } + @Override + public void addContent(final int offsetInMessage, final ByteBuffer src) + { + throw new UnsupportedOperationException(); + } - @Override - public int getContent(final int offsetInMessage, final ByteBuffer dst) - { - ByteBuffer buffer = ByteBuffer.wrap(bytes); - buffer.position(offsetInMessage); - buffer = buffer.slice(); - if(dst.remaining() < buffer.remaining()) + @Override + public int getContent(final int offsetInMessage, final ByteBuffer dst) { - buffer.limit(dst.remaining()); + ByteBuffer buffer = ByteBuffer.wrap(bytes); + buffer.position(offsetInMessage); + buffer = buffer.slice(); + if (dst.remaining() < buffer.remaining()) + { + buffer.limit(dst.remaining()); + } + int pos = dst.position(); + dst.put(buffer); + return dst.position() - pos; } - int pos = dst.position(); - dst.put(buffer); - return dst.position()-pos; - } - @Override - public ByteBuffer getContent(final int offsetInMessage, final int size) - { - return ByteBuffer.wrap(bytes,offsetInMessage,size); - } + @Override + public ByteBuffer getContent(final int offsetInMessage, final int size) + { + return ByteBuffer.wrap(bytes, offsetInMessage, size); + } - @Override - public void remove() - { - throw new UnsupportedOperationException(); - } + @Override + public void remove() + { + throw new UnsupportedOperationException(); + } - @Override - public boolean isInMemory() - { - return true; - } + @Override + public boolean isInMemory() + { + return true; + } - @Override - public boolean flowToDisk() - { - return false; - } - }; + @Override + public boolean flowToDisk() + { + return false; + } + }; + } } catch (IOException e) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java index 613d4d15d8..7fc13fb40b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java @@ -46,9 +46,8 @@ public class InternalMessageMetaDataType implements MessageMetaDataType<Internal @Override public InternalMessageMetaData createMetaData(final ByteBuffer buf) { - try + try(ObjectInputStream is = new ObjectInputStream(new ByteBufferInputStream(buf))) { - ObjectInputStream is = new ObjectInputStream(new ByteBufferInputStream(buf)); InternalMessageMetaData metaData = (InternalMessageMetaData) is.readObject(); return metaData; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java index 34a18c884f..58fd8d73d0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java @@ -26,6 +26,6 @@ public interface JsonVirtualHostNode<X extends JsonVirtualHostNode<X>> extends o String STORE_PATH = "storePath"; - @ManagedAttribute(mandatory = true) + @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}config") String getStorePath(); } diff --git a/qpid/java/broker-core/src/main/resources/initial-config.json b/qpid/java/broker-core/src/main/resources/initial-config.json index 74aedd14af..9f1f779559 100644 --- a/qpid/java/broker-core/src/main/resources/initial-config.json +++ b/qpid/java/broker-core/src/main/resources/initial-config.json @@ -55,9 +55,8 @@ "virtualhostnodes" : [ { "name" : "default", "type" : "JSON", - "storePath" : "${qpid.work_dir}${file.separator}default${file.separator}config", "context" : { - "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${json:qpid.work_dir}${json:file.separator}default${json:file.separator}messages\" }" + "virtualhostBlueprint" : "{ \"type\" : \"DERBY\" }" } } ], "plugins" : [ { diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java index 9411d7906d..4935d5e707 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java @@ -29,7 +29,7 @@ public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends Virtual { String STORE_PATH = "storePath"; - @ManagedAttribute(mandatory = true) + @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}messages") String getStorePath(); @ManagedAttribute(mandatory = true, defaultValue = "0") diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java index 3b31f4e7e0..81a9167924 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java @@ -26,6 +26,6 @@ public interface DerbyVirtualHostNode<X extends DerbyVirtualHostNode<X>> extends { String STORE_PATH = "storePath"; - @ManagedAttribute(mandatory = true) + @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}config") String getStorePath(); } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html index fa4f0d64f1..0ec1e89c24 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html @@ -20,15 +20,13 @@ --> <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter store path'" /> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 613218f2fc..d29144f09b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -111,6 +111,9 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem @ManagedAttributeField private int _sessionTimeout; + @ManagedAttributeField + private boolean _compressResponses; + private boolean _allowPortActivation; @ManagedObjectFactoryConstructor @@ -477,6 +480,12 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem } @Override + public boolean isCompressResponses() + { + return _compressResponses; + } + + @Override public AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress) { return getBroker().getAuthenticationProvider(localAddress); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java index aff9f3a7e2..9eef1a6e5c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java @@ -29,6 +29,7 @@ import org.apache.qpid.server.model.Plugin; public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X> { + @ManagedAttribute( defaultValue = "true" ) boolean isHttpsSaslAuthenticationEnabled(); @@ -44,6 +45,13 @@ public interface HttpManagementConfiguration<X extends HttpManagementConfigurati @ManagedAttribute( defaultValue = "600" ) public int getSessionTimeout(); + String HTTP_MANAGEMENT_COMPRESS_RESPONSES = "httpManagement.compressResponses"; + @ManagedContextDefault(name = HTTP_MANAGEMENT_COMPRESS_RESPONSES) + boolean DEFAULT_COMPRESS_RESPONSES = false; + + @ManagedAttribute( defaultValue = "${"+HTTP_MANAGEMENT_COMPRESS_RESPONSES+"}" ) + public boolean isCompressResponses(); + String MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME = "maxHttpFileUploadSize"; @ManagedContextDefault( name = MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME) static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java index ef0a68a42b..847ada3407 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java @@ -20,17 +20,24 @@ */ package org.apache.qpid.server.management.plugin; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.security.Principal; import java.security.PrivilegedAction; import java.security.cert.X509Certificate; import java.util.Collections; +import java.util.zip.GZIPOutputStream; import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; @@ -71,6 +78,10 @@ public class HttpManagementUtil private static final String ATTR_SUBJECT = "Qpid.subject"; private static final String ATTR_LOG_ACTOR = "Qpid.logActor"; + private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding"; + private static final String CONTENT_ENCODING_HEADER = "Content-Encoding"; + private static final String GZIP_CONTENT_ENCODING = "gzip"; + public static Broker<?> getBroker(ServletContext servletContext) { return (Broker<?>) servletContext.getAttribute(ATTR_BROKER); @@ -219,5 +230,42 @@ public class HttpManagementUtil return null; } + public static Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response) + throws IOException + { + return getOutputWriter(request, response, getManagementConfiguration(request.getServletContext())); + } + + public static Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response, HttpManagementConfiguration managementConfiguration) + throws IOException + { + Writer writer; + writer = new BufferedWriter(new OutputStreamWriter(getOutputStream(request,response, managementConfiguration))); + return writer; + } + + public static OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response) + throws IOException + { + return getOutputStream(request, response, getManagementConfiguration(request.getServletContext())); + } + + public static OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response, HttpManagementConfiguration managementConfiguration) + throws IOException + { + OutputStream outputStream; + if(managementConfiguration.isCompressResponses() + && Collections.list(request.getHeaderNames()).contains(ACCEPT_ENCODING_HEADER) + && request.getHeader(ACCEPT_ENCODING_HEADER).contains(GZIP_CONTENT_ENCODING)) + { + outputStream = new GZIPOutputStream(response.getOutputStream()); + response.setHeader(CONTENT_ENCODING_HEADER, GZIP_CONTENT_ENCODING); + } + else + { + outputStream = response.getOutputStream(); + } + return outputStream; + } } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java index e6ae47dcff..d8f8e4e4b0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java @@ -18,14 +18,16 @@ package org.apache.qpid.server.management.plugin.servlet; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.qpid.server.management.plugin.HttpManagementUtil; + public class DefinedFileServlet extends HttpServlet { @@ -57,23 +59,25 @@ public class DefinedFileServlet extends HttpServlet @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final ServletOutputStream output = response.getOutputStream(); - InputStream fileInput = getClass().getResourceAsStream("/resources/"+_filename); - - if(fileInput != null) + try (OutputStream output = HttpManagementUtil.getOutputStream(request, response)) { - byte[] buffer = new byte[1024]; - response.setStatus(HttpServletResponse.SC_OK); - int read = 0; + InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename); - while((read = fileInput.read(buffer)) > 0) + if (fileInput != null) { - output.write(buffer, 0, read); + byte[] buffer = new byte[1024]; + response.setStatus(HttpServletResponse.SC_OK); + int read = 0; + + while ((read = fileInput.read(buffer)) > 0) + { + output.write(buffer, 0, read); + } + } + else + { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename); } - } - else - { - response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: "+ _filename); } } } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java index 618aaed319..3eab80dbd8 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java @@ -22,17 +22,19 @@ package org.apache.qpid.server.management.plugin.servlet; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.net.URL; import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.qpid.server.management.plugin.HttpManagementUtil; + public class FileServlet extends HttpServlet { private static final String RESOURCES_PREFIX = "/resources"; @@ -97,7 +99,7 @@ public class FileServlet extends HttpServlet { byte[] buffer = new byte[1024]; int read = 0; - ServletOutputStream output = response.getOutputStream(); + OutputStream output = HttpManagementUtil.getOutputStream(request, response); try { while((read = fileInput.read(buffer)) != -1) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java index a9e80db3bf..c05814bb9c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java @@ -21,7 +21,8 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.OutputStream; +import java.io.Writer; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; @@ -32,16 +33,18 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.log4j.Logger; -import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; -import org.apache.qpid.server.management.plugin.HttpManagementUtil; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; +import org.apache.qpid.server.management.plugin.HttpManagementUtil; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.util.ConnectionScopedRuntimeException; + public abstract class AbstractServlet extends HttpServlet { private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class); @@ -137,6 +140,18 @@ public abstract class AbstractServlet extends HttpServlet ); } + public Writer getOutputWriter(final HttpServletRequest request, final HttpServletResponse response) + throws IOException + { + return HttpManagementUtil.getOutputWriter(request, response, _managementConfiguration); + } + + public OutputStream getOutputStream(final HttpServletRequest request, final HttpServletResponse response) + throws IOException + { + return HttpManagementUtil.getOutputStream(request, response, _managementConfiguration); + } + /** * Performs the PUT action as the logged-in {@link Subject}. * Subclasses commonly override this method @@ -247,7 +262,7 @@ public abstract class AbstractServlet extends HttpServlet } } - protected void sendJsonResponse(Object object, HttpServletResponse response) throws IOException, + protected void sendJsonResponse(Object object, HttpServletRequest request, HttpServletResponse response) throws IOException, JsonGenerationException, JsonMappingException { response.setStatus(HttpServletResponse.SC_OK); @@ -257,7 +272,7 @@ public abstract class AbstractServlet extends HttpServlet response.setDateHeader ("Expires", 0); response.setContentType("application/json"); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, object); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java index 367ed5a2a9..cb41fd9203 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.management.plugin.servlet.rest; -import java.io.BufferedWriter; import java.io.IOException; import java.io.Writer; import java.util.Enumeration; @@ -31,14 +30,15 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.SerializationConfig; + import org.apache.qpid.server.management.plugin.servlet.rest.action.ListAccessControlProviderAttributes; import org.apache.qpid.server.management.plugin.servlet.rest.action.ListAuthenticationProviderAttributes; import org.apache.qpid.server.management.plugin.servlet.rest.action.ListBrokerAttribute; import org.apache.qpid.server.management.plugin.servlet.rest.action.ListGroupProviderAttributes; import org.apache.qpid.server.management.plugin.servlet.rest.action.ListTimeZones; import org.apache.qpid.server.model.Broker; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; public class HelperServlet extends AbstractServlet { @@ -122,7 +122,7 @@ public class HelperServlet extends AbstractServlet return; } response.setContentType("application/json"); - final Writer writer = new BufferedWriter(response.getWriter()); + final Writer writer = getOutputWriter(request, response); _mapper.writeValue(writer, output); response.setStatus(HttpServletResponse.SC_OK); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java index 8b88e51e9c..a7889e4890 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogFileListingServlet.java @@ -18,7 +18,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.Writer; import java.util.Collections; import java.util.List; @@ -27,11 +27,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.LogManager; -import org.apache.qpid.server.management.plugin.log.LogFileDetails; -import org.apache.qpid.server.management.plugin.log.LogFileHelper; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.apache.qpid.server.management.plugin.log.LogFileDetails; +import org.apache.qpid.server.management.plugin.log.LogFileHelper; + public class LogFileListingServlet extends AbstractServlet { private static final long serialVersionUID = 1L; @@ -56,7 +57,7 @@ public class LogFileListingServlet extends AbstractServlet response.setContentType("application/json"); response.setStatus(HttpServletResponse.SC_OK); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, logFiles); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java index 35523ddf0f..b9d58c8868 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java @@ -17,18 +17,21 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.server.logging.LogRecorder; + import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.apache.qpid.server.logging.LogRecorder; + public class LogRecordsServlet extends AbstractServlet { private static final long serialVersionUID = 2L; @@ -77,7 +80,7 @@ public class LogRecordsServlet extends AbstractServlet } } - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request,response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, logRecords); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java index 29cc881be7..25d109ba29 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java @@ -33,11 +33,12 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.codehaus.jackson.map.ObjectMapper; + import org.apache.qpid.server.management.plugin.HttpManagementUtil; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.PreferencesProvider; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; -import org.codehaus.jackson.map.ObjectMapper; public class LoggedOnUserPreferencesServlet extends AbstractServlet { @@ -59,7 +60,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet { preferences = Collections.<String, Object>emptyMap(); } - sendJsonResponse(preferences, response); + sendJsonResponse(preferences, request, response); } /* @@ -88,7 +89,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet { preferences = Collections.<String, Object>emptyMap(); } - sendJsonResponse(preferences, response); + sendJsonResponse(preferences, request, response); } /* @@ -115,7 +116,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet { preferences = Collections.<String, Object>emptyMap(); } - sendJsonResponse(preferences, response); + sendJsonResponse(preferences, request, response); } private String getAuthenticatedUserName(HttpServletRequest request) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java index ef33a240a9..db58e49eeb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java @@ -60,7 +60,7 @@ public class MessageContentServlet extends AbstractServlet { response.setContentType(finder.getMimeType()); response.setContentLength((int) finder.getSize()); - response.getOutputStream().write(finder.getContent()); + getOutputStream(request, response).write(finder.getContent()); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java index 8c77876e1a..8de74d189b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java @@ -18,7 +18,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.Writer; import java.security.AccessControlException; import java.util.ArrayList; import java.util.HashMap; @@ -85,7 +85,7 @@ public class MessageServlet extends AbstractServlet response.setDateHeader ("Expires", 0); response.setContentType("application/json"); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request,response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, messageFinder.getMessageObject()); @@ -119,7 +119,7 @@ public class MessageServlet extends AbstractServlet response.setHeader("Pragma","no-cache"); response.setDateHeader ("Expires", 0); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request,response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, messages); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java index 55c2bf6901..c84eb3200b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.management.plugin.servlet.rest; -import java.io.BufferedWriter; import java.io.IOException; import java.io.Writer; import java.util.Collection; @@ -69,7 +68,7 @@ public class MetaDataServlet extends AbstractServlet classToDataMap.put(clazz.getSimpleName(), processCategory(clazz)); } - final Writer writer = new BufferedWriter(response.getWriter()); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, classToDataMap); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index 57b3df8050..d96802cc8b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -16,7 +16,6 @@ */ package org.apache.qpid.server.management.plugin.servlet.rest; -import java.io.BufferedWriter; import java.io.IOException; import java.io.Writer; import java.security.AccessControlException; @@ -327,7 +326,7 @@ public class RestServlet extends AbstractServlet depth, actuals, includeSystemContext)); } - final Writer writer = new BufferedWriter(response.getWriter()); + Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, output); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java index 81d67caf96..3dcd4a3978 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.Writer; import java.net.SocketAddress; import java.security.Principal; import java.security.SecureRandom; @@ -100,7 +100,7 @@ public class SaslServlet extends AbstractServlet outputObject.put("mechanisms", (Object) mechanisms); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); @@ -268,7 +268,7 @@ public class SaslServlet extends AbstractServlet Map<String, Object> outputObject = new LinkedHashMap<String, Object>(); outputObject.put("challenge", new String(Base64.encodeBase64(challenge))); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); @@ -290,7 +290,7 @@ public class SaslServlet extends AbstractServlet outputObject.put("id", id); outputObject.put("challenge", new String(Base64.encodeBase64(challenge))); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java index 907610c8d2..7508aa2d0b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java @@ -17,7 +17,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest; import java.io.IOException; -import java.io.PrintWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; @@ -55,7 +55,7 @@ public class StructureServlet extends AbstractServlet Map<String,Object> structure = generateStructure(getBroker(), Broker.class); - final PrintWriter writer = response.getWriter(); + final Writer writer = getOutputWriter(request, response); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); mapper.writeValue(writer, structure); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java index 01657b131d..b782022986 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; + import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.PreferencesProvider; @@ -53,15 +54,15 @@ public class UserPreferencesServlet extends AbstractServlet String[] pathElements = getPathInfoElements(request); if (pathElements != null && pathElements.length > 1) { - getUserPreferences(pathElements[0], pathElements[1], response); + getUserPreferences(pathElements[0], pathElements[1], request, response); } else { - getUserList(pathElements, response); + getUserList(pathElements, request, response); } } - private void getUserPreferences(String authenticationProviderName, String userId, HttpServletResponse response) + private void getUserPreferences(String authenticationProviderName, String userId, HttpServletRequest request, HttpServletResponse response) throws IOException { try @@ -83,10 +84,10 @@ public class UserPreferencesServlet extends AbstractServlet } preferences = preferencesProvider.getPreferences(userId); - sendJsonResponse(preferences, response); + sendJsonResponse(preferences, request, response); } - private void getUserList(String[] pathElements, HttpServletResponse response) throws IOException + private void getUserList(String[] pathElements, HttpServletRequest request, HttpServletResponse response) throws IOException { List<Map<String, Object>> users = null; try @@ -98,7 +99,7 @@ public class UserPreferencesServlet extends AbstractServlet LOGGER.debug("Bad preferences request", e); response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage()); } - sendJsonResponse(users, response); + sendJsonResponse(users, request, response); } private PreferencesProvider getPreferencesProvider(String authenticationProviderName) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index 8cc3e76b58..51a6c761f1 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -349,10 +349,14 @@ define(["dojo/_base/xhr", gotoButton: true, maxPageStep: 4, position: "bottom" - }, - indirectSelection: true + } }}; + function isActiveVH(item) + { + return item && item.virtualhosts && item.virtualhosts[0].state=="ACTIVE"; + } + that.vhostsGrid = new UpdatableStore(that.brokerData.virtualhostnodes, query(".broker-virtualhosts")[0], [ @@ -373,20 +377,27 @@ define(["dojo/_base/xhr", formatter: function(item){ return item && item.virtualhosts? item.virtualhosts[0].type: "N/A"; } - }, - { name: "Connections", field: "_item", width: "10%", + }, + { name: "Connections", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: 0; + return isActiveVH(item)? item.virtualhosts[0].statistics.connectionCount: "N/A"; } }, - { name: "Queues", field: "_item", width: "10%", + { name: "Queues", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: 0; + return isActiveVH(item)? item.virtualhosts[0].statistics.queueCount: "N/A"; } }, - { name: "Exchanges", field: "_item", width: "10%", + { name: "Exchanges", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: 0; + return isActiveVH(item)? item.virtualhosts[0].statistics.exchangeCount: "N/A"; + } + }, + { + name: "Default", field: "_item", width: "6%", + formatter: function(item){ + var val = item && item.virtualhosts? item.virtualhosts[0].name: null; + return "<input type='radio' disabled='disabled' "+(val == that.brokerData.defaultVirtualHost ? "checked='checked'": "")+" />"; } } ], function(obj) { @@ -424,6 +435,7 @@ define(["dojo/_base/xhr", if (data.length == 1) { that.showVirtualHost(data[0], brokerObj); + that.vhostsGrid.grid.selection.clear(); } }); @@ -434,6 +446,7 @@ define(["dojo/_base/xhr", { var item = data[0]; that.controller.show("virtualhostnode", item.name, brokerObj, item.id); + that.vhostsGrid.grid.selection.clear(); } } ); @@ -457,6 +470,7 @@ define(["dojo/_base/xhr", var item = data[0]; util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name), "PUT", {desiredState: "ACTIVE"}); + that.vhostsGrid.grid.selection.clear(); } }); @@ -473,6 +487,7 @@ define(["dojo/_base/xhr", { util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name), "PUT", {desiredState: "STOPPED"}); + that.vhostsGrid.grid.selection.clear(); } } }); @@ -486,6 +501,7 @@ define(["dojo/_base/xhr", var host = item.virtualhosts[0]; util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name), "PUT", {desiredState: "ACTIVE"}); + that.vhostsGrid.grid.selection.clear(); } }); @@ -501,11 +517,12 @@ define(["dojo/_base/xhr", { util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name), "PUT", {desiredState: "STOPPED"}); + that.vhostsGrid.grid.selection.clear(); } } }); - - gridProperties.selectionMode="extended"; + gridProperties.selectionMode = "extended"; + gridProperties.plugins.indirectSelection = true; that.portsGrid = new UpdatableStore(that.brokerData.ports, query(".broker-ports")[0], diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js index efe6f4eeff..07c5c25171 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js @@ -123,7 +123,16 @@ define(["dojo/_base/xhr", name: "sessionTimeout" }); } + }, { + name: "compressResponses", + createWidget: function(plugin) { + return new dijit.form.CheckBox({ + required: false, + checked: plugin.compressResponses, + label: "Compress responses:", + name: "compressResponses"}); } + } ]; var data = this.managementHttpUpdater.pluginData; util.showSetAttributesDialog( @@ -143,6 +152,8 @@ define(["dojo/_base/xhr", this.sessionTimeout = query(".sessionTimeout", node)[0]; this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0]; this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0]; + this.compressResponses = query(".compressResponses", node)[0]; + } ManagementHttpUpdater.prototype.update = function(syncRequest) @@ -161,6 +172,7 @@ define(["dojo/_base/xhr", that.httpsBasicAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsBasicAuthenticationEnabled); that.httpsSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpsSaslAuthenticationEnabled); that.httpSaslAuthenticationEnabled.innerHTML = showBoolean(that.pluginData.httpSaslAuthenticationEnabled); + that.compressResponses.innerHTML = showBoolean(that.pluginData.compressResponses); that.sessionTimeout.innerHTML = that.pluginData.sessionTimeout; }); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html index e91120e43b..b12869981d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html @@ -40,6 +40,10 @@ <div class="formLabel-labelCell">Session timeout (s):</div> <div class="sessionTimeout"></div> </div> + <div class="clear"> + <div class="formLabel-labelCell">Compress content:</div> + <div class="compressResponses"></div> + </div> </div> <br/> <div class="dijitDialogPaneActionBar"> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html index 7cf789e520..88ca0b3807 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html @@ -19,15 +19,13 @@ <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter message store path'" /> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html index 9e240a83c4..60b8faef56 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html @@ -20,15 +20,13 @@ <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="editVirtualHost.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', disabled: true, title: 'Enter message store path'" /> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html index a132444268..2f0d72fe9a 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html @@ -20,15 +20,13 @@ <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="editVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter configuration store path'" /> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html index 622eb17b63..ec3ef79fa0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html @@ -20,15 +20,13 @@ --> <div> <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div> <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.jsonStorePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" name: 'storePath', placeHolder: 'path/to/store', - required: true, - missingMessage: 'Store path must be supplied', title: 'Enter store path'" /> </div> </div> diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java index 949ee4dac6..7e956698d1 100644 --- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java +++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java @@ -21,10 +21,18 @@ package org.apache.qpid.example; -import javax.jms.*; +import java.io.InputStream; +import java.util.Properties; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; import javax.naming.Context; import javax.naming.InitialContext; -import java.util.Properties; public class Hello @@ -42,9 +50,10 @@ public class Hello private void runTest() { - try { + try (InputStream resourceAsStream = this.getClass().getResourceAsStream("hello.properties")) + { Properties properties = new Properties(); - properties.load(this.getClass().getResourceAsStream("hello.properties")); + properties.load(resourceAsStream); Context context = new InitialContext(properties); ConnectionFactory connectionFactory = (ConnectionFactory) context.lookup("qpidConnectionfactory"); diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java index 9e865010f8..1192a2729a 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java @@ -42,10 +42,10 @@ public class AbstractRunner { Context context = null; - try + try(FileInputStream inStream = new FileInputStream(getJndiConfig())) { final Properties properties = new Properties(); - properties.load(new FileInputStream(getJndiConfig())); + properties.load(inStream); context = new InitialContext(properties); } catch (Exception e) @@ -71,4 +71,4 @@ public class AbstractRunner { return _cliOptions; } -}
\ No newline at end of file +} diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java index a4f4cab018..a4f4cab018 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java index 96daf64526..96daf64526 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java index 59396d46c0..59396d46c0 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java index b06ab0c735..b06ab0c735 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java index d599bdc5c4..d599bdc5c4 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java index a3c0430865..a3c0430865 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java index 2a108721b0..2a108721b0 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java index 5b5a60ac43..5b5a60ac43 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java index dcbff6518b..dcbff6518b 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java index 54bb9efa98..54bb9efa98 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java index 75d0941c57..75d0941c57 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java index 349ddb276e..349ddb276e 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java index 010eec4982..215536126e 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java +++ b/qpid/java/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java @@ -36,8 +36,8 @@ import org.apache.qpid.util.FileUtils; public class EndToEndTest extends QpidBrokerTestCase { private ControllerRunner _runner; - private static final String TEST_CONFIG = "qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json"; - private static final String JNDI_CONFIG_FILE = "qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties"; + private static final String TEST_CONFIG = "qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/endtoend.json"; + private static final String JNDI_CONFIG_FILE = "qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/perftests.systests.properties"; private static final String RUN1 = "run1"; public void testRunner() throws Exception diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json index 89123302b7..89123302b7 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json index 605e5cb585..605e5cb585 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json index a008dc40d8..a008dc40d8 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json index f94c4f0ae0..f94c4f0ae0 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json index 4abd7f4feb..4abd7f4feb 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json index b49603ef23..b49603ef23 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/endtoend.json index 1b7cc51265..1b7cc51265 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/endtoend.json diff --git a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/perftests.systests.properties index 149e632048..149e632048 100644 --- a/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties +++ b/qpid/java/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/perftests.systests.properties diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml index d59e373ed4..1225653650 100644 --- a/qpid/java/qpid-systests-parent/pom.xml +++ b/qpid/java/qpid-systests-parent/pom.xml @@ -74,20 +74,6 @@ </dependencies> <build> - <testSourceDirectory>src/main/java</testSourceDirectory> - - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java/</exclude> - </excludes> - </resource> - </resources> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 82fcadfcf9..0f558f3abe 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -848,7 +848,7 @@ public class QpidBrokerTestCase extends QpidTestCase * @param brokerPort broker port * @param virtualHostNodeName virtual host node name */ - protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName) + protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName, boolean withBlueprint) { String storeType = getTestProfileVirtualHostNodeType(); String storeDir = null; @@ -871,15 +871,24 @@ public class QpidBrokerTestCase extends QpidTestCase attributes.put(JsonVirtualHostNode.STORE_PATH, storeDir); } - final String blueprint = getTestProfileVirtualHostNodeBlueprint(); + if (withBlueprint) + { + final String blueprint = getTestProfileVirtualHostNodeBlueprint(); - attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, - blueprint)); + attributes.put(ConfiguredObject.CONTEXT, + Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, + blueprint)); + } int port = getPort(brokerPort); getBrokerConfiguration(port).addObjectConfiguration(VirtualHostNode.class, attributes); } + protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName) + { + createTestVirtualHostNode(brokerPort, virtualHostNodeName, true); + } + /** * Set a System property that is to be applied only to the external test * broker. diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java index 507c994076..4b747e869c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java @@ -85,62 +85,61 @@ public class SpawnedBrokerHolder implements BrokerHolder try { Process p = Runtime.getRuntime().exec(new String[] {"wmic", "process", "list"}); - BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())); - String line; - String headers = reader.readLine(); - int processIdOffset = headers.indexOf(" ProcessId") + 1; - int parentProcessIdOffset = headers.indexOf(" ParentProcessId") + 1; - String parentProcess = null; - Map<String,List<String>> parentProcessMap = new HashMap<String, List<String>>(); - - while ((line = reader.readLine()) != null) + try(BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()))) { - if(line.length() > processIdOffset) - { - String processIdStr = line.substring(processIdOffset); - processIdStr = processIdStr.substring(0, processIdStr.indexOf(' ')); - processIdStr = processIdStr.trim(); + String line; + String headers = reader.readLine(); + int processIdOffset = headers.indexOf(" ProcessId") + 1; + int parentProcessIdOffset = headers.indexOf(" ParentProcessId") + 1; + String parentProcess = null; + Map<String, List<String>> parentProcessMap = new HashMap<String, List<String>>(); - String parentProcessIdStr = line.substring(parentProcessIdOffset); - parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' ')); - parentProcessIdStr = parentProcessIdStr.trim(); - if(parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(parentProcessIdStr))) + while ((line = reader.readLine()) != null) + { + if (line.length() > processIdOffset) { - List<String> children = parentProcessMap.get(parentProcessIdStr); - if(children == null) + String processIdStr = line.substring(processIdOffset); + processIdStr = processIdStr.substring(0, processIdStr.indexOf(' ')); + processIdStr = processIdStr.trim(); + + String parentProcessIdStr = line.substring(parentProcessIdOffset); + parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' ')); + parentProcessIdStr = parentProcessIdStr.trim(); + if (parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals( + parentProcessIdStr))) { - children = new ArrayList<String>(); - parentProcessMap.put(parentProcessIdStr,children); + List<String> children = parentProcessMap.get(parentProcessIdStr); + if (children == null) + { + children = new ArrayList<String>(); + parentProcessMap.put(parentProcessIdStr, children); + } + children.add(processIdStr); + } + if (line.substring(0, _brokerCommand.length() + 7) + .toLowerCase() + .contains(_brokerCommand.toLowerCase())) + { + parentProcess = processIdStr; } - children.add(processIdStr); - } - if(line.substring(0,_brokerCommand.length()+7).toLowerCase().contains(_brokerCommand.toLowerCase())) - { - parentProcess = processIdStr; - } - } - if(parentProcess != null) - { - List<String> children = parentProcessMap.get(parentProcess); - if(children != null) + } + if (parentProcess != null) { - for(String child : children) + List<String> children = parentProcessMap.get(parentProcess); + if (children != null) { - p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", child, "/T", "/F"}); - reader = new BufferedReader(new InputStreamReader(p.getInputStream())); - while((line = reader.readLine()) != null) + for (String child : children) { + p = Runtime.getRuntime().exec(new String[]{"taskkill", "/PID", child, "/T", "/F"}); + consumeAllOutput(p); } } + p = Runtime.getRuntime().exec(new String[]{"taskkill", "/PID", parentProcess, "/T", "/F"}); + consumeAllOutput(p); } - p = Runtime.getRuntime().exec(new String[] {"taskkill", "/PID", parentProcess, "/T", "/F"}); - reader = new BufferedReader(new InputStreamReader(p.getInputStream())); - while((line = reader.readLine()) != null) - { - } - } + } } } catch (IOException e) @@ -149,6 +148,19 @@ public class SpawnedBrokerHolder implements BrokerHolder } } + private static void consumeAllOutput(Process p) throws IOException + { + try(InputStreamReader inputStreamReader = new InputStreamReader(p.getInputStream())) + { + try (BufferedReader reader = new BufferedReader(inputStreamReader)) + { + while (reader.readLine() != null) + { + } + } + } + } + @Override public void kill() { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java index 3025414e4a..3025414e4a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQTestConnection_0_10.java index c5dd523214..c5dd523214 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQTestConnection_0_10.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java index a13bf71d5e..a13bf71d5e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/AsynchMessageListenerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java index 881a37a970..881a37a970 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/HeartbeatTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/SessionCreateTest.java index 08ed2258b2..08ed2258b2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/SessionCreateTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java index bf147197e4..bf147197e4 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/SynchReceiveTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java index 99fcbc5dc0..99fcbc5dc0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java index 3331a8a665..3331a8a665 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java index 15ec0f9a4d..15ec0f9a4d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java index 787e727e66..787e727e66 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java index 3aabfa1c40..3aabfa1c40 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java index 69441d2be6..69441d2be6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java index 0f12c8c7e6..0f12c8c7e6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java index fefed5b4ab..fefed5b4ab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/session/QueueDeclareTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java index eb61e5a084..eb61e5a084 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java index e18f70b01d..e18f70b01d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java index daee2842fa..daee2842fa 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java index 8f20a59b60..8f20a59b60 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java index 7161cf1652..7161cf1652 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java index e483660f4c..e483660f4c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java index 9f5dd2ec39..9f5dd2ec39 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java index 42f3854d32..42f3854d32 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java index 9f145cd62c..9f145cd62c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java index 9e2bd28c43..9e2bd28c43 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java index 8555d9c751..8555d9c751 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AbstractTestLogging.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java index a0188626ee..a0188626ee 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java index 336dedb422..336dedb422 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BindingLoggingTest.java index 646c17d1f2..646c17d1f2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BindingLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java index 4952c4e10e..4952c4e10e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java index 047151684f..047151684f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java index 0be1f69948..0be1f69948 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java index f321b4e8e0..f321b4e8e0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java index dcc1837c5b..dcc1837c5b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java index edffa7c0c0..edffa7c0c0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java index 1c7b4c6be8..1c7b4c6be8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java index 29f74c5818..29f74c5818 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java index 25dd5fd2f8..25dd5fd2f8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java index 2a5f8b9b95..2a5f8b9b95 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java index 82b421a531..82b421a531 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java index c771e84f52..c771e84f52 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java index 21e3bfa055..21e3bfa055 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/LastValueQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java index dc30c02951..dc30c02951 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/LastValueQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java index cb8ced4ddb..cb8ced4ddb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java index c6b2c9e95c..c6b2c9e95c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java index cbf4e032db..cbf4e032db 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java index 7b2dd3239d..7b2dd3239d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java index 427508954d..427508954d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java index 64ba0156e6..64ba0156e6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java index dd57c1e3f7..dd57c1e3f7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java index fe86e9d41f..fe86e9d41f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java index 340ae4a1ae..340ae4a1ae 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java index e606df3f7d..e606df3f7d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java index 789ad420d8..789ad420d8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java index 505b3035d3..505b3035d3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java index 165fbed00c..165fbed00c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java index 0e8f3cb7d8..0e8f3cb7d8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java index 0d0c1257a2..0d0c1257a2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java index 1c32a3f671..1c32a3f671 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java index 04b8385e69..04b8385e69 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java index c2ea420e4b..c2ea420e4b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/PersistentStoreTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java index 7916f39488..7916f39488 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/SplitStoreTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java index dfc507d88a..dfc507d88a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java index 941c1d9499..941c1d9499 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java index ec67fc68b3..ec67fc68b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java index 1291380311..1291380311 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java index f6b56f64ce..f6b56f64ce 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java index 34b13dfaca..34b13dfaca 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java index 8c0a11b7cc..8c0a11b7cc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java index 3717c1594d..3717c1594d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java index 71f911627e..71f911627e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java index 4358b4b450..4358b4b450 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java index cb6eae013e..cb6eae013e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java index d0f133aa73..d0f133aa73 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java index 4ea071f3ac..4ea071f3ac 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java index 25b09f04c3..25b09f04c3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java index ff441169b3..ff441169b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java index 4140c9c12c..4140c9c12c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java index 3f944da8c7..3f944da8c7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java index 2467705903..2467705903 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java index c51457cdab..c51457cdab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java index 368bc90d3d..368bc90d3d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java index 74db3e7040..74db3e7040 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpAndHttpsTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java index 5b8d919d3e..5b8d919d3e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java index 319cc1c9da..319cc1c9da 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java index bae27b802c..bae27b802c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java new file mode 100644 index 0000000000..891b44cd25 --- /dev/null +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/CompressedResponsesRestTest.java @@ -0,0 +1,141 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.systest.rest; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.util.LinkedHashMap; +import java.util.zip.GZIPInputStream; + +import org.codehaus.jackson.JsonParseException; +import org.codehaus.jackson.map.JsonMappingException; +import org.codehaus.jackson.map.ObjectMapper; + +import org.apache.qpid.server.model.Plugin; +import org.apache.qpid.test.utils.TestBrokerConfiguration; + +public class CompressedResponsesRestTest extends QpidRestTestCase +{ + + private boolean _compress; + + @Override + public void setUp() throws Exception + { + } + + @Override + protected void customizeConfiguration() throws IOException + { + super.customizeConfiguration(); + getBrokerConfiguration().setObjectAttribute(Plugin.class, + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, + "compressResponses", + _compress); + } + + public void testCompressionOffAcceptOff() throws Exception + { + doCompressionTest(false, false); + } + + public void testCompressionOffAcceptOn() throws Exception + { + doCompressionTest(false, true); + } + + public void testCompressionOnAcceptOff() throws Exception + { + doCompressionTest(true, false); + } + + public void testCompressionOnAcceptOn() throws Exception + { + doCompressionTest(true, true); + + } + + private void doCompressionTest(final boolean allowCompression, + final boolean acceptCompressed) throws Exception + { + final boolean expectCompression = allowCompression && acceptCompressed; + _compress = allowCompression; + super.setUp(); + + HttpURLConnection conn = getRestTestHelper().openManagementConnection("/service/metadata", "GET"); + if(acceptCompressed) + { + conn.setRequestProperty("Accept-Encoding", "gzip"); + } + + conn.connect(); + + String contentEncoding = conn.getHeaderField("Content-Encoding"); + + if(expectCompression) + { + assertEquals("gzip", contentEncoding); + } + else + { + if(contentEncoding != null) + { + assertEquals("identity", contentEncoding); + } + } + + ByteArrayOutputStream contentBuffer = new ByteArrayOutputStream(); + + InputStream connectionInputStream = conn.getInputStream(); + byte[] buf = new byte[1024]; + int read; + while((read = connectionInputStream.read(buf))!= -1) + { + contentBuffer.write(buf,0,read); + } + + InputStream jsonStream; + + if(expectCompression) + { + jsonStream = new GZIPInputStream(new ByteArrayInputStream(contentBuffer.toByteArray())); + } + else + { + jsonStream = new ByteArrayInputStream(contentBuffer.toByteArray()); + } + + ObjectMapper mapper = new ObjectMapper(); + try + { + mapper.readValue(jsonStream, LinkedHashMap.class); + } + catch (JsonParseException | JsonMappingException e) + { + fail("Message was not in correct format"); + } + } + + +} diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java index 439e592a7e..439e592a7e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java index 51cb6dde1a..51cb6dde1a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java index 4f1c1ad7a7..4f1c1ad7a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java index eeb9511289..eeb9511289 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java index abafb7fcaf..abafb7fcaf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java index 4b881d1e9f..4b881d1e9f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java index 4d06c7b624..4d06c7b624 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogViewerTest.java index f2fb2581f7..f2fb2581f7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogViewerTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java index efa4776afd..efa4776afd 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java index 8b86163aa6..8b86163aa6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java index 6db204b9ca..6db204b9ca 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java index bd72391522..bd72391522 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java index baebc9a28e..baebc9a28e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java index 547b7b1b00..547b7b1b00 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java index daefc05e2a..daefc05e2a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java index 5d2e9de3fa..5d2e9de3fa 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java index a0902912ce..a0902912ce 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java index 5df8a4ed9a..5df8a4ed9a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java index 3e49f63cff..9569b90251 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java @@ -55,14 +55,33 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase public void testCreateAndDeleteVirtualHostNode() throws Exception { - String storeType = getTestProfileVirtualHostNodeType(); + String virtualhostNodeType = getTestProfileVirtualHostNodeType(); String nodeName = "virtualhostnode-" + getTestName(); File storePathAsFile = new File(getStoreLocation(nodeName)); - createAndDeleteVirtualHostNode(storeType, nodeName, storePathAsFile); + createAndDeleteVirtualHostNode(virtualhostNodeType, nodeName, storePathAsFile); assertFalse("Store should not exist after deletion", storePathAsFile.exists()); } + public void testCreateVirtualHostNodeWithDefaultStorePath() throws Exception + { + String virtualhostNodeType = getTestProfileVirtualHostNodeType(); + String nodeName = "virtualhostnode-" + getTestName(); + + createVirtualHostNode(nodeName, virtualhostNodeType); + + String restUrl = "virtualhostnode/" + nodeName; + Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(restUrl); + Asserts.assertVirtualHostNode(nodeName, virtualhostNode); + assertNull("Virtualhostnode should not automatically get a virtualhost child", + virtualhostNode.get("virtualhosts")); + + getRestTestHelper().submitRequest(restUrl, "DELETE", HttpServletResponse.SC_OK); + + List<Map<String, Object>> virtualHostNodes = getRestTestHelper().getJsonAsList(restUrl); + assertEquals("Host should be deleted", 0, virtualHostNodes.size()); + } + public void testRecoverVirtualHostNodeWithDesiredStateStopped() throws Exception { stopBroker(); @@ -149,7 +168,10 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase Map<String, Object> nodeData = new HashMap<String, Object>(); nodeData.put(VirtualHostNode.NAME, nodeName); nodeData.put(VirtualHostNode.TYPE, storeType); - nodeData.put(JsonVirtualHostNode.STORE_PATH, configStorePath); + if (configStorePath != null) + { + nodeData.put(JsonVirtualHostNode.STORE_PATH, configStorePath); + } getRestTestHelper().submitRequest("virtualhostnode/" + nodeName, "PUT", @@ -157,6 +179,11 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase HttpServletResponse.SC_CREATED); } + private void createVirtualHostNode(String nodeName, final String storeType) throws Exception + { + createVirtualHostNode(nodeName, null, storeType); + } + private String getStoreLocation(String hostName) { return new File(TMP_FOLDER, "store-" + hostName + "-" + System.currentTimeMillis()).getAbsolutePath(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java index 243b93e798..45cbee205d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.systest.rest; -import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.HashMap; @@ -33,18 +32,18 @@ import javax.jms.Session; import javax.servlet.http.HttpServletResponse; import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl; -import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.VirtualHost; -import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.queue.LastValueQueue; import org.apache.qpid.server.queue.PriorityQueue; import org.apache.qpid.server.queue.SortedQueue; import org.apache.qpid.server.virtualhost.AbstractVirtualHost; -import org.apache.qpid.util.FileUtils; +import org.apache.qpid.server.virtualhost.derby.DerbyVirtualHostImpl; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl; +import org.apache.qpid.test.utils.TestBrokerConfiguration; public class VirtualHostRestTest extends QpidRestTestCase { @@ -52,8 +51,19 @@ public class VirtualHostRestTest extends QpidRestTestCase public static final String VIRTUALHOST_QUEUES_ATTRIBUTE = "queues"; public static final String VIRTUALHOST_CONNECTIONS_ATTRIBUTE = "connections"; + public static final String EMPTY_VIRTUALHOSTNODE_NAME = "emptyVHN"; + private AMQConnection _connection; + @Override + protected void customizeConfiguration() throws IOException + { + super.customizeConfiguration(); + + TestBrokerConfiguration config = getBrokerConfiguration(); + createTestVirtualHostNode(0, EMPTY_VIRTUALHOSTNODE_NAME, false); + } + public void testGet() throws Exception { List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhost"); @@ -106,27 +116,30 @@ public class VirtualHostRestTest extends QpidRestTestCase Asserts.assertConnection(connections.get(0), _connection); } - public void testPutCreateVirtualHostUsingProfileNodeType() throws Exception + public void testPutCreateProvidedVirtualHost() throws Exception { String hostName = getTestName(); - String virtualhostNodeType = getTestProfileVirtualHostNodeType(); - String storeLocation = createVirtualHostNodeAndVirtualHost(hostName, virtualhostNodeType); - try - { - // make sure that the host is saved in the broker store - restartBroker(); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + hostName); - Asserts.assertVirtualHost(hostName, hostDetails); + createVirtualHost(hostName, ProvidedStoreVirtualHostImpl.VIRTUAL_HOST_TYPE); - assertNewVirtualHost(hostDetails); - } - finally + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName); + Asserts.assertVirtualHost(hostName, hostDetails); + + assertNewVirtualHost(hostDetails); + } + + public void testPutCreateVirtualHost() throws Exception + { + String hostName = getTestName(); + String vhnType = getTestProfileVirtualHostNodeType(); + if (JsonVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE.equals(vhnType)) { - if (storeLocation != null) - { - FileUtils.delete(new File(storeLocation), true); - } + vhnType = DerbyVirtualHostImpl.VIRTUAL_HOST_TYPE; } + createVirtualHost(hostName, vhnType); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName); + Asserts.assertVirtualHost(hostName, hostDetails); + + assertNewVirtualHost(hostDetails); } public void testDeleteHost() throws Exception @@ -562,34 +575,17 @@ public class VirtualHostRestTest extends QpidRestTestCase return getRestTestHelper().submitRequest("queue/test/test/" + queueName, "PUT", queueData); } - private String createVirtualHostNodeAndVirtualHost(String virtualHostName, - String virtualHostNodeType) throws Exception + private void createVirtualHost(final String virtualHostName, + final String virtualHostType) throws IOException { - String storePath = getStoreLocation(virtualHostName); - - Map<String, Object> nodeData = new HashMap<>(); - nodeData.put(VirtualHostNode.NAME, virtualHostName); - nodeData.put(VirtualHostNode.TYPE, virtualHostNodeType); - nodeData.put(JsonVirtualHostNode.STORE_PATH, storePath); - - getRestTestHelper().submitRequest("virtualhostnode/" + virtualHostName, "PUT", nodeData, HttpServletResponse.SC_CREATED); - Map<String, Object> virtualhostData = new HashMap<>(); virtualhostData.put(VirtualHost.NAME, virtualHostName); - virtualhostData.put(VirtualHost.TYPE, ProvidedStoreVirtualHostImpl.VIRTUAL_HOST_TYPE); + virtualhostData.put(VirtualHost.TYPE, virtualHostType); - getRestTestHelper().submitRequest("virtualhost/" + virtualHostName + "/" + virtualHostName, + getRestTestHelper().submitRequest("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + virtualHostName, "PUT", virtualhostData, HttpServletResponse.SC_CREATED); - - - return storePath; - } - - private String getStoreLocation(String hostName) - { - return new File(TMP_FOLDER, "store-" + hostName + "-" + System.currentTimeMillis()).getAbsolutePath(); } private void assertNewVirtualHost(Map<String, Object> hostDetails) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java index 8c4effd685..8c4effd685 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java index b0c66cb3af..b0c66cb3af 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java index 3ebfafb8da..3ebfafb8da 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java index 1b14e3b10e..1b14e3b10e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java index a123de2984..a123de2984 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java index b626b821c8..b626b821c8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java index d80c8e14b2..d80c8e14b2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java index 45123325e3..45123325e3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java index 4809962f24..4809962f24 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java index deb8e4f12b..deb8e4f12b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java index fa36d73283..fa36d73283 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java index f8bc051be7..f8bc051be7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java index d012b9abbb..d012b9abbb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java index 6b6b4a7b3c..6b6b4a7b3c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java index f30b8043ad..f30b8043ad 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java index b19809b8f2..b19809b8f2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java index c97343464c..c97343464c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java index bb1c0d3698..bb1c0d3698 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java index d79788f017..d79788f017 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java index d0968aefc7..d0968aefc7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java index 99afe0015d..99afe0015d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java index 14cadc2389..14cadc2389 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java index 2875e2c6b1..2875e2c6b1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSDestinationTest.java index 760884e654..760884e654 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSDestinationTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSReplyToTest.java index fe8180d6c6..fe8180d6c6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSReplyToTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/JMSReplyToTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java index dc1f690b1e..dc1f690b1e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java index 3bd2c4a44e..3bd2c4a44e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java index d945301bbe..d945301bbe 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/message/SelectorTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/LVQTest.java index 51566403b3..51566403b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/LVQTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java index b785326ef2..b785326ef2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java index 23efb656d2..23efb656d2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java index 602eb5137a..602eb5137a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java index 841d0ea4ba..841d0ea4ba 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java index 291e1697ca..291e1697ca 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/ClientAcknowledgeTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java index 23ea4ac258..23ea4ac258 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java index b545f610d1..b545f610d1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java index 599c8061a7..599c8061a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java index 8961574d1e..8961574d1e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index ace8324dab..ace8324dab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java index 1b9c9fcb17..1b9c9fcb17 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index 2d8847ea33..2d8847ea33 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java index 4b5922902d..4b5922902d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java index c7ff564beb..c7ff564beb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java index 3ef8524656..3ef8524656 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java index cc64dbb125..cc64dbb125 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java index d4081817ee..d4081817ee 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java index 48d290c986..48d290c986 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java index 0d81b66be0..0d81b66be0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java index 77df6c58d9..77df6c58d9 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java index 5e1e38106a..5e1e38106a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java index 370e44b3d5..370e44b3d5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/QueueSessionFactoryTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java index ce15d452ab..ce15d452ab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/TopicSessionFactoryTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java index 58f1bfe372..58f1bfe372 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java index 4a92728d82..4a92728d82 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java index bf1fbbf1a3..bf1fbbf1a3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java index 6ea1582bb8..6ea1582bb8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java index ed03e83292..ed03e83292 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java index 141de1e5a8..141de1e5a8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index 99dc5ff216..99dc5ff216 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java index 3ffa73b9b7..3ffa73b9b7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java index 41ab35f233..41ab35f233 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java index b43fe35a09..b43fe35a09 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java index df32bd7858..df32bd7858 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java index 5895d670a7..5895d670a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java index 957063b2e1..957063b2e1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java index c292c718bb..c292c718bb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java index 3f2d6f92ab..3f2d6f92ab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java index f8ab593c88..f8ab593c88 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java index cc95afafa2..cc95afafa2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index cc8bfb9433..cc8bfb9433 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java index a5b9ce8365..a5b9ce8365 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java index 5fbbc7f67f..5fbbc7f67f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java index c2ea3a5695..c2ea3a5695 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 4715831de6..4715831de6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java index 78c76602c5..78c76602c5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java index e37c6cf54b..e37c6cf54b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java index b84e03972d..b84e03972d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java index 98fe29f826..98fe29f826 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java index 92df1bd331..92df1bd331 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java index c5fa217aa9..c5fa217aa9 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java index 350781e970..350781e970 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java index 4d9242b8b3..4d9242b8b3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java index 83c2f1e58d..83c2f1e58d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/ConversationFactory.java index 3a9354d822..3a9354d822 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/ConversationFactory.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java index f6c481431a..f6c481431a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/QpidClientConnection.java index 0e0032da64..0e0032da64 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/utils/QpidClientConnection.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/transport/MaxFrameSizeTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java index 322b971487..322b971487 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/transport/MaxFrameSizeTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/qpid/java/systests/src/test/java/org/apache/qpid/util/ClasspathScanner.java index 151d1473ac..151d1473ac 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/util/ClasspathScanner.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java b/qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitor.java index d77731d09f..d77731d09f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitor.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitorTest.java index 89f707fbef..89f707fbef 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/util/LogMonitorTest.java diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En b/qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8En index c9734b1988..c9734b1988 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En +++ b/qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8En diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp b/qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8Jp index ae10752dab..ae10752dab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp +++ b/qpid/java/systests/src/test/resources/org/apache/qpid/test/unit/message/UTF8Jp diff --git a/qpid/java/systests/src/main/java/systests.log4j b/qpid/java/systests/src/test/resources/systests.log4j index 6d596d1d19..6d596d1d19 100644 --- a/qpid/java/systests/src/main/java/systests.log4j +++ b/qpid/java/systests/src/test/resources/systests.log4j diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes index 3d87da11c8..44014c9ec0 100755 --- a/qpid/java/test-profiles/CPPExcludes +++ b/qpid/java/test-profiles/CPPExcludes @@ -197,3 +197,5 @@ org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange // Tests queue message durability settings which are a Java Broker specific feature org.apache.qpid.server.queue.QueueMessageDurabilityTest#* +// QPID-4429 : C++ Broker does not enforce max frame size negotiation rules as per the spec +org.apache.qpid.transport.MaxFrameSizeTest#* diff --git a/qpid/java/test-profiles/JavaJsonExcludes b/qpid/java/test-profiles/JavaJsonExcludes index 1c4524987b..77b4e3d704 100644 --- a/qpid/java/test-profiles/JavaJsonExcludes +++ b/qpid/java/test-profiles/JavaJsonExcludes @@ -22,5 +22,5 @@ org.apache.qpid.server.store.berkeleydb.replication.* org.apache.qpid.server.store.SplitStoreTest#* org.apache.qpid.systest.rest.acl.VirtualHostACLTest#* org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode -org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType +org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateProvidedVirtualHost org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig diff --git a/qpid/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes index 3bfeba92b3..70056d6968 100644 --- a/qpid/java/test-profiles/JavaTransientExcludes +++ b/qpid/java/test-profiles/JavaTransientExcludes @@ -55,7 +55,6 @@ org.apache.qpid.systest.management.jmx.QueueManagementTest#testCopyMessageBetwee org.apache.qpid.test.unit.client.MaxDeliveryCountTest#testWhenBrokerIsRestartedAfterEnqeuingMessages -org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType org.apache.qpid.systest.rest.VirtualHostRestTest#testRecoverVirtualHostInDesiredStateStoppedWithDescription org.apache.qpid.systest.rest.VirtualHostRestTest#testMutateStateOfVirtualHostWithQueuesAndMessages diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java index c604b24408..bd6cfd4363 100644 --- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java +++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java @@ -21,21 +21,22 @@ package org.apache.qpid.tools; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQConnectionFactory; -import org.apache.qpid.jms.FailoverPolicy; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import java.util.Properties; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.List; -import java.util.LinkedList; -import java.io.IOException; -import java.io.File; -import java.io.FileInputStream; + +import org.apache.qpid.client.AMQConnectionFactory; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.jms.FailoverPolicy; public class JNDICheck { @@ -79,9 +80,9 @@ public class JNDICheck // Load JNDI properties Properties properties = new Properties(); - try + try(FileInputStream propertiesStream = new FileInputStream(new File(propertyFile))) { - properties.load(new FileInputStream(new File(propertyFile))); + properties.load(propertiesStream); } catch (IOException e) { |