summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2015-04-15 09:47:28 +0000
committerAlex Rudyy <orudyy@apache.org>2015-04-15 09:47:28 +0000
commit0a0baee45ebcff44635907d457c4ff6810b09c87 (patch)
tree8bfb0f9eddbc23cff88af69be80ab3ce7d47011c /qpid/java/test-profiles
parent54aa3d7070da16ce55c28ccad3f7d0871479e461 (diff)
downloadqpid-python-0a0baee45ebcff44635907d457c4ff6810b09c87.tar.gz
QPID-6481: Move java source tree to top level
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1673693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
-rwxr-xr-xqpid/java/test-profiles/CPPExcludes216
-rw-r--r--qpid/java/test-profiles/CPPNoPrefetchExcludes24
-rw-r--r--qpid/java/test-profiles/CPPPrefetchExcludes23
-rw-r--r--qpid/java/test-profiles/CPPTransientExcludes32
-rw-r--r--qpid/java/test-profiles/Excludes20
-rw-r--r--qpid/java/test-profiles/ExternalBrokerTests29
-rwxr-xr-xqpid/java/test-profiles/Java010Excludes79
-rw-r--r--qpid/java/test-profiles/JavaBDBExcludes19
-rw-r--r--qpid/java/test-profiles/JavaDerbyExcludes22
-rw-r--r--qpid/java/test-profiles/JavaExcludes36
-rw-r--r--qpid/java/test-profiles/JavaJsonExcludes26
-rw-r--r--qpid/java/test-profiles/JavaPersistentExcludes21
-rw-r--r--qpid/java/test-profiles/JavaPre010Excludes91
-rw-r--r--qpid/java/test-profiles/JavaTransientExcludes67
-rw-r--r--qpid/java/test-profiles/XAExcludes22
-rw-r--r--qpid/java/test-profiles/cpp.async.excludes21
-rw-r--r--qpid/java/test-profiles/cpp.excludes31
-rw-r--r--qpid/java/test-profiles/cpp.ssl.excludes25
-rw-r--r--qpid/java/test-profiles/python_tests/Java010PythonExcludes96
-rw-r--r--qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes40
-rw-r--r--qpid/java/test-profiles/test-provider.properties47
-rw-r--r--qpid/java/test-profiles/test_resources/log4j.xml53
-rw-r--r--qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml59
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.dbbin65536 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/CA_db/key3.dbbin16384 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt13
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.dbbin16384 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/app1.crt18
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/app1.req15
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/app2.crt18
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/app2.req15
-rwxr-xr-xqpid/java/test-profiles/test_resources/ssl/generate-java-keystores.sh97
-rwxr-xr-xqpid/java/test-profiles/test_resources/ssl/generate-root-ca.sh49
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_broker.crt15
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_broker.req10
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jksbin3209 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jksbin802 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jksbin591 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jksbin5786 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jksbin591 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jksbin2056 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/pfile1
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/server_db/cert8.dbbin65536 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/server_db/key3.dbbin16384 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/server_db/secmod.dbbin16384 -> 0 bytes
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/server_db/server.crt14
-rw-r--r--qpid/java/test-profiles/test_resources/ssl/server_db/server.req21
47 files changed, 0 insertions, 1385 deletions
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
deleted file mode 100755
index 4ad3087229..0000000000
--- a/qpid/java/test-profiles/CPPExcludes
+++ /dev/null
@@ -1,216 +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.
-//
-
-// QPID-3391: the C++ broker does not currently validate the exchange creation arguments
-org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithNonsenseArgs
-
-// QPID-3576: Java client issue. MessageConsumer#close() time-out.
-org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testDeleteOptions
-
-// Those tests are testing 0.8 specific semantics
-org.apache.qpid.test.client.ImmediateAndMandatoryPublishingTest#*
-org.apache.qpid.test.client.CloseOnNoRouteForMandatoryMessageTest#*
-
-// the 0.10 c++ broker does not implement forget
-org.apache.qpid.test.unit.xa.FaultTest#testForget
-
-// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
-org.apache.qpid.server.queue.PriorityTest#*
-org.apache.qpid.server.queue.AMQPriorityQueueTest#*
-
-// the 0-10 c++ broker does not implement the extended LVQ semantics which the Java Broker does
-org.apache.qpid.server.queue.ConflationQueueTest#*
-
-// the 0-10 c++ broker does not implement sorted queues
-org.apache.qpid.server.queue.SortedQueueTest#*
-
-// the 0-10 c++ broker does not implement DLQ
-org.apache.qpid.test.unit.client.MaxDeliveryCountTest#*
-
-//this test checks explicitly for 0-8 flow control semantics
-org.apache.qpid.test.client.FlowControlTest#*
-
-// 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
-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
-
-// InVM Broker tests
-org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-
-// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue.
-org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
-
-// c++ broker doesn't support message bouncing
-org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testUnsubscribeWhenUsingSelectorMakesTopicUnreachable
-org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#testExceptionListenerConnectionStopDeadlock
-
-// c++ broker expires messages on delivery or when the queue cleaner thread runs.
-org.apache.qpid.server.queue.TimeToLiveTest#testActiveTTL
-org.apache.qpid.server.queue.TimeToLiveTest#testActiveTTLwithDurableSubscription
-
-// 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#*
-
-// This test currently does not pick up the runtime location of the nonVm queueBacking store.
-org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#*
-
-//QPID-1818 : 0-10 Client code path does not correctly restore a transacted session after failover.
-org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
-
-// QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently
-org.apache.qpid.server.AlertingTest#*
-
-// The C++ server has a totally different persistence mechanism
-org.apache.qpid.server.store.PersistentStoreTest#*
-org.apache.qpid.server.store.SplitStoreTest#*
-
-// These tests are for the Java broker persistent store modules
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessagePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessageRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testBindingPersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableBindingRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueuePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableQueueRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testExchangePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableExchangeRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueueExchangeAndBindingCreation
-org.apache.qpid.server.store.DurableConfigurationStoreTest#*
-
-// CPP Broker does not follow the same Logging convention as the Java broker
-org.apache.qpid.server.BrokerStartupTest#*
-org.apache.qpid.server.logging.*
-org.apache.qpid.server.logging.messages.*
-org.apache.qpid.server.logging.subjects.*
-org.apache.qpid.server.logging.actors.*
-
-// CPP Broker does not have a JMX interface to test
-org.apache.qpid.server.jmx.mbeans.*
-org.apache.qpid.systest.management.jmx.*
-
-// JMX is used in this test for validation
-org.apache.qpid.server.queue.ModelTest#*
-
-// 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-2118 : 0-10 Java client has differrent error handling to 0-8 code path
-org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
-
-//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-3986 : Flow control invoked on total store disk usage
-org.apache.qpid.server.store.StoreOverfullTest#*
-// 0-8/0-9/0-9-1 and/or Java broker specific failover tests related to the above Producer Flow Control mechanisms
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutExpires
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFailoverHandlerTimeoutExpires
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFlowControlFlagResetOnFailover
-
-org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#*
-
-// Excluded because Java plugins not used in CPP broker
-org.apache.qpid.server.virtualhost.plugin.*
-org.apache.qpid.info.test.*
-org.apache.qpid.server.security.access.*
-org.apache.qpid.server.security.access.plugins.*
-org.apache.qpid.server.security.auth.manager.*
-org.apache.qpid.server.security.acl.*
-org.apache.qpid.server.configuration.*
-org.apache.qpid.server.configuration.plugins.*
-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.SupportedProtocolVersionsTest#*
-org.apache.qpid.server.stats.StatisticsReportingTest#*
-
-// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs.
-org.apache.qpid.server.failover.FailoverMethodTest#*
-
-// CPP Broker does not implement non-"shared group" message groups
-org.apache.qpid.server.queue.MessageGroupQueueTest#testSimpleGroupAssignment
-org.apache.qpid.server.queue.MessageGroupQueueTest#testConsumerCloseGroupAssignment
-org.apache.qpid.server.queue.MessageGroupQueueTest#testConsumerCloseWithRelease
-org.apache.qpid.server.queue.MessageGroupQueueTest#testGroupAssignmentSurvivesEmpty
-
-// CPP Broker does not implement message conversion from 0-9-1
-org.apache.qpid.server.message.MessageProtocolConversionTest#*
-
-// passwd script is a Java Broker specific command line tool
-org.apache.qpid.scripts.QpidPasswdTest#*
-
-// QPID-3604: Immediate Prefetch no longer supported by 0-10
-org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
-
-// QPID-3936: Exclude Performance Test Framework tests
-org.apache.qpid.systest.disttest.*
-org.apache.qpid.disttest.*
-
-// Exclude java broker REST API tests
-org.apache.qpid.systest.rest.*
-org.apache.qpid.systest.rest.acl.*
-
-// Exclude failover tests requiring virtual host functionality
-org.apache.qpid.client.failover.MultipleBrokersFailoverTest#*
-
-// Uses Java broker specific configuration
-org.apache.qpid.client.ssl.SSLTest#testClientCertMissingWhilstWanting
-org.apache.qpid.client.ssl.SSLTest#testCreateSSLandTCPonSamePort
-
-
-// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
-org.apache.qpid.client.HeartbeatTest#testUnidirectionalHeartbeating
-org.apache.qpid.client.HeartbeatTest#testHeartbeatsEnabledBrokerSide
-
-// Exclude java broker specific behavior allowing queue re-bind to topic exchanges on 0.8/0-10 paths
-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#*
-
-// QPID-6000 : Tests Java specific message compression functionality, and uses the REST API to test it
-org.apache.qpid.systest.MessageCompressionTest#*
-
-
-org.apache.qpid.test.unit.client.AMQSessionTest#testQueueDepthForQueueThatDoesNotExistLegacyBehaviour_08_091
-
-org.apache.qpid.client.prefetch.PrefetchBehaviourTest#testPrefetchWindowExpandsOnReceiveTransaction
-
-org.apache.qpid.client.SyncPublishTest#*
-
-org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
-org.apache.qpid.server.queue.DefaultFiltersTest#*
-org.apache.qpid.server.queue.EnsureNondestructiveConsumersTest#*
-
diff --git a/qpid/java/test-profiles/CPPNoPrefetchExcludes b/qpid/java/test-profiles/CPPNoPrefetchExcludes
deleted file mode 100644
index e10b2fa659..0000000000
--- a/qpid/java/test-profiles/CPPNoPrefetchExcludes
+++ /dev/null
@@ -1,24 +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.
-//
-
-org.apache.qpid.test.unit.transacted.TransactedTest#testRollback
-
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACK
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACKSessionPerConnection
-org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
diff --git a/qpid/java/test-profiles/CPPPrefetchExcludes b/qpid/java/test-profiles/CPPPrefetchExcludes
deleted file mode 100644
index 9b4d69cebd..0000000000
--- a/qpid/java/test-profiles/CPPPrefetchExcludes
+++ /dev/null
@@ -1,23 +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.
-//
-
-// those tests should be run with prefetch off
-org.apache.qpid.client.SynchReceiveTest#testTwoConsumersInterleaved
-org.apache.qpid.client.SynchReceiveTest#testIdleSecondConsumer
-org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
diff --git a/qpid/java/test-profiles/CPPTransientExcludes b/qpid/java/test-profiles/CPPTransientExcludes
deleted file mode 100644
index a214cf5b5c..0000000000
--- a/qpid/java/test-profiles/CPPTransientExcludes
+++ /dev/null
@@ -1,32 +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.
-//
-
-// those tests need durable subscribe states to be persisted
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
-
-// those tests require broker recovery
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
-org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash
-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/qpid/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
deleted file mode 100644
index 7a6089004e..0000000000
--- a/qpid/java/test-profiles/Excludes
+++ /dev/null
@@ -1,20 +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.
-//
-
-org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain
diff --git a/qpid/java/test-profiles/ExternalBrokerTests b/qpid/java/test-profiles/ExternalBrokerTests
deleted file mode 100644
index 94a7a03116..0000000000
--- a/qpid/java/test-profiles/ExternalBrokerTests
+++ /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.
-//
-
-#These tests use external spawned brokers
-
-#=============================
-# In the java-mms.0-10 profile
-#=============================
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#*
-org.apache.qpid.client.failover.FailoverBehaviourTest#*
-org.apache.qpid.client.failover.MultipleBrokersFailoverTest#*
-org.apache.qpid.jms.xa.XAResourceTest#*
-org.apache.qpid.test.client.failover.FailoverTest#*
diff --git a/qpid/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
deleted file mode 100755
index 7294275684..0000000000
--- a/qpid/java/test-profiles/Java010Excludes
+++ /dev/null
@@ -1,79 +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.
-//
-
-// Those tests are testing 0.8..-0-9-1 specific semantics
-org.apache.qpid.test.client.ImmediateAndMandatoryPublishingTest#*
-org.apache.qpid.test.client.CloseOnNoRouteForMandatoryMessageTest#*
-org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#testExceptionListenerConnectionStopDeadlock
-org.apache.qpid.systest.rest.BrokerRestTest#testSetCloseOnNoRoute
-
-//this test checks explicitly for 0-8 flow control semantics
-org.apache.qpid.test.client.FlowControlTest#*
-
-// 0-10 protocol doesn't support message bouncing
-org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testUnsubscribeWhenUsingSelectorMakesTopicUnreachable
-
-// 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
-org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionSuspend
-
-// 0-10 is not supported by the MethodRegistry
-org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
-
-//QPID-1864: rollback with subscriptions does not work in 0-10 yet
-org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage
-
-//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-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#*
-
-// These tests test the behaviour of 0-8..-0-9-1 specific system property qpid.failover_method_timeout
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutExpires
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutReconnected
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFailoverHandlerTimeoutExpires
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFailoverHandlerTimeoutReconnected
-org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFlowControlFlagResetOnFailover
-
-// QPID-3604: Immediate Prefetch no longer supported by 0-10
-org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
-
-// Java 0-10 client does not support re-binding the queue to the same exchange
-org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange
-
-// Java 0-10 exclusive queues are owned by sessions not by the client-id, so the owner is not meaningful from JMX
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testExclusiveQueueHasJmsClientIdAsOwner
-
-org.apache.qpid.test.unit.client.AMQSessionTest#testQueueDepthForQueueThatDoesNotExistLegacyBehaviour_08_091
-
-org.apache.qpid.client.prefetch.PrefetchBehaviourTest#testPrefetchWindowExpandsOnReceiveTransaction
-
-org.apache.qpid.client.SyncPublishTest#*
diff --git a/qpid/java/test-profiles/JavaBDBExcludes b/qpid/java/test-profiles/JavaBDBExcludes
deleted file mode 100644
index 969b9272a7..0000000000
--- a/qpid/java/test-profiles/JavaBDBExcludes
+++ /dev/null
@@ -1,19 +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.
-//
-
diff --git a/qpid/java/test-profiles/JavaDerbyExcludes b/qpid/java/test-profiles/JavaDerbyExcludes
deleted file mode 100644
index 814406f04d..0000000000
--- a/qpid/java/test-profiles/JavaDerbyExcludes
+++ /dev/null
@@ -1,22 +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.
-//
-
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*
-
diff --git a/qpid/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
deleted file mode 100644
index 95de7de220..0000000000
--- a/qpid/java/test-profiles/JavaExcludes
+++ /dev/null
@@ -1,36 +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.
-//
-
-// QPID-1823: this takes ages to run
-org.apache.qpid.client.SessionCreateTest#*
-
-//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-4153 Messages causing a runtime selector error should be dead-lettered (or something similar)
-org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
-
-
-org.apache.qpid.server.protocol.v0_8.AckTest#*
-org.apache.qpid.server.protocol.v0_8.AcknowledgeTest#*
-org.apache.qpid.server.protocol.v0_8.AMQChannelTest#*
-org.apache.qpid.server.protocol.v0_8.QueueBrowserUsesNoAckTest#*
-org.apache.qpid.server.protocol.v0_8.MaxChannelsTest#*
-
diff --git a/qpid/java/test-profiles/JavaJsonExcludes b/qpid/java/test-profiles/JavaJsonExcludes
deleted file mode 100644
index 77b4e3d704..0000000000
--- a/qpid/java/test-profiles/JavaJsonExcludes
+++ /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.
-//
-
-org.apache.qpid.server.store.berkeleydb.*
-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#testPutCreateProvidedVirtualHost
-org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig
diff --git a/qpid/java/test-profiles/JavaPersistentExcludes b/qpid/java/test-profiles/JavaPersistentExcludes
deleted file mode 100644
index 240f6dc330..0000000000
--- a/qpid/java/test-profiles/JavaPersistentExcludes
+++ /dev/null
@@ -1,21 +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.
-//
-
-//These tests require the MemoryMessageStore
-org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#*
diff --git a/qpid/java/test-profiles/JavaPre010Excludes b/qpid/java/test-profiles/JavaPre010Excludes
deleted file mode 100644
index df8cb1bab9..0000000000
--- a/qpid/java/test-profiles/JavaPre010Excludes
+++ /dev/null
@@ -1,91 +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 using the 0-8/0-9/0-9-1 protocols
-//======================================================================
-
-// These tests requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently
-org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
-org.apache.qpid.server.message.MessageProtocolConversionTest#*
-
-//QPID-3422: test fails because ring queue is not implemented on java broker
-org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode
-//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-3678: zero capacity not supported in 0-9-1
-org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testZeroCapacityForSynchronousReceive
-//QPID-6037: the 0-9-1 client takes the view that if you don't specify the node type but you ask for a JMS Topic
-// you want a topic behaviour. The 0-10 client thinks you must want a queue.
-org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testJMSTopicIsTreatedAsQueueIn0_10
-
-// 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.queue.QueuePolicyTest#testRingPolicy
-org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy
-org.apache.qpid.test.unit.message.JMSPropertiesTest#testApplicationProperties
-org.apache.qpid.server.queue.AddressBasedSortedQueueTest#*
-
-// Those tests are written against the 0.10 path
-org.apache.qpid.test.unit.message.UTF8Test#*
-org.apache.qpid.client.SynchReceiveTest#testReceiveNoWait
-org.apache.qpid.server.logging.ChannelLoggingTest#testChannelClosedOnExclusiveQueueDeclaredOnDifferentSession
-
-// Makes explicit use of 0-10 connection object
-org.apache.qpid.client.ssl.SSLTest#testMultipleCertsInSingleStore
-
-// 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
-
-// QPID-3604 This fix is applied only to the 0-10 code, hence this test does not work for pre 0-10.
-org.apache.qpid.client.prefetch.PrefetchBehaviourTest#testConnectionStop
-
-//XA functionality is not implemented in pre 0-10
-org.apache.qpid.jms.xa.XAResourceTest#*
-
-//Tests durable subscription selector verification behaviour that 0-8/0-9/0-9-1 cant provide
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#testResubscribeWithChangedSelectorAndRestart
-
-// JCA system tests require XA support (should look to see if we can reduce scope of excludes here)
-org.apache.qpid.ra.QpidRAConnectionTest#*
-org.apache.qpid.ra.QpidRAXAResourceTest#*
-
-// These tests rely on new address syntax
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testGetSetAlternateExchange
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testRemoveAlternateExchange
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
-
-// QPID-3396
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testExceptionWhenUserPassIsRequired
-
diff --git a/qpid/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes
deleted file mode 100644
index 3397c7ff47..0000000000
--- a/qpid/java/test-profiles/JavaTransientExcludes
+++ /dev/null
@@ -1,67 +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.
-//
-
-//These tests require a persistent store
-org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
-org.apache.qpid.server.store.PersistentStoreTest#*
-org.apache.qpid.server.store.SplitStoreTest#*
-org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithRestart
-org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithChanges
-org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod
-
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
-
-org.apache.qpid.test.unit.xa.QueueTest#testRecover
-org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testRecover
-
-org.apache.qpid.server.queue.QueueMessageDurabilityTest#*
-
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessagePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessageRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testBindingPersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableBindingRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueuePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableQueueRemoval
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testExchangePersistence
-org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableExchangeRemoval
-
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*
-org.apache.qpid.server.store.berkeleydb.upgrade.*
-org.apache.qpid.server.virtualhostnode.berkeleydb.*
-
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testQueueDescriptionSurvivesRestart
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testMoveMessageBetweenQueuesWithBrokerRestart
-org.apache.qpid.systest.management.jmx.QueueManagementTest#testCopyMessageBetweenQueuesWithBrokerRestart
-
-org.apache.qpid.test.unit.client.MaxDeliveryCountTest#testWhenBrokerIsRestartedAfterEnqeuingMessages
-
-org.apache.qpid.systest.rest.VirtualHostRestTest#testRecoverVirtualHostInDesiredStateStoppedWithDescription
-org.apache.qpid.systest.rest.VirtualHostRestTest#testMutateStateOfVirtualHostWithQueuesAndMessages
-
-org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode
-
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover
-org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutReconnected
-org.apache.qpid.server.failover.FailoverMethodTest#testNoFailover
-
diff --git a/qpid/java/test-profiles/XAExcludes b/qpid/java/test-profiles/XAExcludes
deleted file mode 100644
index 907864a730..0000000000
--- a/qpid/java/test-profiles/XAExcludes
+++ /dev/null
@@ -1,22 +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.
-//
-
-org.apache.qpid.test.unit.xa.QueueTest#*
-org.apache.qpid.test.unit.xa.TopicTest#*
-org.apache.qpid.test.unit.xa.FaultTest#*
diff --git a/qpid/java/test-profiles/cpp.async.excludes b/qpid/java/test-profiles/cpp.async.excludes
deleted file mode 100644
index d700538345..0000000000
--- a/qpid/java/test-profiles/cpp.async.excludes
+++ /dev/null
@@ -1,21 +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.
-//
-
-// the C++ broker doesn't guarantee the order of messages on recovery
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
diff --git a/qpid/java/test-profiles/cpp.excludes b/qpid/java/test-profiles/cpp.excludes
deleted file mode 100644
index 2e7610e8e2..0000000000
--- a/qpid/java/test-profiles/cpp.excludes
+++ /dev/null
@@ -1,31 +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 all cpp test profilies
-//======================================================================
-
-// This test requires JMX interface to move messages
-org.apache.qpid.test.client.message.JMSDestinationTest#testMovedToQueue
-
-// This test requires a broker capable of 0-8/9 and 0-10
-org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
-
-//BDB System Tests
-org.apache.qpid.server.store.berkeleydb.*
diff --git a/qpid/java/test-profiles/cpp.ssl.excludes b/qpid/java/test-profiles/cpp.ssl.excludes
deleted file mode 100644
index 3d7b929831..0000000000
--- a/qpid/java/test-profiles/cpp.ssl.excludes
+++ /dev/null
@@ -1,25 +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 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/qpid/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes
deleted file mode 100644
index 530caad132..0000000000
--- a/qpid/java/test-profiles/python_tests/Java010PythonExcludes
+++ /dev/null
@@ -1,96 +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.
-#
-
-###### Feature not supported in Java Broker ######
-
-#The broker does not have the appropriate QMF support
-qpid_tests.broker_0_10.management.*
-qpid_tests.broker_0_10.qmf_events.*
-qpid_tests.broker_0_10.stats.BrokerStatsTests.*
-qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_default_group_id
-qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_move_*
-qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_purge_*
-qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_query
-qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_reroute
-
-qpid_tests.broker_0_10.new_api.GeneralTests.test_ambiguous_create_1
-qpid_tests.broker_0_10.new_api.GeneralTests.test_ambiguous_create_2
-qpid_tests.broker_0_10.new_api.GeneralTests.test_ambiguous_delete_1
-qpid_tests.broker_0_10.new_api.GeneralTests.test_ambiguous_delete_2
-qpid_tests.broker_0_10.new_api.GeneralTests.test_node_disambiguation_1
-qpid_tests.broker_0_10.new_api.GeneralTests.test_node_disambiguation_2
-
-#The broker does not support the Queue Sequence Number feature from QPID-4591
-qpid_tests.broker_0_10.new_api.SequenceNumberTests.test_get_sequence_number
-qpid_tests.broker_0_10.new_api.SequenceNumberTests.test_sequence_number_gap
-
-#The broker does not use the same threshold alerting system (or the QMF support needed for the tests)
-qpid_tests.broker_0_10.threshold.*
-
-#The broker does not support the policy extension
-qpid_tests.broker_0_10.extensions.ExtensionTests.test_policy_*
-
-#The broker does not support the timed-autodelete extension
-qpid_tests.broker_0_10.extensions.ExtensionTests.test_timed_autodelete
-
-#The broker does not support ring queues, fairshare, or the priority alias
-qpid_tests.broker_0_10.priority.PriorityTests.test_ring_queue*
-qpid_tests.broker_0_10.priority.PriorityTests.test_fairshare*
-qpid_tests.broker_0_10.priority.PriorityTests.test_prioritised_delivery_with_alias
-#QPID-6299 broker does not support ring queue on lvq
-qpid_tests.broker_0_10.lvq.LVQTests.test_ring_lvq2
-
-#The broker does not support the autodelete property on exchanges
-qpid_tests.broker_0_10.exchange.AutodeleteTests.testAutodelete*
-
-# QPID-5531 : Changes to the C++ behaviour in having a default timeout for every transaction not implemented in Java Broker
-qpid_tests.broker_0_10.dtx.DtxTests.test_get_timeout
-
-###### Behavioural differences between Java & CPP Broker ######
-
-#Tests changed/added in QPID-5280 and QPID-5283
-qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive
-qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive_alreadyinuse
-
-#QPID-3587 Java broker does not alter queue counts until msgs are accepted.
-qpid_tests.broker_0_10.message.MessageTests.test_ack
-qpid_tests.broker_0_10.message.MessageTests.test_acquire
-qpid_tests.broker_0_10.message.MessageTests.test_acquire_with_no_accept_and_credit_flow
-
-qpid_tests.broker_0_10.dtx.DtxTests.test_forget_xid_on_completion
-qpid_tests.broker_0_10.dtx.DtxTests.test_implicit_end
-qpid_tests.broker_0_10.dtx.DtxTests.test_simple_commit
-qpid_tests.broker_0_10.dtx.DtxTests.test_simple_prepare_commit
-qpid_tests.broker_0_10.dtx.DtxTests.test_simple_prepare_rollback
-qpid_tests.broker_0_10.dtx.DtxTests.test_simple_rollback
-
-qpid_tests.broker_0_10.new_api.GeneralTests.test_qpid_3481_acquired_to_alt_exchange_2_consumers
-
-###### Java Broker defects ######
-
-#QPID-3591 Fails due to bytes credit issue
-qpid_tests.broker_0_10.message.MessageTests.test_credit_flow_bytes
-qpid_tests.broker_0_10.message.MessageTests.test_window_flow_bytes
-
-#QPID-3605 Durable subscriber with no-local true receives messages on re-connection
-qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward
-
-#QPID-6122 TimeoutTests occasionally fail against the Java Broker
-qpid.tests.messaging.endpoints.TimeoutTests.*
-
diff --git a/qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes b/qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes
deleted file mode 100644
index 496636c776..0000000000
--- a/qpid/java/test-profiles/python_tests/JavaPre010PythonExcludes
+++ /dev/null
@@ -1,40 +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.
-#
-
-qpid_tests.broker_0_8.queue.QueueTests.test_declare_exclusive
-qpid_tests.broker_0_8.queue.QueueTests.test_delete_simple
-qpid_tests.broker_0_8.queue.QueueTests.test_purge
-qpid_tests.broker_0_8.tx.TxTests.test_auto_rollback
-qpid_tests.broker_0_8.tx.TxTests.test_rollback
-
-qpid_tests.broker_0_9.query.QueryTests.test_binding_query_direct
-qpid_tests.broker_0_9.query.QueryTests.test_binding_query_fanout
-qpid_tests.broker_0_9.query.QueryTests.test_binding_query_header
-qpid_tests.broker_0_9.query.QueryTests.test_binding_query_topic
-qpid_tests.broker_0_9.query.QueryTests.test_exchange_query
-
-# QPID-3987 Tests broker_0_9.queue.QueueTests.test_unbind_fanout and broker_0_9.queue.QueueTests.test_unbind_headers fail with 404, 'No such binding'
-qpid_tests.broker_0_9.queue.QueueTests.test_unbind_fanout
-qpid_tests.broker_0_9.queue.QueueTests.test_unbind_headers
-
-#QPID-4832 Java Broker does not support an explicit bind to a default exchange
-qpid_tests.broker_0_8.exchange.DefaultExchangeRuleTests.testDefaultExchangeExplicitBind
-
-#QPID-5551 : We now throw a connection exception rather than a channel exception
-qpid_tests.broker_0_8.basic.BasicTests.test_consume_exclusive
diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties
deleted file mode 100644
index fe27cfcfaf..0000000000
--- a/qpid/java/test-profiles/test-provider.properties
+++ /dev/null
@@ -1,47 +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.
-#
-#
-
-# Copied from default.testprofile
-test.port=15672
-test.mport=18999
-#Note : Java Management will start open second port on: mport + 100 : 19099
-test.port.ssl=15671
-test.port.alt=25672
-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.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.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}'
-connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt}'
-
-
-queue.MyQueue = example.MyQueue
-queue.queue = example.queue
-queue.xaQueue = xaQueue
-
-topic.topic = topic
-topic.xaTopic = xaTopic
-topic.durableSubscriberTopic = durableSubscriberTopic
diff --git a/qpid/java/test-profiles/test_resources/log4j.xml b/qpid/java/test-profiles/test_resources/log4j.xml
deleted file mode 100644
index 8c59ffdd98..0000000000
--- a/qpid/java/test-profiles/test_resources/log4j.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null">
-
-
-
- <appender class="org.apache.log4j.FileAppender" name="TestAppender">
- <param name="File" value="${test.output.dir}${file.separator}TEST-${qpid.testClass}${qpid.testMethod}.txt"/>
- <param name="Append" value="false"/>
-
-
- <!-- TODO date not interesting for test debugging. log only the time to save width -->
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/>
- </layout>
- </appender>
-
-
- <!-- General logging hierarchy -->
- <logger name="org.apache.qpid">
- <level value="${amqj.logging.level}"/>
- </logger>
-
- <logger name="qpid.message">
- <level value="INFO"/>
- </logger>
-
-
- <!-- Log all info events to file -->
- <root>
- <level value="debug"/>
- <appender-ref ref="TestAppender"/>
- </root>
-
-</log4j:configuration>
diff --git a/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml
deleted file mode 100644
index eb75e740b9..0000000000
--- a/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j configuration for unit tests -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="ImmediateFlush" value="true"/>
- <param name="Follow" value="true"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/>
- </layout>
- </appender>
-
- <logger name="org.apache.qpid">
- <level value="${amqj.logging.level}"/>
- </logger>
-
- <logger name="qpid.message">
- <level value="INFO"/>
- </logger>
-
- <logger name="qpid.protocol">
- <level value="${amqj.protocol.logging.level}"/>
- </logger>
-
- <logger name="org.apache.commons">
- <level value="WARN"/>
- </logger>
-
- <root>
- <level value="${root.logging.level}"/>
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
diff --git a/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
deleted file mode 100644
index a3f6c20bea..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
deleted file mode 100644
index ccde375837..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt b/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
deleted file mode 100644
index eeced5aed5..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICDDCCAXWgAwIBAgIFAKI1edswDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTE1MDMxOTIyMzUyOVoXDTIwMDMxOTIyMzUyOVowQTELMAkGA1UE
-BhMCQ0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMT
-CE15Um9vdENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjbsB++rgz0Kl9
-4VLr/03Tgab+xxf1krNdxriCMf7dd2cOQbHt3ytDeLroR/TH2Jqkv6MuXRlYHByw
-Oa3tqqX9pfCJDMnLiUZ97coeaZdtlLaHsVdp0KUiRPT+aUxbGW4n7r9o/5ahCoDV
-gxWsU0JXlHMI8eRh/smNVWf2AgQKBwIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4GBAKfUcPQHf8Qs5UdLWyOSlnAB3fVjFjZHgBXdGAsZNFMY
-/Grjl1lGc7KJSvm6ICMD1Dq4rHrw1i4KwaeyuCfMgZ5RpsNXNoVVtCms4vD/FbSw
-Vde4OfEDiHcOy5Pd/ovnwPd6znHlYIXWZ3SEBs4MKzWW8BnwOEO+FAog0rAOE9N+
------END CERTIFICATE-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
deleted file mode 100644
index 0c0a006eeb..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/app1.crt b/qpid/java/test-profiles/test_resources/ssl/app1.crt
deleted file mode 100644
index 5b32b12dc2..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/app1.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC4TCCAkqgAwIBAgIFAKI1xIUwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTE1MDMyMDAxMjE1MloXDTIwMDMyMDAxMjE1MlowYTELMAkGA1UE
-BhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMQ0wCwYDVQQKEwRh
-Y21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDFAYWNtZS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCL3+MH/VknnAI+ldWywF4khA8oGjGd
-w6z5zPWZ83ucPdjIFUNRN4N38Fd62gs0BCwrZcRZiHbynWFZBsweUj7ODyYFPFtq
-xaYO/Ovt4xGsNspcpcSNVPhcH/34hfqpUmsUrM1tFf/1vgOV4BfU05mkNCeZxvmg
-TuyAXPbunwu4poPaWOy0JBTSsS8LPGgofE8k0yzg9+91Ixw6ulQLV/TEuhgbJ7sL
-iA70GTHLs3vwnlsvU0xLUb+U3OAxbHpCrbnmwmGg9BrjJvJGfL9UydpjiIl25uMA
-PTkI+gapLAf2lkiyk+dpIz99LXvAUqKnli6KGNVLhmJb1KNelBlqlJcDAgMBAAGj
-QTA/MB0GA1UdDgQWBBRm2ix2JDQ9VG0wsZctPa/PnJdxhDAJBgNVHRMEAjAAMBMG
-A1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBABr7BxsqDpHy2tOo
-F39pthuSpHBh37fxtSCJKMigMFjRUCpLYosMefixVYGT8IAhJ+KSzAg48SKmD0b5
-9R4NZXP16Mbs6U9Air8CSANsfpcG4nJu+QiTIu6RAQOwt+dlYfRe/OkNpunzJBzb
-eAEMdf1CrEFtQi/hniiLffjyk7ln
------END CERTIFICATE-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/app1.req b/qpid/java/test-profiles/test_resources/ssl/app1.req
deleted file mode 100644
index 318715daf5..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/app1.req
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRv
-MQ0wCwYDVQQKEwRhY21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDFAYWNtZS5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCL3+MH/VknnAI+ldWywF4khA8oGjGdw6z5zPWZ
-83ucPdjIFUNRN4N38Fd62gs0BCwrZcRZiHbynWFZBsweUj7ODyYFPFtqxaYO/Ovt4xGsNspcpcSN
-VPhcH/34hfqpUmsUrM1tFf/1vgOV4BfU05mkNCeZxvmgTuyAXPbunwu4poPaWOy0JBTSsS8LPGgo
-fE8k0yzg9+91Ixw6ulQLV/TEuhgbJ7sLiA70GTHLs3vwnlsvU0xLUb+U3OAxbHpCrbnmwmGg9Brj
-JvJGfL9UydpjiIl25uMAPTkI+gapLAf2lkiyk+dpIz99LXvAUqKnli6KGNVLhmJb1KNelBlqlJcD
-AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBRm2ix2JDQ9VG0wsZctPa/PnJdxhDAN
-BgkqhkiG9w0BAQUFAAOCAQEAMlm/PeNAirN/c6KWkVNYBYk1RosQ0TVoRLnrKON/HHcHSlA6YCAD
-LLc2S8fTEjxKoOU3G1pL3s6nD1GKETF/k9Wm9VAK2lg9daG35p5RaEFwLc3r9PVMLNYcnOSXV4tj
-9S7L2FH2mxinj9vs7VYe6ZmI2vp2ts0P5/k4dX/vAQAkS8y6A+gxVzUeeDFT2+WQtmRG/mPfU9Ic
-9w965Po0Dd7cQPgwS7WQoVHovSjIvNXhm6aNki9uyWoDIE4cR2QcHRC6YBlxRiEq6uW87FBgrCH+
-ooLiZS/+p8TWCRro3HvsFRrrCTE+gFK8c3ouueIzmvu4+SKB0lPJOdnhoUsOaw==
------END NEW CERTIFICATE REQUEST-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/app2.crt b/qpid/java/test-profiles/test_resources/ssl/app2.crt
deleted file mode 100644
index a8fe4104bc..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/app2.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC4TCCAkqgAwIBAgIFAKI1xCswDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTE1MDMyMDAxMjEwNVoXDTIwMDMyMDAxMjEwNVowYTELMAkGA1UE
-BhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMQ0wCwYDVQQKEwRh
-Y21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDJAYWNtZS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCviLTH6Vl6gP3M6gmmm0sVlCcBFfo2
-czDTsr93D1cIQpnyY1r3znBdFT3cbXE2LtHeLpnlXc+dTo9/aoUuBCzRIpi4CeaG
-gD3ggIl9Ws5hUgfxJCWBg7nhzMUlBC2C+VgIUHWHqGPuaQ7VzXOEC7xF0mihMZ4b
-wvU6wxGK2uUoruXE/iti/+jtzxjq0PO7ZgJ7GUI2ZDqGMad5OnLur8jz+yKsVdet
-XlXsOyHmHi/47pRuA115pYiIaZKu1+vs6IBl4HnEUgw5JwIww6oyTDVvXc1kCw0Q
-CtUZMcNSH2XGhh/zGM/M2Bt2lgEEW0xWTwQcT1J7wnngfbIYbzoupEkRAgMBAAGj
-QTA/MB0GA1UdDgQWBBRI+VUMRkfNYp/xngM9y720hvxmXTAJBgNVHRMEAjAAMBMG
-A1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAJnedohhbqoY7O6o
-Am+hPScBCng/fl0erVjexL9W8l8g5NvIGgioUfjUDvGOnwB5LOoTnZUCRaLFhQFc
-GFMIjdHpg0qt/QkEFX/0m+849RK6muHT1CNlcXtCFXwPTJ+9h+1auTP+Yp/6ii9S
-U3W1dzYawy2p9IhkMZEpJaHCLnaC
------END CERTIFICATE-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/app2.req b/qpid/java/test-profiles/test_resources/ssl/app2.req
deleted file mode 100644
index cfd67b5843..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/app2.req
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRv
-MQ0wCwYDVQQKEwRhY21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDJAYWNtZS5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCviLTH6Vl6gP3M6gmmm0sVlCcBFfo2czDTsr93
-D1cIQpnyY1r3znBdFT3cbXE2LtHeLpnlXc+dTo9/aoUuBCzRIpi4CeaGgD3ggIl9Ws5hUgfxJCWB
-g7nhzMUlBC2C+VgIUHWHqGPuaQ7VzXOEC7xF0mihMZ4bwvU6wxGK2uUoruXE/iti/+jtzxjq0PO7
-ZgJ7GUI2ZDqGMad5OnLur8jz+yKsVdetXlXsOyHmHi/47pRuA115pYiIaZKu1+vs6IBl4HnEUgw5
-JwIww6oyTDVvXc1kCw0QCtUZMcNSH2XGhh/zGM/M2Bt2lgEEW0xWTwQcT1J7wnngfbIYbzoupEkR
-AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBRI+VUMRkfNYp/xngM9y720hvxmXTAN
-BgkqhkiG9w0BAQUFAAOCAQEAIk5xvkcSXoDDsqarHHbeBsYd1WIQbbNyDB4+9GlooI/0igSy6pIm
-wulHIvmXDuMZbYx+mNmVhapEyOWC0Yq4nnAbIkFDQOZ8ac3IdwiP8rf+FziaU49CPH7PvVRmI1dO
-X/cgJobj3EytaCh1+xvDxJuRvQ3UL+MoL3KJxS+JAhH0QYT7ZoXBLfz4UHjVJn/fG4tsrAzdtjsG
-1DHiyaarUxjFqfE8IsaqaT2r1MhFVI0EXDbskCtVDf8x4RbCbBfooerkca4JbdhNfzHXVeq3NjkQ
-NhYdRwwlAWr3bWEhc3F1rHYPnN5C0tonxnz71Emt3zfzO4XYaXePQTm+3JCSEw==
------END NEW CERTIFICATE REQUEST-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/generate-java-keystores.sh b/qpid/java/test-profiles/test_resources/ssl/generate-java-keystores.sh
deleted file mode 100755
index fe27844465..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/generate-java-keystores.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env 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.
-#
-
-echo "Remove existing java broker keystore"
-rm java_broker_keystore.jks
-echo "Re-create java broker keystore by importing RootCA certificate"
-keytool -import -v -keystore java_broker_keystore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
-echo "Generate certificate key 'java-broker'"
-keytool -genkey -alias java-broker -keyalg RSA -sigalg SHA1withRSA -validity 720 -keystore java_broker_keystore.jks -storepass password -dname "CN=localhost, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown"
-echo "Export certificate signing request"
-keytool -certreq -alias java-broker -sigalg SHA1withRSA -keystore java_broker_keystore.jks -storepass password -v -file java-broker.req
-echo "Sign certificate by entering:"
-echo " n for 'Is this a CA certificate [y/N]?'"
-echo " [Enter] for 'Enter the path length constraint, enter to skip [<0 for unlimited path]: >'"
-echo " n for 'Is this a critical extension [y/N]?'"
-echo " password which was specified on creation root CA database."
-certutil -C -d CA_db -c "MyRootCA" -a -i java-broker.req -o java-broker.crt -2 -6 --extKeyUsage serverAuth -v 60 -Z SHA1
-echo "Import signed certificate"
-keytool -import -v -alias java-broker -keystore java_broker_keystore.jks -storepass password -file java-broker.crt
-echo "List keystore entries"
-keytool --list --keystore java_broker_keystore.jks -storepass password
-
-read -p "Press [Enter] key to continue..."
-echo "Remove existing client keystore"
-rm java_client_keystore.jks
-echo "Re-create java client keystore by importing RootCA certificate"
-keytool -import -v -keystore java_client_keystore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
-
-echo "Generate key for certificate 'app2'"
-keytool -genkey -alias app2 -keyalg RSA -sigalg SHA1withRSA -validity 720 -keystore java_client_keystore.jks -storepass password -dname "CN=app2@acme.org, OU=art, O=acme, L=Toronto, ST=ON, C=CA"
-echo "Export certificate signing request for 'app2'"
-keytool -certreq -alias app2 -sigalg SHA1withRSA -keystore java_client_keystore.jks -storepass password -v -file app2.req
-echo "Sign certificate 'app2' by entering:"
-echo " n for 'Is this a CA certificate [y/N]?'"
-echo " '-1' for 'Enter the path length constraint, enter to skip [<0 for unlimited path]: >'"
-echo " n for 'Is this a critical extension [y/N]?'"
-echo " password which was specified on creation root CA database."
-certutil -C -d CA_db -c "MyRootCA" -a -i app2.req -o app2.crt -2 -6 --extKeyUsage clientAuth -v 60 -Z SHA1
-echo "Import signed certificate 'app2'"
-keytool -import -v -alias app2 -keystore java_client_keystore.jks -storepass password -file app2.crt
-
-echo "Generate key for certificate 'app1'"
-keytool -genkey -alias app1 -keyalg RSA -sigalg SHA1withRSA -validity 720 -keystore java_client_keystore.jks -storepass password -dname "CN=app1@acme.org, OU=art, O=acme, L=Toronto, ST=ON, C=CA"
-echo "Export certificate signing request for 'app1'"
-keytool -certreq -alias app1 -sigalg SHA1withRSA -keystore java_client_keystore.jks -storepass password -v -file app1.req
-echo "Sign certificate 'app1' by entering:"
-echo " n for 'Is this a CA certificate [y/N]?'"
-echo " '-1' for 'Enter the path length constraint, enter to skip [<0 for unlimited path]: >'"
-echo " n for 'Is this a critical extension [y/N]?'"
-echo " password which was specified on creation of root CA database."
-certutil -C -d CA_db -c "MyRootCA" -a -i app1.req -o app1.crt -2 -6 --extKeyUsage clientAuth -v 60 -Z SHA1
-echo "Import signed certificate 'app1'"
-keytool -import -v -alias app1 -keystore java_client_keystore.jks -storepass password -file app1.crt
-echo "List entries in client keystore"
-keytool --list --keystore java_client_keystore.jks -storepass password
-
-read -p "Press [Enter] key to continue..."
-echo "Remove existing client truststore"
-rm java_client_truststore.jks
-echo "Re-create client truststore by importing RootCA certificate"
-keytool -import -v -keystore java_client_truststore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
-echo "List entries in client trusttore"
-keytool --list --keystore java_client_truststore.jks -storepass password
-
-read -p "Press [Enter] key to continue..."
-echo "Remove existing broker truststore"
-rm java_broker_truststore.jks
-echo "Re-create broker truststore by importing RootCA certificate"
-keytool -import -v -keystore java_broker_truststore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
-echo "List entries in broker truststore"
-keytool --list --keystore java_broker_truststore.jks -storepass password
-
-read -p "Press [Enter] key to continue..."
-echo "Remove existing broker peerstore"
-rm java_broker_peerstore.jks
-echo "Re-create broker peerstore by importing app1 certificate"
-keytool -import -v -keystore java_broker_peerstore.jks -storepass password -alias app1 -file app1.crt
-echo "List entries in broker peerstore"
-keytool --list --keystore java_broker_peerstore.jks -storepass password
-
diff --git a/qpid/java/test-profiles/test_resources/ssl/generate-root-ca.sh b/qpid/java/test-profiles/test_resources/ssl/generate-root-ca.sh
deleted file mode 100755
index ca14727e5e..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/generate-root-ca.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env 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.
-#
-
-echo "Create a new certificate database for root CA"
-rm CA_db/*
-certutil -N -d CA_db
-
-echo "Create the self-signed Root CA certificate by entering:"
-echo " password which was specified on creation of root CA database."
-echo " y for 'Is this a CA certificate [y/N]?'"
-echo " [Enter] for 'Enter the path length constraint, enter to skip [<0 for unlimited path]: >'"
-echo " n for 'Is this a critical extension [y/N]?'"
-certutil -S -d CA_db -n "MyRootCA" -s "CN=MyRootCA,O=ACME,ST=Ontario,C=CA" -t "CT,," -x -2 -Z SHA1 -v 60
-echo "Extract the CA certificate from the CA’s certificate database to a file."
-certutil -L -d CA_db -n "MyRootCA" -a -o CA_db/rootca.crt
-
-
-echo "Create a certificate database for the Qpid Broker."
-rm server_db/*
-certutil -N -d server_db
-echo "Import the CA certificate into the broker’s certificate database"
-certutil -A -d server_db -n "MyRootCA" -t "TC,," -a -i CA_db/rootca.crt
-echo "Create the server certificate request"
-certutil -R -d server_db -s "CN=localhost.localdomain,O=ACME,ST=Ontario,C=CA" -a -o server_db/server.req -Z SHA1
-echo "Sign and issue a new server certificate by entering:"
-echo " n for 'Is this a CA certificate [y/N]?'"
-echo " '-1' for 'Enter the path length constraint, enter to skip [<0 for unlimited path]: >'"
-echo " n for 'Is this a critical extension [y/N]?'"
-echo " password which was specified on creation of root CA database."
-certutil -C -d CA_db -c "MyRootCA" -a -i server_db/server.req -o server_db/server.crt -2 -6 --extKeyUsage serverAuth -v 60 -Z SHA1
-echo "Import signed certificate to the broker’s certificate database"
-certutil -A -d server_db -n localhost.localdomain -a -i server_db/server.crt -t ",,"
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_broker.crt b/qpid/java/test-profiles/test_resources/ssl/java_broker.crt
deleted file mode 100644
index 9b88c04962..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_broker.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICVzCCAcCgAwIBAgIFAJcmLgUwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTEyMDIxNzIzMzgxM1oXDTE1MDMxNzIzMzgxM1owejEQMA4GA1UE
-BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQ
-MA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMVbG9j
-YWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1
-OsmvebKV0zJ4/eBCyenRwwJ4Xg/NLP4unofpKb3xvlaGJY+xQnaSukXAzWnH04O4
-eLoUYBhJfVjRu7XU9XMhrLtJYjLgWkcdvnEfQPXYnM6BUnqtfFx5E5c5mWAhpb9r
-Rt2KX53t3OVxirdKS++2u3apUObJLjOwc+bf/mVbIQIDAQABoyIwIDAJBgNVHRME
-AjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBACIRf1BV
-zsniD2qZ9eQsWPCnZ0vIuyKNBbxzXkpbEPBirQZIoY4GCgbIc38OV8SRRHInto6j
-i4G8klxth6gPHs+MbjqVzwZ0mND57JSxTpPZ+au+ZjbJO+efNfNw9hBs44fZ1Int
-DPNiQekOLGHimSDBQr8FHkMLSwTcxGsfcpU/
------END CERTIFICATE-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_broker.req b/qpid/java/test-profiles/test_resources/ssl/java_broker.req
deleted file mode 100644
index 5aa50d9b39..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_broker.req
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIBujCCASMCAQAwejEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UE
-BxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMV
-bG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1OsmvebKV
-0zJ4/eBCyenRwwJ4Xg/NLP4unofpKb3xvlaGJY+xQnaSukXAzWnH04O4eLoUYBhJfVjRu7XU9XMh
-rLtJYjLgWkcdvnEfQPXYnM6BUnqtfFx5E5c5mWAhpb9rRt2KX53t3OVxirdKS++2u3apUObJLjOw
-c+bf/mVbIQIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEAtFBfnlL3ZZEnFJRAzkbIMqRLHcWdIyfq
-MocOammt7Cw//4cJPIdGoJp4ZhSfZX7k5p6FExgudYwuPF7s4ex+bTI49zW44mVdyrvAiY88bUA1
-9vcpRDANN9R0z13v6OIJGW8hpua3oKz+XON6TeksjzbPkNUNt5Ya5tJAylkha0A=
------END NEW CERTIFICATE REQUEST-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
deleted file mode 100644
index 50bb8d01b3..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks
deleted file mode 100644
index 69cdd40d2a..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_broker_peerstore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jks b/qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jks
deleted file mode 100644
index e6d556aea3..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_broker_truststore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jks
deleted file mode 100644
index 941fc7e88a..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_client_keystore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jks
deleted file mode 100644
index ab79b54226..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_client_truststore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks b/qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks
deleted file mode 100644
index 45a0c10667..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/pfile b/qpid/java/test-profiles/test_resources/ssl/pfile
deleted file mode 100644
index f3097ab130..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/pfile
+++ /dev/null
@@ -1 +0,0 @@
-password
diff --git a/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
deleted file mode 100644
index f482e78687..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
deleted file mode 100644
index f1edbaf4f9..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
deleted file mode 100644
index 87867f4856..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
+++ /dev/null
Binary files differ
diff --git a/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt b/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
deleted file mode 100644
index 1a87265e89..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKzCCAZSgAwIBAgIFAKI1eqswDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTE1MDMxOTIyMzYzOVoXDTIwMDMxOTIyMzYzOVowTjELMAkGA1UE
-BhMCQ0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxHjAcBgNVBAMT
-FWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAu4kNLGCxZ3cvQRqd0L6iM1zx4boj7eGlLpgysPn0sd77N8CfBMqnmWOoYafI
-H4+FPMQ3En3D0nV5qFjveNTJQtzRZZUCbF6UESeO6ghu8Rr5AnI51PIrSQPVEG1w
-0AN1TYrn5AxW3G06aVMsggk7TItFb7qkXTO1LuGUcZy1z+MCAwEAAaMiMCAwCQYD
-VR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOBgQAc
-w82l72VLrPNtVBp+90rNHLM6ARnghYWLceC07cwgjNItejDlLOHzExThYH5vOwFs
-b6c2KyUt198uccl5wx44HvzR5LCVnJ0JQqw4n0tS9jeztD42urYWP2ouPgqgxAvo
-zNARo6aODfF9I7sxtPhSvhECyKvkZQH4F4xVXwwvSA==
------END CERTIFICATE-----
diff --git a/qpid/java/test-profiles/test_resources/ssl/server_db/server.req b/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
deleted file mode 100644
index 9eaa228820..0000000000
--- a/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Certificate request generated by Netscape certutil
-Phone: (not specified)
-
-Common Name: localhost.localdomain
-Email: (not specified)
-Organization: ACME
-State: Ontario
-Country: CA
-
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIBjTCB9wIBADBOMQswCQYDVQQGEwJDQTEQMA4GA1UECBMHT250YXJpbzENMAsG
-A1UEChMEQUNNRTEeMBwGA1UEAxMVbG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7iQ0sYLFndy9BGp3QvqIzXPHhuiPt4aUu
-mDKw+fSx3vs3wJ8EyqeZY6hhp8gfj4U8xDcSfcPSdXmoWO941MlC3NFllQJsXpQR
-J47qCG7xGvkCcjnU8itJA9UQbXDQA3VNiufkDFbcbTppUyyCCTtMi0VvuqRdM7Uu
-4ZRxnLXP4wIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEAtuJ9b0OgbijExb/AQlbS
-kw4s28SwMqyMdgt+kUJHaDV+sEtlzzdv7jS0uKtoElBI7+MiYbtGzcqvdPGc147Q
-T6Lk7AMcBrjRFLxuBnAi+Bdh7O6PUUKL9CREAae1QiVOFfXkD07Az9YDLYhe+ZsJ
-qLYrWDGTMRXXsKU3JWIy5M4=
------END NEW CERTIFICATE REQUEST-----