From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 14:42:12 +0000 Subject: Merged out from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68 --- java/test-profiles/08StandaloneExcludes | 39 ------------- java/test-profiles/CPPExcludes | 35 +++++++++--- java/test-profiles/CPPTransientExcludes | 3 + java/test-profiles/Excludes | 10 +--- java/test-profiles/Java010Excludes | 55 +++++++++++-------- java/test-profiles/JavaBDBExcludes | 22 ++++++++ java/test-profiles/JavaDerbyExcludes | 21 +++++++ java/test-profiles/JavaExcludes | 47 +++++++--------- java/test-profiles/JavaInVMExcludes | 43 --------------- java/test-profiles/JavaPre010Excludes | 57 +++++++++++++++++++ java/test-profiles/JavaStandaloneExcludes | 55 ------------------- java/test-profiles/JavaTransientExcludes | 4 ++ java/test-profiles/clean-dir | 25 --------- java/test-profiles/cpp.async.testprofile | 2 + java/test-profiles/cpp.ssl.excludes | 7 +++ java/test-profiles/cpp.ssl.testprofile | 4 +- java/test-profiles/cpp.testprofile | 5 +- java/test-profiles/default.testprofile | 61 --------------------- java/test-profiles/java-bdb-spawn.0-10.testprofile | 31 +++++++++++ .../test-profiles/java-bdb-spawn.0-9-1.testprofile | 36 ++++++++++++ java/test-profiles/java-bdb.0-10.testprofile | 32 +++++++++++ java/test-profiles/java-bdb.0-9-1.testprofile | 37 +++++++++++++ java/test-profiles/java-dby-spawn.0-10.testprofile | 29 ++++++++++ .../test-profiles/java-dby-spawn.0-9-1.testprofile | 35 ++++++++++++ java/test-profiles/java-dby.0-10.testprofile | 30 ++++++++++ java/test-profiles/java-dby.0-9-1.testprofile | 36 ++++++++++++ java/test-profiles/java-derby.0.10.testprofile | 29 ---------- java/test-profiles/java-derby.testprofile | 33 ----------- java/test-profiles/java-mms-spawn.0-10.testprofile | 29 ++++++++++ .../test-profiles/java-mms-spawn.0-9-1.testprofile | 30 ++++++++++ java/test-profiles/java-mms.0-10.testprofile | 27 +++++++++ java/test-profiles/java-mms.0-9-1.testprofile | 31 +++++++++++ java/test-profiles/java.0.10.testprofile | 26 --------- java/test-profiles/java.testprofile | 28 ---------- java/test-profiles/log4j-test.xml | 4 -- .../python_tests/Java010PythonExcludes | 22 ++++++++ java/test-profiles/test-provider.properties | 4 -- .../test-profiles/test_resources/ssl/certstore.jks | Bin 591 -> 0 bytes .../test_resources/ssl/java_broker.crt | 15 +++++ .../test_resources/ssl/java_broker.req | 10 ++++ .../test_resources/ssl/java_broker_keystore.jks | Bin 0 -> 2475 bytes .../test_resources/ssl/java_client_keystore.jks | Bin 0 -> 4296 bytes .../test_resources/ssl/java_client_truststore.jks | Bin 0 -> 591 bytes java/test-profiles/test_resources/ssl/keystore.jks | Bin 4296 -> 0 bytes java/test-profiles/testprofile.defaults | 59 ++++++++++++++++++++ 45 files changed, 691 insertions(+), 417 deletions(-) delete mode 100644 java/test-profiles/08StandaloneExcludes create mode 100644 java/test-profiles/JavaBDBExcludes create mode 100644 java/test-profiles/JavaDerbyExcludes delete mode 100644 java/test-profiles/JavaInVMExcludes create mode 100644 java/test-profiles/JavaPre010Excludes delete mode 100644 java/test-profiles/JavaStandaloneExcludes delete mode 100755 java/test-profiles/clean-dir delete mode 100644 java/test-profiles/default.testprofile create mode 100644 java/test-profiles/java-bdb-spawn.0-10.testprofile create mode 100644 java/test-profiles/java-bdb-spawn.0-9-1.testprofile create mode 100644 java/test-profiles/java-bdb.0-10.testprofile create mode 100644 java/test-profiles/java-bdb.0-9-1.testprofile create mode 100644 java/test-profiles/java-dby-spawn.0-10.testprofile create mode 100644 java/test-profiles/java-dby-spawn.0-9-1.testprofile create mode 100644 java/test-profiles/java-dby.0-10.testprofile create mode 100644 java/test-profiles/java-dby.0-9-1.testprofile delete mode 100644 java/test-profiles/java-derby.0.10.testprofile delete mode 100644 java/test-profiles/java-derby.testprofile create mode 100644 java/test-profiles/java-mms-spawn.0-10.testprofile create mode 100644 java/test-profiles/java-mms-spawn.0-9-1.testprofile create mode 100644 java/test-profiles/java-mms.0-10.testprofile create mode 100644 java/test-profiles/java-mms.0-9-1.testprofile delete mode 100644 java/test-profiles/java.0.10.testprofile delete mode 100644 java/test-profiles/java.testprofile create mode 100644 java/test-profiles/python_tests/Java010PythonExcludes delete mode 100644 java/test-profiles/test_resources/ssl/certstore.jks create mode 100644 java/test-profiles/test_resources/ssl/java_broker.crt create mode 100644 java/test-profiles/test_resources/ssl/java_broker.req create mode 100644 java/test-profiles/test_resources/ssl/java_broker_keystore.jks create mode 100644 java/test-profiles/test_resources/ssl/java_client_keystore.jks create mode 100644 java/test-profiles/test_resources/ssl/java_client_truststore.jks delete mode 100644 java/test-profiles/test_resources/ssl/keystore.jks create mode 100644 java/test-profiles/testprofile.defaults (limited to 'java/test-profiles') diff --git a/java/test-profiles/08StandaloneExcludes b/java/test-profiles/08StandaloneExcludes deleted file mode 100644 index b482a14c6d..0000000000 --- a/java/test-profiles/08StandaloneExcludes +++ /dev/null @@ -1,39 +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. -// - -//====================================================================== -//Exclude the following from brokers defaulting to the 0-8 protocol -//====================================================================== - -// This test requires a broker capable of 0-8/9 and 0-10 -org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend - -// QPID-2478 test fails when run against broker using 0-8/9 -org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange - -// The new addressing based sytanx is not supported for AMQP 0-8/0-9 versions -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#* -org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy -org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy - -// Those tests are written against the 0.10 path -org.apache.qpid.test.unit.message.UTF8Test#* -org.apache.qpid.client.MessageListenerTest#testSynchronousReceiveNoWait - -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnsupportedSASLMechanism diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes index e89b09cca2..39b4d542db 100755 --- a/java/test-profiles/CPPExcludes +++ b/java/test-profiles/CPPExcludes @@ -17,11 +17,17 @@ // under the License. // +// QPID-3391: the C++ broker does not currently validate the exchange creation arguments +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithNonsenseArgs + +//This test requires SSL, but SSL is only enabled for the C++ broker in the cpp.ssl test profile +//which runs *all* the tests with SSL, so this one can be excluded safely enough +org.apache.qpid.test.unit.client.AMQSSLConnectionTest#* + org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* org.apache.qpid.client.ResetMessageListenerTest#* // This test is not finished -org.apache.qpid.test.testcases.TTLTest#* org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover // Those tests are testing 0.8 specific semantics @@ -58,9 +64,6 @@ org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges // 0-10 c++ broker in cpp.testprofile is started with no auth so won't pass this test org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection -// c++ broker doesn't do selectors, so this will fail -org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue - // InVM Broker tests org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* @@ -136,14 +139,10 @@ org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* // These are recent test additions that are failing with the c++ broker // Temporarily disabling until properly investigated. -org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#* org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#* org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#* -// Temporarily adding the following until the issues are sorted out. -org.apache.qpid.test.unit.client.AMQConnectionTest#testHeartBeat - //Excluded due to QPID-1447 : CPP broker does not have SlowConsumer Disconnection org.apache.qpid.systest.GlobalQueuesTest#* org.apache.qpid.systest.GlobalTopicsTest#* @@ -165,6 +164,26 @@ org.apache.qpid.server.security.firewall.FirewallConfigTest#* org.apache.qpid.server.security.firewall.FirewallConfigurationTest#* org.apache.qpid.server.plugins.PluginTest#* +// Transacion timeouts not implemented in CPP broker +org.apache.qpid.test.unit.transacted.TransactionTimeoutDisabledTest#* +org.apache.qpid.test.unit.transacted.TransactionTimeoutConfigurationTest#* +org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#* + // Java broker only org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#* org.apache.qpid.server.management.AMQUserManagementMBeanTest#* + +// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. +org.apache.qpid.server.failover.FailoverMethodTest#* + +//QPID-3468: exclude QueueBrowser related failover tests +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated diff --git a/java/test-profiles/CPPTransientExcludes b/java/test-profiles/CPPTransientExcludes index 47f24db19c..a214cf5b5c 100644 --- a/java/test-profiles/CPPTransientExcludes +++ b/java/test-profiles/CPPTransientExcludes @@ -27,3 +27,6 @@ org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash org.apache.qpid.test.unit.xa.TopicTest#testRecover org.apache.qpid.test.unit.xa.QueueTest#testRecover org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover + +// test requires a persistent store +org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod diff --git a/java/test-profiles/Excludes b/java/test-profiles/Excludes index ff6993fa0b..b1edd07f87 100644 --- a/java/test-profiles/Excludes +++ b/java/test-profiles/Excludes @@ -17,13 +17,6 @@ // under the License. // -org.apache.qpid.client.MultipleJCAProviderRegistrationTest#test -// QPID-1715, QPID-1715 : Client Error Handling on close is still broken -org.apache.qpid.server.queue.QueueCreateTest#testCreatePriorityString -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskValidNoSize -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalid -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalidSize - // // QPID-2031 : Broker is not cleanly shutdown by QpidTestCase // @@ -33,7 +26,7 @@ org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownStopped org.apache.qpid.server.logging.VirtualHostLoggingTest#testVirtualhostClosure org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose -// QPID-XXX : Test fails to start external broker due to Derby Exception. +// QPID-3424 : Test fails to start external broker due to Derby Exception. org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#* // QPID-1816 : Client Ack has not been addressed @@ -51,3 +44,4 @@ org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#* // QPID-2418 : The queue backing the dur sub is not currently deleted at subscription change, so the test will fail. org.apache.qpid.test.unit.ct.DurableSubscriberTest#testResubscribeWithChangedSelectorAndRestart +org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain diff --git a/java/test-profiles/Java010Excludes b/java/test-profiles/Java010Excludes index 3486d5c70c..e7718b982d 100755 --- a/java/test-profiles/Java010Excludes +++ b/java/test-profiles/Java010Excludes @@ -37,9 +37,6 @@ org.apache.qpid.test.client.FlowControlTest#* // 0-10 protocol doesn't support message bouncing org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* -// QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on transient queues. Also it requries a persistent store impl. for Apache -org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#* - // 0-10 and 0-9 connections dont generate the exact same logging due to protocol differences org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartsFlowStopped org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartConsumerFlowStarted @@ -47,35 +44,49 @@ org.apache.qpid.server.logging.SubscriptionLoggingTest#testSubscriptionSuspend // 0-10 Broker does not have a JMX connection MBean org.apache.qpid.management.jmx.ManagementActorLoggingTest#testConnectionCloseViaManagement - -// 0-10 has different ideas about clientid and ownership of queues -org.apache.qpid.server.queue.ModelTest#* +org.apache.qpid.management.jmx.MessageConnectionStatisticsTest#* // 0-10 is not supported by the MethodRegistry org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#* -// QPID-2084 : this test needs more work for 0-10 -org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#* - //QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Java Broker (not in CPP Broker) org.apache.qpid.server.queue.ProducerFlowControlTest#* //QPID-1950 : Commit to test this failure. This is a MINA only failure so it cannot be tested when using 010. org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* -//QPID-2471 : Issues with 0-10 recovery -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverInAutoAckListener - -// Temporarily disabling until properly investigated. -org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#* - -//rollback with subscriptions does not work in 0-10 yet +//QPID-1864: rollback with subscriptions does not work in 0-10 yet org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener -//Temporarily adding the following until the issues are sorted out. -//Should probably raise JIRAs for them. -org.apache.qpid.transport.network.mina.MINANetworkDriverTest#* -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchange +// This test uses 0-8 channel frames +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* + +//QPID-3422: test fails because ring queue is not implemented on java broker org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode + +// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. +org.apache.qpid.server.failover.FailoverMethodTest#* + +// QPID-3392: the Java broker does not yet implement exchange creation arguments +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithArgs +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testSessionCreateTopicWithExchangeArgs + +// QPID-1935: the following tests are failing on 0.10 profiles +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser + +// QPID-3432: These tests test the behaviour of 0-8..-0-9-1 specific system property (amqj.default_syncwrite_timeout) +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* + +//QPID-3468: exclude QueueBrowser related failover tests +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated diff --git a/java/test-profiles/JavaBDBExcludes b/java/test-profiles/JavaBDBExcludes new file mode 100644 index 0000000000..3fac01cb6d --- /dev/null +++ b/java/test-profiles/JavaBDBExcludes @@ -0,0 +1,22 @@ +// +// 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. +// + +//This test is subclassed within the bdbstore module to enable it to run and +//also add some bdb-specific tests. It is excluded to prevent running twice. +org.apache.qpid.server.store.MessageStoreTest#* diff --git a/java/test-profiles/JavaDerbyExcludes b/java/test-profiles/JavaDerbyExcludes new file mode 100644 index 0000000000..3caa360d48 --- /dev/null +++ b/java/test-profiles/JavaDerbyExcludes @@ -0,0 +1,21 @@ +// +// 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. +// + +org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* +org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* diff --git a/java/test-profiles/JavaExcludes b/java/test-profiles/JavaExcludes index c38a250abc..8de36cbd9a 100644 --- a/java/test-profiles/JavaExcludes +++ b/java/test-profiles/JavaExcludes @@ -17,38 +17,29 @@ // under the License. // -// Those tests are not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* - -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover - -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - // QPID-1823: this takes ages to run org.apache.qpid.client.SessionCreateTest#* -// related to QPID-2471. Temporarily disabling these tests until I figure out why they are failing with the Java broker. -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgs -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier -org.apache.qpid.test.unit.ack.RecoverTest#testAcknowledgePerConsumer -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverResendsMsgs -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverResendsMsgsAckOnEarlier -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testAcknowledgePerConsumer +//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker +org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy +org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy -// related to QPID-2471. These are new test cases and fail with the Java broker. -org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithAsyncConsumer -org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithSyncConsumer -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testOderingWithAsyncConsumer -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testOderingWithSyncConsumer +/////////////////////////////////////////////////////// +//Moved from JavaStandaloneExcludes when it was removed +/////////////////////////////////////////////////////// -org.apache.qpid.test.client.queue.LVQTest#* +// QPID-3426: The following test is broken. +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover -// Session resume is not supported in the Java client -org.apache.qpid.transport.ConnectionTest#testResumeNonemptyReplayBuffer +// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM +org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* -//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker -org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy -org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy +//QPID-1818, QPID-1821 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +//XA functionality is not fully implemented yet +org.apache.qpid.jms.xa.XAResourceTest#* + +//The Java broker doesnt support client auth +org.apache.qpid.client.ssl.SSLTest#testMultipleCertsInSingleStore diff --git a/java/test-profiles/JavaInVMExcludes b/java/test-profiles/JavaInVMExcludes deleted file mode 100644 index 7e7da4302e..0000000000 --- a/java/test-profiles/JavaInVMExcludes +++ /dev/null @@ -1,43 +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. -// - -//====================================================================== -//Exclude the following tests when running the InVM default test profile -//====================================================================== - -// The FirewallPlugin only operates for TCP connections, the tests NO-OP when run InVM -org.apache.qpid.server.security.firewall.FirewallConfigTest#* - -// This test requires a broker capable of 0-8/9 and 0-10 -org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend - -// QPID-2478 test fails when run against broker using 0-8/9 -org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange - -// related to QPID-2471. Temporarily disabling these tests until I figure out why they are failing with the Java broker. -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgs -org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier -org.apache.qpid.test.unit.ack.RecoverTest#testAcknowledgePerConsumer - -// related to QPID-2471. These are new test cases and fail with the Java broker. -org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithAsyncConsumer -org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithSyncConsumer - -//The VM broker does not export the logging management JMX MBean -org.apache.qpid.server.security.acl.ExternalAdminACLTest#* diff --git a/java/test-profiles/JavaPre010Excludes b/java/test-profiles/JavaPre010Excludes new file mode 100644 index 0000000000..68feaf1e2b --- /dev/null +++ b/java/test-profiles/JavaPre010Excludes @@ -0,0 +1,57 @@ +// +// 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. +// + +//====================================================================== +//Exclude the following from brokers using the 0-8/0-9/0-9-1 protocols +//====================================================================== + +// This test requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently +org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend + +// QPID-2478 test fails when run against broker using 0-8/9 +org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange + +// The new addressing based syntax is not supported for AMQP 0-8/0-9 versions +org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#* +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#* +org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy +org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy +org.apache.qpid.test.unit.message.JMSPropertiesTest#testApplicationProperties + +// Those tests are written against the 0.10 path +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.client.MessageListenerTest#testSynchronousReceiveNoWait + +// Tests 0.10 client feature +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnsupportedSASLMechanism + +// uses AMQP 0-10 related properties +org.apache.qpid.test.unit.message.JMSPropertiesTest#testQpidExtensionProperties + +// LVQ tests use new address syntax and can not be run on 0.9.1 profiles +org.apache.qpid.test.client.queue.LVQTest#* + +// Verification of unique client id is 0-10 specific +org.apache.qpid.test.unit.client.connection.ConnectionTest#testClientIDVerificationForSameUser +org.apache.qpid.test.unit.client.connection.ConnectionTest#testClientIDVerificationForDifferentUsers + +// Under AMQP 0-8..0-9-1 temporary queues are deleted on consumer close, rather than connection close +// and for this reason this test would fail. +org.apache.qpid.test.unit.client.temporaryqueue.TemporaryQueueTest#testTemporaryQueueReused + diff --git a/java/test-profiles/JavaStandaloneExcludes b/java/test-profiles/JavaStandaloneExcludes deleted file mode 100644 index d208a20d15..0000000000 --- a/java/test-profiles/JavaStandaloneExcludes +++ /dev/null @@ -1,55 +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. -// - -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover - -// Those tests require failover support -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser -org.apache.qpid.test.testcases.FailoverTest#* -org.apache.qpid.test.client.failover.FailoverTest#* - -// InVM Broker tests awaiting resolution of QPID-1103 -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* - -// This test currently does not pick up the runtime location of the nonVm queueBacking store. -org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* - -// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM -org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* - -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - -// This test requires the standard configuration file for validation. -// Excluding here does not reduce test coverage. -org.apache.qpid.server.configuration.ServerConfigurationFileTest#* - diff --git a/java/test-profiles/JavaTransientExcludes b/java/test-profiles/JavaTransientExcludes index 2ea46795d9..67190a6fcc 100644 --- a/java/test-profiles/JavaTransientExcludes +++ b/java/test-profiles/JavaTransientExcludes @@ -19,6 +19,7 @@ //These tests require a persistent store org.apache.qpid.server.store.PersistentStoreTest#* +org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod org.apache.qpid.test.unit.ct.DurableSubscriberTest#* @@ -30,3 +31,6 @@ org.apache.qpid.server.store.MessageStoreTest#testQueuePersistence org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval + +org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* +org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* diff --git a/java/test-profiles/clean-dir b/java/test-profiles/clean-dir deleted file mode 100755 index 4d6141b4ab..0000000000 --- a/java/test-profiles/clean-dir +++ /dev/null @@ -1,25 +0,0 @@ - -#!/bin/bash -# -# -# 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. -# -# - - -rm -rf $@; mkdir $@ diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index c3d47f0ce6..5357e87687 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -19,3 +19,5 @@ include=cpp profile.excludes=CPPPrefetchExcludes broker.modules=--load-module ${broker.module.store} +broker.persistent=true + diff --git a/java/test-profiles/cpp.ssl.excludes b/java/test-profiles/cpp.ssl.excludes index 4d499c57b9..14c8ac2fe3 100644 --- a/java/test-profiles/cpp.ssl.excludes +++ b/java/test-profiles/cpp.ssl.excludes @@ -18,3 +18,10 @@ // #org.apache.qpid.test.client.failover.FailoverTest#* + +//This test does not supply a client keystore, therefore it cant login to the C++ broker +//in this test profile as it demands client certificate authentication +org.apache.qpid.client.ssl.SSLTest#testCreateSSLConnectionUsingConnectionURLParamsTrustStoreOnly + +//QPID-3431: excluding because this takes 30+ mins to run on the C++ SSL profile for some reason +org.apache.qpid.client.SessionCreateTest#testSessionCreationLimit diff --git a/java/test-profiles/cpp.ssl.testprofile b/java/test-profiles/cpp.ssl.testprofile index bf71384835..b3bb5e22f7 100644 --- a/java/test-profiles/cpp.ssl.testprofile +++ b/java/test-profiles/cpp.ssl.testprofile @@ -23,7 +23,7 @@ broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.loca profile.use_ssl=true broker.ready= Listening for SSL connections -javax.net.ssl.keyStore=${test.profiles}/test_resources/ssl/keystore.jks +javax.net.ssl.keyStore=${test.profiles}/test_resources/ssl/java_client_keystore.jks javax.net.ssl.keyStorePassword=password -javax.net.ssl.trustStore=${test.profiles}/test_resources/ssl/certstore.jks +javax.net.ssl.trustStore=${test.profiles}/test_resources/ssl/java_client_truststore.jks javax.net.ssl.trustStorePassword=password diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index 694e22f48c..7cc7fdc821 100644 --- a/java/test-profiles/cpp.testprofile +++ b/java/test-profiles/cpp.testprofile @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -broker.version=0-10 +broker.version=v0_10 broker.language=cpp broker.dir=${project.root}/../cpp/src @@ -32,7 +32,8 @@ broker.stopped=Exception constructed broker.modules= broker.args= -broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} +broker.type=spawned +broker.command=${broker.executable} -p @PORT --data-dir ${project.root}/build/work/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} profile.excludes=CPPPrefetchExcludes CPPTransientExcludes test.excludes=Excludes CPPExcludes ${profile}.excludes ${profile.excludes} cpp.excludes diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile deleted file mode 100644 index df8148f787..0000000000 --- a/java/test-profiles/default.testprofile +++ /dev/null @@ -1,61 +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. -# -java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory -java.naming.provider.url=${test.profiles}/test-provider.properties - -broker.version=0-8 -broker=vm -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -broker.ready=Listening on TCP port -broker.start=${test.profiles}/start-broker -broker.kill=${test.profiles}/kill-broker -broker.config=${project.root}/build/etc/config-systests.xml -messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore - -max_prefetch=1000 -qpid.dest_syntax=BURL - -log=debug -amqj.logging.level=${log} -amqj.server.logging.level=${log} -amqj.protocol.logging.level=${log} -root.logging.level=warn -log4j.configuration=file:///${test.profiles}/log4j-test.xml -log4j.debug=false - -# Note test-provider.properties also has variables of same name. -# Keep in sync -test.port=15672 -test.mport=18999 -#Note : Management will start open second port on: mport + 100 : 19099 -test.port.ssl=15671 -test.port.alt=25672 -test.port.alt.ssl=25671 - -test.exclude=true -profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes -test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes} -test.fork=no -test.mem=512M -test=*Test -haltonfailure=no -haltonerror=no -exclude.modules=none - -profile.clustered=false diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/java/test-profiles/java-bdb-spawn.0-10.testprofile new file mode 100644 index 0000000000..cba348b67f --- /dev/null +++ b/java/test-profiles/java-bdb-spawn.0-10.testprofile @@ -0,0 +1,31 @@ +# +# 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. +# + +broker.language=java +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.version=v0_10 + diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile new file mode 100644 index 0000000000..b04fea21b6 --- /dev/null +++ b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile @@ -0,0 +1,36 @@ +# +# 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. +# + +broker.language=java +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +broker.version=v0_9_1 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/java/test-profiles/java-bdb.0-10.testprofile new file mode 100644 index 0000000000..3ef93a68cb --- /dev/null +++ b/java/test-profiles/java-bdb.0-10.testprofile @@ -0,0 +1,32 @@ +# +# 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. +# + +broker.language=java +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.version=v0_10 + diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/java/test-profiles/java-bdb.0-9-1.testprofile new file mode 100644 index 0000000000..101d38f4b9 --- /dev/null +++ b/java/test-profiles/java-bdb.0-9-1.testprofile @@ -0,0 +1,37 @@ +# +# 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. +# + +broker.language=java +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +broker.version=v0_9_1 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/java/test-profiles/java-dby-spawn.0-10.testprofile new file mode 100644 index 0000000000..5bd6f330d5 --- /dev/null +++ b/java/test-profiles/java-dby-spawn.0-10.testprofile @@ -0,0 +1,29 @@ +# +# 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. +# +broker.language=java +broker.version=v0_10 +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-derby.xml +messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes +broker.clean.between.tests=true +broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/java/test-profiles/java-dby-spawn.0-9-1.testprofile new file mode 100644 index 0000000000..e7212d30f8 --- /dev/null +++ b/java/test-profiles/java-dby-spawn.0-9-1.testprofile @@ -0,0 +1,35 @@ +# +# 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. +# +broker.version=v0_9_1 +broker.language=java +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-derby.xml +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes +broker.clean.between.tests=true +broker.persistent=true +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-dby.0-10.testprofile b/java/test-profiles/java-dby.0-10.testprofile new file mode 100644 index 0000000000..9c23d18f45 --- /dev/null +++ b/java/test-profiles/java-dby.0-10.testprofile @@ -0,0 +1,30 @@ +# +# 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. +# +broker.language=java +broker.version=v0_10 +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-derby.xml +messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes +broker.clean.between.tests=true +broker.persistent=true diff --git a/java/test-profiles/java-dby.0-9-1.testprofile b/java/test-profiles/java-dby.0-9-1.testprofile new file mode 100644 index 0000000000..83f43d8dbf --- /dev/null +++ b/java/test-profiles/java-dby.0-9-1.testprofile @@ -0,0 +1,36 @@ +# +# 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. +# +broker.version=v0_9_1 +broker.language=java +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=build/etc/config-systests-derby.xml +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore +profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes +broker.clean.between.tests=true +broker.persistent=true +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + diff --git a/java/test-profiles/java-derby.0.10.testprofile b/java/test-profiles/java-derby.0.10.testprofile deleted file mode 100644 index ca9115d30d..0000000000 --- a/java/test-profiles/java-derby.0.10.testprofile +++ /dev/null @@ -1,29 +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. -# -broker.language=java -broker.version=0-10 -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=${project.root}/build/etc/config-systests-derby.xml -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes -broker.clean.between.tests=true -broker.persistent=true diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile deleted file mode 100644 index d22e35f07e..0000000000 --- a/java/test-profiles/java-derby.testprofile +++ /dev/null @@ -1,33 +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. -# -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=${project.root}/build/etc/config-systests-derby.xml -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes -broker.clean.between.tests=true -broker.persistent=true -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 - diff --git a/java/test-profiles/java-mms-spawn.0-10.testprofile b/java/test-profiles/java-mms-spawn.0-10.testprofile new file mode 100644 index 0000000000..5e5d2e8a6b --- /dev/null +++ b/java/test-profiles/java-mms-spawn.0-10.testprofile @@ -0,0 +1,29 @@ +# +# 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. +# +broker.version=v0_10 +broker.language=java +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-10 +profile.excludes=JavaTransientExcludes Java010Excludes diff --git a/java/test-profiles/java-mms-spawn.0-9-1.testprofile b/java/test-profiles/java-mms-spawn.0-9-1.testprofile new file mode 100644 index 0000000000..05b1f89452 --- /dev/null +++ b/java/test-profiles/java-mms-spawn.0-9-1.testprofile @@ -0,0 +1,30 @@ +# +# 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. +# +broker.version=v0_9_1 +broker.language=java +broker.type=spawned +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 +profile.excludes=JavaTransientExcludes JavaPre010Excludes diff --git a/java/test-profiles/java-mms.0-10.testprofile b/java/test-profiles/java-mms.0-10.testprofile new file mode 100644 index 0000000000..209d384422 --- /dev/null +++ b/java/test-profiles/java-mms.0-10.testprofile @@ -0,0 +1,27 @@ +# +# 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. +# +broker.language=java +broker.version=v0_10 +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception + +profile.excludes=JavaTransientExcludes Java010Excludes diff --git a/java/test-profiles/java-mms.0-9-1.testprofile b/java/test-profiles/java-mms.0-9-1.testprofile new file mode 100644 index 0000000000..37efa097bb --- /dev/null +++ b/java/test-profiles/java-mms.0-9-1.testprofile @@ -0,0 +1,31 @@ +# +# 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. +# +broker.language=java +broker.version=v0_9_1 +broker.type=internal +#broker.command only used for the second broker during failover tests in this profile +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.ready=BRK-1004 +broker.stopped=Exception +broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 +profile.excludes=JavaTransientExcludes JavaPre010Excludes diff --git a/java/test-profiles/java.0.10.testprofile b/java/test-profiles/java.0.10.testprofile deleted file mode 100644 index fa87b22e92..0000000000 --- a/java/test-profiles/java.0.10.testprofile +++ /dev/null @@ -1,26 +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. -# -broker.language=java -broker.version=0-10 -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -broker.ready=BRK-1004 -broker.stopped=Exception - -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes Java010Excludes diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile deleted file mode 100644 index c8c776d3e1..0000000000 --- a/java/test-profiles/java.testprofile +++ /dev/null @@ -1,28 +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. -# -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -broker.ready=BRK-1004 -broker.stopped=Exception -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes diff --git a/java/test-profiles/log4j-test.xml b/java/test-profiles/log4j-test.xml index 9adfd68202..062acaaac9 100644 --- a/java/test-profiles/log4j-test.xml +++ b/java/test-profiles/log4j-test.xml @@ -59,10 +59,6 @@ - - - - diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes new file mode 100644 index 0000000000..31d2a8affc --- /dev/null +++ b/java/test-profiles/python_tests/Java010PythonExcludes @@ -0,0 +1,22 @@ +// +// 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. +// + +// QPID-3477: Java broker does not handle rejection code specified in test +qpid.tests.messaging.endpoints.SessionTests.testReject + diff --git a/java/test-profiles/test-provider.properties b/java/test-profiles/test-provider.properties index 8cea012c1d..fe27cfcfaf 100644 --- a/java/test-profiles/test-provider.properties +++ b/java/test-profiles/test-provider.properties @@ -30,16 +30,12 @@ test.port.alt.ssl=25671 connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' -connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt};tcp://localhost:${test.port}'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' connectionfactory.failover.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' -connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'&failover='roundrobin?cyclecount='20'' connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt}' -connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.connection2.vm = amqp://username:password@clientid/test?brokerlist='vm://:2' queue.MyQueue = example.MyQueue diff --git a/java/test-profiles/test_resources/ssl/certstore.jks b/java/test-profiles/test_resources/ssl/certstore.jks deleted file mode 100644 index 2af95f21f8..0000000000 Binary files a/java/test-profiles/test_resources/ssl/certstore.jks and /dev/null differ diff --git a/java/test-profiles/test_resources/ssl/java_broker.crt b/java/test-profiles/test_resources/ssl/java_broker.crt new file mode 100644 index 0000000000..7543ee8a7d --- /dev/null +++ b/java/test-profiles/test_resources/ssl/java_broker.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAcCgAwIBAgIFAJVWeugwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC +Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15 +Um9vdENBMB4XDTExMDgxNzEzNTQ1NFoXDTExMTExNzEzNTQ1NFowejEQMA4GA1UE +BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQ +MA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMVbG9j +YWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCj +VSo/qOCDsPXQ2HKn2M4ey1FzK6NORkWYefFu5fDFJUKKPXXA8Ey9rPDv+XGGIQKI +6JlmD2nnjp8Em7+/xa6u4XbFqLR8ycmgldGB7r8RbH3B7KYY3s4AxL9A3/TzHza4 +FJAk2X4LTVWHuX8tB/JyLS6695NSLoI5xKW4maARxwIDAQABoyIwIDAJBgNVHRME +AjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAFsexncH +xxTjk9YMoPpjjU0t/UgzjBLEruIIQQ/EtcZIOEqNCDwpzfgY/x7GVCy8VjLISgzK +xJsNv75F/vP8a4eaeTRJmrvVcWUZJu6r/A8WNwJVYUvXhy2+jbfdp/UMlRg+ODw7 +GMU9ILQW4LGJnTtJKrlVrcQqzw6IZRduEE65 +-----END CERTIFICATE----- diff --git a/java/test-profiles/test_resources/ssl/java_broker.req b/java/test-profiles/test_resources/ssl/java_broker.req new file mode 100644 index 0000000000..05fc8b0eda --- /dev/null +++ b/java/test-profiles/test_resources/ssl/java_broker.req @@ -0,0 +1,10 @@ +-----BEGIN NEW CERTIFICATE REQUEST----- +MIIBujCCASMCAQAwejEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UE +BxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMV +bG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCjVSo/qOCD +sPXQ2HKn2M4ey1FzK6NORkWYefFu5fDFJUKKPXXA8Ey9rPDv+XGGIQKI6JlmD2nnjp8Em7+/xa6u +4XbFqLR8ycmgldGB7r8RbH3B7KYY3s4AxL9A3/TzHza4FJAk2X4LTVWHuX8tB/JyLS6695NSLoI5 +xKW4maARxwIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEAjXXfPRv7xQYY3R8lZ78/0gbXZ35Lq/1h +6sxShXfqXxFXE8oP4uGLTlsnSvfsHQL60ihKP3V+nv/zIxNudAsrM57x70owUWyp/bm0XXD89X0T +zEBP9OQexDTwC2r/8gvYMi++022LMTluEPw29bCsp6usuKh61eLmekprpNlhs5M= +-----END NEW CERTIFICATE REQUEST----- diff --git a/java/test-profiles/test_resources/ssl/java_broker_keystore.jks b/java/test-profiles/test_resources/ssl/java_broker_keystore.jks new file mode 100644 index 0000000000..4c4449e20d Binary files /dev/null and b/java/test-profiles/test_resources/ssl/java_broker_keystore.jks differ diff --git a/java/test-profiles/test_resources/ssl/java_client_keystore.jks b/java/test-profiles/test_resources/ssl/java_client_keystore.jks new file mode 100644 index 0000000000..e3a850a248 Binary files /dev/null and b/java/test-profiles/test_resources/ssl/java_client_keystore.jks differ diff --git a/java/test-profiles/test_resources/ssl/java_client_truststore.jks b/java/test-profiles/test_resources/ssl/java_client_truststore.jks new file mode 100644 index 0000000000..2af95f21f8 Binary files /dev/null and b/java/test-profiles/test_resources/ssl/java_client_truststore.jks differ diff --git a/java/test-profiles/test_resources/ssl/keystore.jks b/java/test-profiles/test_resources/ssl/keystore.jks deleted file mode 100644 index e3a850a248..0000000000 Binary files a/java/test-profiles/test_resources/ssl/keystore.jks and /dev/null differ diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults new file mode 100644 index 0000000000..bd2faa7915 --- /dev/null +++ b/java/test-profiles/testprofile.defaults @@ -0,0 +1,59 @@ +# +# 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. +# +java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=${test.profiles}/test-provider.properties + +broker.ready=Listening on TCP +broker.config=build/etc/config-systests.xml +messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore +broker.protocol.excludes= +broker.persistent=false + +max_prefetch=1000 +qpid.dest_syntax=BURL + +log=debug +amqj.logging.level=${log} +amqj.server.logging.level=${log} +amqj.protocol.logging.level=${log} +root.logging.level=warn +log4j.configuration=file:///${test.profiles}/log4j-test.xml +log4j.debug=false + +# Note test-provider.properties also has variables of same name. +# Keep in sync +test.port=15672 +test.mport=18999 +#Note : Management will start open second port on: mport + 100 : 19099 +test.port.ssl=15671 +test.port.alt=25672 +test.port.alt.ssl=25671 + +test.exclude=true +profile.excludes= +test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes} +test.mem=512M +test=*Test +haltonfailure=no +haltonerror=no +exclude.modules=none + +profile.clustered=false + + -- cgit v1.2.1