summaryrefslogtreecommitdiff
path: root/cc/config
diff options
context:
space:
mode:
Diffstat (limited to 'cc/config')
-rw-r--r--cc/config/bdbstore-cpp-trunk.xml22
-rw-r--r--cc/config/cpp-perftests.xml (renamed from cc/config/cpp-trunk-perftests.xml)0
-rw-r--r--cc/config/cpp-trunk.xml11
-rw-r--r--cc/config/example-automation.xml36
-rw-r--r--cc/config/java-jmstck.xml63
-rw-r--r--cc/config/java-perftests.xml62
-rw-r--r--cc/config/java-trunk.xml171
-rw-r--r--cc/config/java/cpp.noprefetch.testprofile16
-rw-r--r--cc/config/java/cpp.testprofile17
-rw-r--r--cc/config/java/cppExcludeList15
-rw-r--r--cc/config/java/cppNoPrefetchExcludeList49
-rw-r--r--cc/config/java/java.testprofile17
-rw-r--r--cc/config/java/javaExcludeList13
-rw-r--r--cc/config/java/jndi.properties21
14 files changed, 279 insertions, 234 deletions
diff --git a/cc/config/bdbstore-cpp-trunk.xml b/cc/config/bdbstore-cpp-trunk.xml
index 1584791518..254af62170 100644
--- a/cc/config/bdbstore-cpp-trunk.xml
+++ b/cc/config/bdbstore-cpp-trunk.xml
@@ -17,19 +17,15 @@ specific language governing permissions and limitations
under the License.
-->
<cruisecontrol>
-
<project name="bdbstore-cpp-trunk"
buildafterfailed="false">
-
- <!-- Load environment variables -->
- <property environment="env" toupper="true"/>
<listeners>
<currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
</listeners>
<bootstrappers>
- <svnbootstrapper localWorkingCopy="${env.CPPSTORE_HOME}" />
+ <svnbootstrapper localWorkingCopy="${env.CPPSTORE_HOME}"/>
</bootstrappers>
<modificationset quietperiod="30">
@@ -39,10 +35,20 @@ under the License.
<schedule interval="3600">
<exec timeout="1800"
- command="/bin/bash"
- args="${env.CC_HOME}/cc/scripts/bdbstorecppbuild.sh"
- workingdir="${env.CPPSTORE_HOME}" />
+ command="/bin/bash"
+ args="${env.CC_HOME}/cc/scripts/bdbstorecppbuild.sh"
+ workingdir="${env.CPPSTORE_HOME}"/>
</schedule>
+ <publishers>
+ <email subjectprefix="${mail.subject}: ${project.name}" mailhost="${mail.host}"
+ returnaddress="${mail.returnaddress}"
+ buildresultsurl="http://${env.HOSTNAME}:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
+ spamwhilebroken="true">
+ <always address="${mail.list}"/>
+ </email>
+ </publishers>
</project>
</cruisecontrol>
diff --git a/cc/config/cpp-trunk-perftests.xml b/cc/config/cpp-perftests.xml
index 8a5079b60b..8a5079b60b 100644
--- a/cc/config/cpp-trunk-perftests.xml
+++ b/cc/config/cpp-perftests.xml
diff --git a/cc/config/cpp-trunk.xml b/cc/config/cpp-trunk.xml
index 7943dac6de..56e1d2bb54 100644
--- a/cc/config/cpp-trunk.xml
+++ b/cc/config/cpp-trunk.xml
@@ -44,5 +44,16 @@ under the License.
args="../cc/scripts/cppbuild.sh"
workingdir="../cpp" />
</schedule>
+
+ <publishers>
+ <email subjectprefix="${mail.subject}: ${project.name}" mailhost="${mail.host}"
+ returnaddress="${mail.returnaddress}"
+ buildresultsurl="http://${env.HOSTNAME}:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
+ spamwhilebroken="true">
+ <always address="${mail.list}"/>
+ </email>
+ </publishers>
</project>
</cruisecontrol>
diff --git a/cc/config/example-automation.xml b/cc/config/example-automation.xml
index 7dc69bd052..52dd135c24 100644
--- a/cc/config/example-automation.xml
+++ b/cc/config/example-automation.xml
@@ -20,9 +20,6 @@ under the License.
<project name="qpid-example-automation"
buildafterfailed="false">
- <!-- Load environment variables -->
- <property environment="env" toupper="true"/>
-
<listeners>
<currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
</listeners>
@@ -34,31 +31,28 @@ under the License.
</modificationset>
<schedule interval="3600">
- <exec timeout="1800"
- command="/bin/bash"
- args="${env.CC_HOME}/cc/scripts/check_examples.sh"
- errorstr="FAILED"
- workingdir="./" />
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="${env.CC_HOME}/cc/scripts/check_examples.sh"
+ errorstr="FAILED"
+ workingdir="./"/>
</schedule>
- <publishers>
- <artifactspublisher dest="artifacts/${project.name}"
+ <publishers>
+ <artifactspublisher dest="artifacts/${project.name}"
file="${env.CC_HOME}/broker.log"/>
- <artifactspublisher dest="artifacts/${project.name}"
+ <artifactspublisher dest="artifacts/${project.name}"
file="${env.CC_HOME}/script.log"/>
- <!--
- <email subjectprefix="CC report fro ${project.name}" mailhost="localhost"
- returnaddress="my_email"
- buildresultsurl="http://my_host:8080/buildresults/${project.name}"
- skipusers="false"
- reportsuccess="fixes"
+
+ <email subjectprefix="${mail.subject}: ${project.name}" mailhost="${mail.host}"
+ returnaddress="${mail.returnaddress}"
+ buildresultsurl="http://${env.HOSTNAME}:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
spamwhilebroken="true">
- <always address="email"/>
- <map alias="name" address="email"/>
+ <always address="${mail.list}"/>
</email>
- -->
-
</publishers>
</project>
</cruisecontrol>
diff --git a/cc/config/java-jmstck.xml b/cc/config/java-jmstck.xml
new file mode 100644
index 0000000000..2b10b0c5b5
--- /dev/null
+++ b/cc/config/java-jmstck.xml
@@ -0,0 +1,63 @@
+<!--
+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.
+-->
+
+<cruisecontrol>
+ <project name="qpid-java-jmstck"
+ buildafterfailed="false">
+
+ <listeners>
+ <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
+ </listeners>
+
+ <modificationset quietperiod="30">
+ <buildstatus logdir="logs/qpid-cpp-trunk/"/>
+ <buildstatus logdir="logs/qpid-java-trunk/"/>
+ </modificationset>
+
+ <schedule>
+ <ant target="tck"
+ uselogger="false"
+ time="0000"
+ timeout="3600"
+ antworkingdir="scripts">
+ </ant>
+ </schedule>
+
+ <publishers>
+ <artifactspublisher dest="artifacts/${project.name}"
+ file="${env.TS_HOME}/tck1.log"/>
+ <artifactspublisher dest="artifacts/${project.name}"
+ file="${env.TS_HOME}/tck2.log"/>
+
+ <onfailure>
+ <artifactspublisher dest="artifacts/${project.name}"
+ file="${env.CC_HOME}/jmstck-broker.log"/>
+ </onfailure>
+
+ <email subjectprefix="RHEL5/64" mailhost="localhost"
+ returnaddress="qpid-test-cruisecontrol@qpid-test.lab.bos.redhat.com"
+ buildresultsurl="http://qpid-test.lab.bos.redhat.com:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
+ spamwhilebroken="true">
+ <always address="amqp-list@redhat.com"/>
+ </email>
+ </publishers>
+ </project>
+</cruisecontrol>
diff --git a/cc/config/java-perftests.xml b/cc/config/java-perftests.xml
index 5b84710139..45e1b14b9f 100644
--- a/cc/config/java-perftests.xml
+++ b/cc/config/java-perftests.xml
@@ -26,51 +26,47 @@ under the License.
</listeners>
<bootstrappers>
- <svnbootstrapper localWorkingCopy="../java/perftests" />
+ <svnbootstrapper localWorkingCopy="../java/perftests"/>
</bootstrappers>
<modificationset quietperiod="30">
- <buildstatus logdir="logs/qpid-cpp-trunk/"/>
- <buildstatus logdir="logs/qpid-java-trunk/"/>
+ <buildstatus logdir="logs/qpid-cpp-trunk/"/>
+ <buildstatus logdir="logs/qpid-java-trunk/"/>
<svn localWorkingCopy="../java/perftests"/>
</modificationset>
<schedule interval="3600">
- <composite>
- <!-- 0.10 C++ broker -->
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/runbroker.sh"
- workingdir="../java" />
- <ant target="all-tests"
- uselogger="false"
- antworkingdir="../java/perftests">
- <jvmarg arg="-Xmx1024m"/>
- </ant>
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/stopbroker.sh"
- workingdir="../java"/>
- </composite>
- </schedule>
+ <composite>
+ <!-- 0.10 C++ broker -->
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/runbroker.sh"
+ workingdir="../java"/>
+ <ant target="all-tests"
+ uselogger="false"
+ antworkingdir="../java/perftests">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/stopbroker.sh"
+ workingdir="../java"/>
+ </composite>
+ </schedule>
<publishers>
+ <artifactspublisher dest="artifacts/${project.name}"
+ subdirectory="results"
+ dir="../java/perftests/results"/>
- <artifactspublisher dest="artifacts/${project.name}"
- subdirectory="results"
- dir="../java/perftests/results"/>
-<!--
- <email subjectprefix="CC report fro ${project.name}" mailhost="localhost"
- returnaddress="my_email"
- buildresultsurl="http://my_host:8080/buildresults/${project.name}"
- skipusers="false"
- reportsuccess="fixes"
+ <email subjectprefix="${mail.subject}: ${project.name}" mailhost="${mail.host}"
+ returnaddress="${mail.returnaddress}"
+ buildresultsurl="http://${env.HOSTNAME}:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
spamwhilebroken="true">
- <always address="email"/>
- <map alias="name" address="email"/>
+ <always address="${mail.list}"/>
</email>
--->
</publishers>
-
</project>
</cruisecontrol>
diff --git a/cc/config/java-trunk.xml b/cc/config/java-trunk.xml
index 5fdfb39a41..9163a51b54 100644
--- a/cc/config/java-trunk.xml
+++ b/cc/config/java-trunk.xml
@@ -26,111 +26,106 @@ under the License.
</listeners>
<bootstrappers>
- <svnbootstrapper localWorkingCopy="../java" />
- <svnbootstrapper localWorkingCopy="../gentools" />
+ <svnbootstrapper localWorkingCopy="../java"/>
+ <svnbootstrapper localWorkingCopy="../gentools"/>
</bootstrappers>
<modificationset quietperiod="30">
- <buildstatus logdir="logs/qpid-cpp-trunk/"/>
- <buildstatus logdir="logs/bdbstore-cpp-trunk/"/>
+ <buildstatus logdir="logs/qpid-cpp-trunk/"/>
+ <buildstatus logdir="logs/bdbstore-cpp-trunk/"/>
<svn localWorkingCopy="../java"/>
<svn localWorkingCopy="../gentools"/>
</modificationset>
<schedule interval="3600">
- <composite>
-
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/javaconfig.sh"
- workingdir="../java" />
- <!-- in VM 0.8 -->
- <ant target="clean test"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- <property name="profile" value="java"/>
- </ant>
-
- <ant target="report"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- </ant>
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/javareport.sh 08"
- workingdir="../java" />
-
- <!-- cpp -->
- <ant target="test"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- <property name="profile" value="cpp"/>
- </ant>
- <ant target="report"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- </ant>
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/javareport.sh cpp"
- workingdir="../java" />
-
- <!-- cpp no prefetch -->
- <ant target="test"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- <property name="profile" value="cpp.noprefetch"/>
- </ant>
- <ant target="report"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- </ant>
- <exec timeout="1800"
- command="/bin/bash"
- args="../cc/scripts/javareport.sh cpp-noprefetch"
- workingdir="../java" />
-
- <!-- make the release
- <ant target="release"
- uselogger="false"
- antworkingdir="../java">
- <jvmarg arg="-Xmx1024m"/>
- </ant>
- -->
- </composite>
- </schedule>
+ <composite>
+
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/javaconfig.sh"
+ workingdir="../java"/>
+ <!-- in VM 0.8 -->
+ <ant target="clean test"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+
+ <ant target="report"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/javareport.sh 08"
+ workingdir="../java"/>
+
+ <!-- cpp -->
+ <ant target="test"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ <property name="profile" value="cpp"/>
+ </ant>
+ <ant target="report"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/javareport.sh cpp"
+ workingdir="../java"/>
+
+ <!-- cpp no prefetch -->
+ <ant target="test"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ <property name="profile" value="cpp.noprefetch"/>
+ </ant>
+ <ant target="report"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+ <exec timeout="1800"
+ command="/bin/bash"
+ args="../cc/scripts/javareport.sh cpp-noprefetch"
+ workingdir="../java"/>
+
+ <!-- make the release
+ <ant target="release"
+ uselogger="false"
+ antworkingdir="../java">
+ <jvmarg arg="-Xmx1024m"/>
+ </ant>
+ -->
+ </composite>
+ </schedule>
<publishers>
+ <artifactspublisher dest="artifacts/${project.name}"
+ subdirectory="report_08"
+ dir="../java/build/report_08"/>
- <artifactspublisher dest="artifacts/${project.name}"
- subdirectory="report_08"
- dir="../java/build/report_08"/>
-
- <artifactspublisher dest="artifacts/${project.name}"
- subdirectory="report_cpp"
- dir="../java/build/report_cpp"/>
+ <artifactspublisher dest="artifacts/${project.name}"
+ subdirectory="report_cpp"
+ dir="../java/build/report_cpp"/>
<artifactspublisher dest="artifacts/${project.name}"
subdirectory="report_cpp-noprefetch"
dir="../java/build/report_cpp-noprefetch"/>
-<!--
- <email subjectprefix="CC report fro ${project.name}" mailhost="localhost"
- returnaddress="my_email"
- buildresultsurl="http://my_host:8080/buildresults/${project.name}"
- skipusers="false"
- reportsuccess="fixes"
+
+ <email subjectprefix="${mail.subject}: ${project.name}" mailhost="${mail.host}"
+ returnaddress="${mail.returnaddress}"
+ buildresultsurl="http://${env.HOSTNAME}:8080/buildresults/${project.name}"
+ skipusers="false"
+ reportsuccess="fixes"
spamwhilebroken="true">
- <always address="email"/>
- <map alias="name" address="email"/>
+ <always address="${mail.list}"/>
</email>
--->
</publishers>
-
</project>
</cruisecontrol>
diff --git a/cc/config/java/cpp.noprefetch.testprofile b/cc/config/java/cpp.noprefetch.testprofile
index 3654e271dc..d4176e9efd 100644
--- a/cc/config/java/cpp.noprefetch.testprofile
+++ b/cc/config/java/cpp.noprefetch.testprofile
@@ -1,18 +1,4 @@
broker.version=0-10
broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-java.naming.provider.url=${project.root}/test-provider.properties
max_prefetch=0
-test.excludes=true
-test.excludesfile=${project.root}/cppNoPrefetchExcludeList
-log=info
-amqj.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=systests \ No newline at end of file
+test.excludesfile=${project.root}/cppNoPrefetchExcludeList \ No newline at end of file
diff --git a/cc/config/java/cpp.testprofile b/cc/config/java/cpp.testprofile
index 15db7f93bc..7dcf75bac9 100644
--- a/cc/config/java/cpp.testprofile
+++ b/cc/config/java/cpp.testprofile
@@ -1,18 +1,3 @@
broker.version=0-10
broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-java.naming.provider.url=${project.root}/test-provider.properties
-max_prefetch=1000
-test.excludes=true
-test.excludesfile=${project.root}/cppExcludeList
-log=info
-amqj.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=systests
+test.excludesfile=${project.root}/010ExcludeList-store
diff --git a/cc/config/java/cppExcludeList b/cc/config/java/cppExcludeList
deleted file mode 100644
index ff93dd00b8..0000000000
--- a/cc/config/java/cppExcludeList
+++ /dev/null
@@ -1,15 +0,0 @@
-org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
-org.apache.qpid.client.ResetMessageListenerTest#*
-// those tests should be run with prefetch off
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
-// those tests need durable subscribe states to be persisted
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
-// the 0.10 c++ broker does not implement forget
-org.apache.qpid.test.unit.xa.FaultTest#testForget
-// removed because of bug 445500
-// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityAUTOACK
-// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACKSessionPerConnection \ No newline at end of file
diff --git a/cc/config/java/cppNoPrefetchExcludeList b/cc/config/java/cppNoPrefetchExcludeList
index 173d837ab1..311c94d5ec 100644
--- a/cc/config/java/cppNoPrefetchExcludeList
+++ b/cc/config/java/cppNoPrefetchExcludeList
@@ -1,18 +1,51 @@
-// those tests use 0.8 semantics
org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
org.apache.qpid.client.ResetMessageListenerTest#*
org.apache.qpid.test.unit.transacted.TransactedTest#testRollback
// those tests need durable subscribe states to be persisted
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
+//These tests are for the java broker
+org.apache.qpid.server.security.acl.SimpleACLTest#*
+org.apache.qpid.server.plugins.PluginTest#*
// This test is not finished
org.apache.qpid.test.testcases.TTLTest#*
+// 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#*
+// Those tests are testing 0.8 specific semantics
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
+org.apache.qpid.test.client.FlowControlTest#*
+org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges
+org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
// the 0.10 c++ broker does not implement forget
org.apache.qpid.test.unit.xa.FaultTest#testForget
-// See Bug 443031
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-// removed because of bug 445500
-// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityAUTOACK
-// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACKSessionPerConnection
-// trace sent to Gordon
-// org.apache.qpid.test.unit.basic.SelectorTest#* \ No newline at end of file
+// 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
+//this test checks explicitly for 0-8 flow control semantics
+org.apache.qpid.test.client.FlowControlTest
+// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail.
+org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection
+
diff --git a/cc/config/java/java.testprofile b/cc/config/java/java.testprofile
deleted file mode 100644
index 6f988dc261..0000000000
--- a/cc/config/java/java.testprofile
+++ /dev/null
@@ -1,17 +0,0 @@
-broker.version=0-8
-broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
-java.naming.provider.url=${project.root}/test-provider.properties
-test.excludes=true
-test.excludesfile=${project.root}/javaExcludeList
-log=info
-max_prefetch=1000
-amqj.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file:///${project.root}/log4j-test.xml
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=systests \ No newline at end of file
diff --git a/cc/config/java/javaExcludeList b/cc/config/java/javaExcludeList
deleted file mode 100644
index 5e5bf715ad..0000000000
--- a/cc/config/java/javaExcludeList
+++ /dev/null
@@ -1,13 +0,0 @@
-org.apache.qpid.test.unit.xa.QueueTest#*
-org.apache.qpid.test.unit.xa.TopicTest#*
-org.apache.qpid.test.unit.xa.FaultTest#*
-org.apache.qpid.test.unit.ct.DurableSubscriberTests#*
-// those tests are failing see: QPID-
-org.apache.qpid.test.unit.topic.TopicSessionTest#testNoLocal
-// known issue
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurableWithInvalidSelector
-// Those tests are not finished
-org.apache.qpid.test.testcases.TTLTest#*
-org.apache.qpid.test.testcases.FailoverTest#*
-// See qpid-1144
-org.apache.qpid.test.testcases.ImmediateMessageTest#*
diff --git a/cc/config/java/jndi.properties b/cc/config/java/jndi.properties
new file mode 100644
index 0000000000..c7e5f84d5a
--- /dev/null
+++ b/cc/config/java/jndi.properties
@@ -0,0 +1,21 @@
+java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
+
+connectionfactory.QueueConnectionFactory = amqp://username:password@topicClientid/test?brokerlist='tcp://localhost:qpid_port'
+connectionfactory.TopicConnectionFactory = amqp://username:password@topicClientid/test?brokerlist='tcp://localhost:qpid_port'
+connectionfactory.jms/DURABLE_SUB_CONNECTION_FACTORY = amqp://username:password@duralbeTopicClientid/test?brokerlist='tcp://localhost:qpid_port'
+connectionfactory.jms/MyTopicConnectionFactory = amqp://username:password@myTopicClientid/test?brokerlist='tcp://localhost:qpid_port'
+connectionfactory.jms/TopicConnectionFactory = amqp://username:password@jmsTopicClientid/test?brokerlist='tcp://localhost:qpid_port'
+
+queue.MY_QUEUE=MY_QUEUE
+queue.MY_QUEUE2=MY_QUEUE2
+queue.testQ0=testQ0
+queue.testQ1=testQ1
+queue.testQ2=testQ2
+queue.testQueue2=testQueue2
+queue.Q2=Q2
+
+topic.MY_TOPIC=MY_TOPIC
+topic.MY_TOPIC1=MY_TOPIC1
+
+destination.direct = direct://amq.direct//directQueue
+
View Lorry Controller Status