You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/07/23 17:02:22 UTC
svn commit: r679105 - in /incubator/qpid/trunk/qpid: cc/ cc/config/
cc/config/java/ cc/scripts/ java/
Author: arnaudsimon
Date: Wed Jul 23 08:02:22 2008
New Revision: 679105
URL: http://svn.apache.org/viewvc?rev=679105&view=rev
Log:
qpid-1157: added jms tck scripts + README file + config file for setting email related properties
Added:
incubator/qpid/trunk/qpid/cc/README
incubator/qpid/trunk/qpid/cc/config.properties
incubator/qpid/trunk/qpid/cc/config/cpp-perftests.xml
- copied unchanged from r678397, incubator/qpid/trunk/qpid/cc/config/cpp-trunk-perftests.xml
incubator/qpid/trunk/qpid/cc/config/java-jmstck.xml
incubator/qpid/trunk/qpid/cc/config/java/jndi.properties
incubator/qpid/trunk/qpid/cc/scripts/javajmstck.sh
Removed:
incubator/qpid/trunk/qpid/cc/config/cpp-trunk-perftests.xml
incubator/qpid/trunk/qpid/cc/config/java/cppExcludeList
incubator/qpid/trunk/qpid/cc/config/java/java.testprofile
incubator/qpid/trunk/qpid/cc/config/java/javaExcludeList
Modified:
incubator/qpid/trunk/qpid/cc/config.xml
incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml
incubator/qpid/trunk/qpid/cc/config/cpp-trunk.xml
incubator/qpid/trunk/qpid/cc/config/example-automation.xml
incubator/qpid/trunk/qpid/cc/config/java-perftests.xml
incubator/qpid/trunk/qpid/cc/config/java-trunk.xml
incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile
incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList
incubator/qpid/trunk/qpid/cc/scripts/build.xml
incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh
incubator/qpid/trunk/qpid/java/010ExcludeList
incubator/qpid/trunk/qpid/java/010ExcludeList-store
Added: incubator/qpid/trunk/qpid/cc/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/README?rev=679105&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cc/README (added)
+++ incubator/qpid/trunk/qpid/cc/README Wed Jul 23 08:02:22 2008
@@ -0,0 +1,58 @@
+******************
+Prerequisites
+******************
+Check out the source
+see http://cwiki.apache.org/qpid/building.html
+
+******************
+Install CruiseControl
+******************
+
+Download CruiseControl from: http://cruisecontrol.sourceforge.net/
+
+ * Unzip the release to a directory, for example ~/cruisecontrol-bin-2.7.2
+ * Check that the scripts cruisecontrol-bin-2.7.2/cruisecontrol.sh and cruisecontrol-bin-2.7.2/apache-ant-1.7.0/bin/ant have execution permission.
+ * Make sure your directory ~/.ant/lib contains the following jars:
+ o The ant jar files that can be found in cruisecontrol-bin-2.7.2/apache-ant-1.7.0/lib/
+ o xalan-2.7.0.jar
+
+******************
+Set system variables
+******************
+
+Prior to use CruiseControl you'll need to set two system variables:
+Variable Value
+CC_HOME path to your qpid project, for example /home/foo/projects/qpid
+CPPSTORE_HOME path to your C++ store, for example /home/foo/projects/bdbstore-cpp
+
+Edit the file CC_HOME/config.properties and set the properties so to match your system requirements.
+Notes
+ * the cpp store can be checked out from: https://svn.jboss.org/repos/rhmessaging/store/trunk/cpp
+ * Only unix scrips are currently provided
+
+******************
+Running CruiseControl
+******************
+
+Run cruisecontrol-bin-2.7.2/cruisecontrol.sh from CC_HOME/cc
+
+******************
+Running the Sun java TCK
+******************
+
+If you wish to run the Sun JMS TCK, follow those two steps:
+* Extract the TCK
+* (As required by the TCK) Set TS_HOME to the location where the JMS TCK has been installed.
+
+******************
+Projects
+******************
+
+Project Description
+qpid-cpp-trunk Builds and tests the C++ broker
+qpid-cpp-trunk-perftests Runs the C++ performance tests
+qpid-java-trunk Builds and runs the Java tests with an 0.8 inVM broker, a c++ broker without prefetch and a c++ broker with pre-fetch
+bdbstore-cpp-trunk Builds the C++ store (required for the Java tests)
+example-automation Runs all the example combinations for python, C++ and java
+java-perftests Runs the java performance tests
+java-jmstck Runs the java jms tck (see running the tck)
\ No newline at end of file
Added: incubator/qpid/trunk/qpid/cc/config.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config.properties?rev=679105&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config.properties (added)
+++ incubator/qpid/trunk/qpid/cc/config.properties Wed Jul 23 08:02:22 2008
@@ -0,0 +1,4 @@
+mail.subject=CC Report for
+mail.host=localhost
+mail.returnaddress=my-email
+mail.list=list
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/cc/config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config.xml Wed Jul 23 08:02:22 2008
@@ -18,10 +18,17 @@
-->
<cruisecontrol>
- <include.projects file="./config/cpp-trunk.xml"/>
- <include.projects file="./config/java-trunk.xml"/>
- <include.projects file="./config/bdbstore-cpp-trunk.xml"/>
- <include.projects file="./config/cpp-trunk-perftests.xml"/>
- <include.projects file="./config/example-automation.xml"/>
- <include.projects file="./config/java-perftests.xml"/>
+ <!-- Load environment variables -->
+ <property environment="env" toupper="true"/>
+
+ <!-- Set a collection of global properties from the properties file "config.properties" -->
+ <property file="config.properties"/>
+
+ <include.projects file="./config/cpp-trunk.xml"/>
+ <include.projects file="./config/java-trunk.xml"/>
+ <include.projects file="./config/bdbstore-cpp-trunk.xml"/>
+ <include.projects file="./config/cpp-perftests.xml"/>
+ <include.projects file="./config/example-automation.xml"/>
+ <include.projects file="./config/java-perftests.xml"/>
+ <include.projects file="./config/java-jmstck.xml"/>
</cruisecontrol>
Modified: incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml Wed Jul 23 08:02:22 2008
@@ -17,19 +17,15 @@
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 @@
<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>
Modified: incubator/qpid/trunk/qpid/cc/config/cpp-trunk.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/cpp-trunk.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/cpp-trunk.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/cpp-trunk.xml Wed Jul 23 08:02:22 2008
@@ -44,5 +44,16 @@
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>
Modified: incubator/qpid/trunk/qpid/cc/config/example-automation.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/example-automation.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/example-automation.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/example-automation.xml Wed Jul 23 08:02:22 2008
@@ -20,9 +20,6 @@
<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 @@
</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>
Added: incubator/qpid/trunk/qpid/cc/config/java-jmstck.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java-jmstck.xml?rev=679105&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java-jmstck.xml (added)
+++ incubator/qpid/trunk/qpid/cc/config/java-jmstck.xml Wed Jul 23 08:02:22 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/cc/config/java-perftests.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java-perftests.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java-perftests.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/java-perftests.xml Wed Jul 23 08:02:22 2008
@@ -26,51 +26,47 @@
</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"/>
-<!--
- <email subjectprefix="CC report fro ${project.name}" mailhost="localhost"
- returnaddress="my_email"
- buildresultsurl="http://my_host:8080/buildresults/${project.name}"
- skipusers="false"
- reportsuccess="fixes"
+ <artifactspublisher dest="artifacts/${project.name}"
+ subdirectory="results"
+ dir="../java/perftests/results"/>
+
+ <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>
Modified: incubator/qpid/trunk/qpid/cc/config/java-trunk.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java-trunk.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java-trunk.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/java-trunk.xml Wed Jul 23 08:02:22 2008
@@ -26,111 +26,106 @@
</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>
+ <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>
+ <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>
Modified: incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile Wed Jul 23 08:02:22 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile Wed Jul 23 08:02:22 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cppNoPrefetchExcludeList Wed Jul 23 08:02:22 2008
@@ -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
+
Added: incubator/qpid/trunk/qpid/cc/config/java/jndi.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/jndi.properties?rev=679105&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/jndi.properties (added)
+++ incubator/qpid/trunk/qpid/cc/config/java/jndi.properties Wed Jul 23 08:02:22 2008
@@ -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
+
Modified: incubator/qpid/trunk/qpid/cc/scripts/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/scripts/build.xml?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/scripts/build.xml (original)
+++ incubator/qpid/trunk/qpid/cc/scripts/build.xml Wed Jul 23 08:02:22 2008
@@ -19,8 +19,12 @@
<project name="run-tests" default="cpp-perftests" basedir=".">
-<target name="cpp-perftests">
- <exec executable="./cppbuild-perftests.sh" failonerror="true"/>
-</target>
-
+ <target name="cpp-perftests">
+ <exec executable="./cppbuild-perftests.sh" failonerror="true"/>
+ </target>
+
+ <target name="tck">
+ <exec executable="./javajmstck.sh"/>
+ </target>
+
</project>
Modified: incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh (original)
+++ incubator/qpid/trunk/qpid/cc/scripts/javaconfig.sh Wed Jul 23 08:02:22 2008
@@ -22,4 +22,7 @@
sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.noprefetch.testprofile > "$CC_HOME/java/"/cpp.noprefetch.testprofile
sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.testprofile > "$CC_HOME/java"/cpp.testprofile
cp $CC_HOME/cc/config/java/*ExcludeList $CC_HOME/java/.
-cp $CC_HOME/cc/config/java/java.testprofile $CC_HOME/java/.
\ No newline at end of file
+QPID_JARS=`find "$CC_HOME/java/build/lib" -name '*.jar' | tr '\n' ":"`
+QPID_JARS=local.classes=$QPID_JARS
+sed "s#local.classes=.*#$QPID_JARS#g" $TS_HOME/bin/build.properties > "$TS_HOME/bin"/build.properties-new
+mv $TS_HOME/bin/build.properties-new $TS_HOME/bin/build.properties
\ No newline at end of file
Added: incubator/qpid/trunk/qpid/cc/scripts/javajmstck.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/scripts/javajmstck.sh?rev=679105&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cc/scripts/javajmstck.sh (added)
+++ incubator/qpid/trunk/qpid/cc/scripts/javajmstck.sh Wed Jul 23 08:02:22 2008
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+cleanup(){
+ echo "kill any existing broker instance"
+ stopBroker
+ rm -rf $CC_HOME/jmstck-data/*
+}
+
+runBroker(){
+ echo "******************************************************"
+ echo "Starting C++ broker"
+ ulimit -c unlimited
+ $CC_HOME/cpp/src/qpidd -t -d --data-dir $CC_HOME/jmstck-data --load-module=$CPPSTORE_HOME/lib/.libs/libbdbstore.so --port 0 --auth no --log-output $CC_HOME/jmstck-broker.log --no-module-dir
+ export QPID_PORT=`grep "Listening on TCP port" $CC_HOME/jmstck-broker.log | tail -n 1 | awk '{print $8}'`
+ echo " broker running on port: " $QPID_PORT
+ echo "******************************************************"
+ sed "s/qpid_port/$QPID_PORT/g" $CC_HOME/cc/config/java/jndi.properties > "$TS_HOME/classes"/jndi.properties
+}
+
+runTck(){
+ echo "******************************************************"
+ echo "Starting the TCK for the $1 iteration"
+ echo "******************************************************"
+ cd $TS_HOME/bin
+ $TS_HOME/bin/tsant runclient -Dwork.dir=work -Dreport.dir=report 2&>1 > $TS_HOME/tck$1.log
+ echo "******************************************************"
+ echo "TCK finished the $1 iteration"
+ echo "******************************************************"
+}
+
+printResults(){
+ TESTS_STR=`grep -a "\[java\] Completed running [0-9]* tests" $TS_HOME/tck$1.log`
+ PASSED_STR=`grep -a "\[java\] Number of Tests Passed =" $TS_HOME/tck$1.log`
+ FAILED_STR=`grep -a "Some tests did not pass" $TS_HOME/tck$1.log`
+ echo "-----------------------------------------"
+ echo "TCK run #$1 results:"
+ echo $TESTS_STR
+ echo $PASSED_STR
+ echo $FAILED_STR
+ if [ "$FAILED_STR" != "" ]; then
+ echo "SOME TCK FAILURES DETECTED: "
+ fi
+ echo "------------------------------------------"
+}
+
+stopBroker(){
+ echo "************************"
+ echo "Stopping the C++ broker"
+ echo "************************"
+ $CC_HOME/cpp/src/qpidd -q -p $QPID_PORT
+}
+
+cleanup
+counter=0
+runBroker
+for j in 1 2
+do
+ counter=`expr $counter + 1`
+ runTck $counter
+ printResults $counter
+done
+cleanup
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList Wed Jul 23 08:02:22 2008
@@ -4,6 +4,7 @@
org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
+org.apache.qpid.test.unit.ack.AcknowledgeTest#*
// those tests need durable subscribe states to be persisted
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
// those tests require broker recovery
@@ -47,6 +48,8 @@
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
// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList-store
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList-store?rev=679105&r1=679104&r2=679105&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList-store (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList-store Wed Jul 23 08:02:22 2008
@@ -5,6 +5,7 @@
org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
+org.apache.qpid.test.unit.ack.AcknowledgeTest#*
// 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
@@ -27,6 +28,7 @@
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
@@ -41,6 +43,8 @@
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
// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation