[jbossws-commits] JBossWS SVN: r2132 - in trunk: build/ant-import and 29 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 05:59:18 -0500 (Fri, 26 Jan 2007) New Revision: 2132 Added: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt Removed: trunk/build/hudson/hudson-home/jobs/AS-5.x/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBossWS-TRUNK/ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant.properties.example trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml trunk/build/version.properties trunk/integration-tomcat/build.xml trunk/jbossws-core/src/main/resources/samples/ant.properties.example trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Merge hudson setup from branch Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-hudson.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -66,6 +66,9 @@ <exec executable="basename" outputproperty="svn.basename"> <arg value="${svn.url}"/> </exec> + <exec executable="dirname" outputproperty="svn.basedir.local"> + <arg value="${basedir}"/> + </exec> <!-- Configure Hudson --> <copy todir="${hudson.home}" overwrite="true"> @@ -74,6 +77,7 @@ </fileset> <filterset> <filter token="version.id" value="${version.id}"/> + <filter token="svn.basedir.local" value="${svn.basedir.local}"/> <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> <filter token="hudson.home" value="${hudson.home}"/> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-samples.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -67,6 +67,7 @@ </copy> <copy todir="${build.src.samples.dir}/common/resources"> <fileset dir="${core.samples.dir}/common"> + <include name="tests-*-excludes.txt"/> <include name="jndi.properties"/> <include name="log4j.xml"/> </fileset> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-setup.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -59,6 +59,7 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> + <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant.properties.example 2007-01-26 10:59:18 UTC (rev 2132) @@ -19,27 +19,7 @@ tomcat.manager.username=manager tomcat.manager.password=manager -<<<<<<< .working # Hudson QA Environment -hudson.root=/home/tdiesler/workspac -hudson.port=8180 - -hudson.jdk15=/usr/java/jdk1.5 -hudson.jdk14=/usr/java/jdk1.4 - -hudson.jboss50.build=jboss-5.0.0.Beta2 -hudson.jboss42.build=jboss-4.2.0.CR1 -hudson.jboss40.build=jboss-4.0.5.SP1 - -hudson.jboss50.rev=HEAD -hudson.jboss42.rev=HEAD -hudson.jboss40.rev=HEAD - -hudson.mail.recipients=thomas.diesler(a)jboss.com -hudson.smtp.host=pobox-2.corp.redhat.com - -======= -# Hudson QA Environment hudson.root=/home/tdiesler/workspace hudson.port=8180 @@ -57,7 +37,6 @@ hudson.mail.recipients=thomas.diesler(a)jboss.com hudson.smtp.host=pobox-2.corp.redhat.com ->>>>>>> .merge-rechts.r2111 # JBoss Repository #jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository jboss.repository=http://repository.jboss.com Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -2,11 +2,136 @@ <hudson> <numExecutors>1</numExecutors> <useSecurity>false</useSecurity> - <systemMessage>&lt;!--a href=&quot;http://labs.jboss.com/portal/jbossws&quot;&gt;&...; -&lt;img src=&quot;http://labs.jboss.com/file-access/default/theme/images/spot... border=0/&gt;&#x0D; -&lt;/a--&gt;</systemMessage> <jdks/> <slaves/> <quietPeriod>5</quietPeriod> - <views/> + <views> + + <!-- JBossAS Testsuite --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBAS-Tests-AS-4.0</string> + <string>JBAS-Tests-AS-4.0-jdk14</string> + <string>JBAS-Tests-AS-4.2</string> + <string>JBAS-Tests-AS-5.0</string> + </jobNames> + <name>JBossAS Testsuite</name> + <description> +<![CDATA[ + Run the JBossAS webservice testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + + <!-- JBossWS Local Testsuite --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Local-Sanity-AS-5.0</string> + <string>JBWS-Local-Sanity-AS-4.2</string> + <string>JBWS-Local-Tests-AS-5.0</string> + <string>JBWS-Local-Tests-AS-4.2</string> + </jobNames> + <name>JBossWS Local Testsuite</name> + <description> +<![CDATA[ + Run the JBossWS local testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + + <!-- JBossWS Testsuite --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Tests-AS-4.0</string> + <string>JBWS-Tests-AS-4.0-jdk14</string> + <string>JBWS-Tests-AS-4.2</string> + <string>JBWS-Tests-AS-5.0</string> + <string>JBWS-Tests-TC-5.5</string> + </jobNames> + <name>JBossWS Testsuite</name> + <description> +<![CDATA[ + Run the JBossWS testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + + <!-- JBossWS Samples --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Samples-AS-4.0</string> + <string>JBWS-Samples-AS-4.0-jdk14</string> + <string>JBWS-Samples-AS-4.2</string> + <string>JBWS-Samples-AS-5.0</string> + <string>JBWS-Samples-TC-5.5</string> + </jobNames> + <name>JBossWS Samples</name> + <description> +<![CDATA[ + Run the JBossWS samples. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + + <!-- Release QA --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>Release-Matrix-Step1</string> + <string>Release-Matrix-Step2</string> + </jobNames> + <name>Release QA</name> + <description> +<![CDATA[ +A collection of jobs that covers the JBossWS release matrix. +<p/> +<table border=1> +<tr><th>&nbsp;</th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr> +<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> +<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +</table> +]]> + </description> + </view> + + <!-- Target Container --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>AS-4.0</string> + <string>AS-4.0-jdk14</string> + <string>AS-4.2</string> + <string>AS-5.0</string> + <string>TC-5.5</string> + </jobNames> + <name>Target Container</name> + <description> +<![CDATA[ + Build the supported target container. A successful build is a prerequisite for any testrun that targets the container. +]]> + </description> + </view> + + </views> </hudson> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.0 webservice testsuite agains jbossws-@version.id(a)&lt;/description&gt; - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -53,94 +52,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.0 webservice testsuite agains jbossws-@version.id(a)&lt;/description&gt; - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.0-jdk14 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40-jdk14 - -export JAVA_HOME=(a)hudson.jdk14@ - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -175,4 +86,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.2 webservice testsuite agains jbossws-@version.id(a)&lt;/description&gt; - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-5.0 webservice testsuite agains jbossws-@version.id(a)&lt;/description&gt; - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Sanity-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT main tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-4.2 - &lt;p/&gt; - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Sanity-AS-4.2 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT deploy-jboss42 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT main tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-4.2 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Sanity-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT main tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-5.0 - &lt;p/&gt; - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Sanity-AS-5.0 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT deploy-jboss50 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT main tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-5.0 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Tests-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT clean deploy-jboss42 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-4.2 - &lt;p/&gt; - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Tests-AS-4.2 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT clean deploy-jboss42 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-4.2 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Tests-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT clean deploy-jboss50 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-5.0 - &lt;p/&gt; - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Tests-AS-5.0 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT clean deploy-jboss50 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-5.0 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-4.0 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; - -JBOSS_INSTANCE=$JBOSS40_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss40 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.2</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-4.2 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; - -JBOSS_INSTANCE=$JBOSS42_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss42 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-5.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-5.0 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; - -JBOSS_INSTANCE=$JBOSS50_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss50 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -10,79 +9,6 @@ MODULE=JBWS-Samples-TC-5.5 WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT=&quot;-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop tomcat -# -$TOMCAT_INSTANCE/bin/catalina.sh stop - -# -# deploy to jboss -# -ant $ENVIRONMENT clean deploy-tomcat - -# -# start jbossas -# -$TOMCAT_INSTANCE/bin/catalina.sh start -sleep 10 - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests-samples - -# -# stop tomcat -# -$TOMCAT_INSTANCE/bin/catalina.sh stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against TC-5.5</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-TC-5.5 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ @@ -148,4 +74,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -40,7 +40,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -39,7 +39,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean main tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -14,7 +14,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Build the relase matrix target container</description> + <description>Build the relase matrix target containers.</description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"/> @@ -7,29 +6,6 @@ <childProjects> JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, - JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0-jdk14, JBWS-Samples-TC-5.5 - </childProjects> - </hudson.tasks.BuildTrigger> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the entire JBossWS relase matrix</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"/> - <publishers class="vector"> - <hudson.tasks.BuildTrigger> - <childProjects> - JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, - JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5 </childProjects> </hudson.tasks.BuildTrigger> @@ -44,4 +20,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -7,16 +7,22 @@ # Module settings # MODULE=TC-5.5 -HUDSON_HOME=(a)hudson.home@ WORKSPACE=`pwd` # # copy tomcat installation # -cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE -rm -rf $WORKSPACE/apache-tomcat/webapps/hudson.war +rm -rf $WORKSPACE/apache-tomcat +cp -r @hudson.home@/../apache-tomcat $WORKSPACE +rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* rm -rf $WORKSPACE/apache-tomcat/work rm -rf $WORKSPACE/apache-tomcat/temp + +# +# copy tomcat config +# +cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf +cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf </command> </hudson.tasks.Shell> </builders> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace) Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,52 +0,0 @@ - -<Server port="8006" shutdown="SHUTDOWN"> - - <!-- Comment these entries out to disable JMX MBeans support used for the - administration web application --> - <Listener className="org.apache.catalina.core.AprLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> - <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> - - <!-- Global JNDI resources --> - <GlobalNamingResources> - - <!-- Test entry for demonstration purposes --> - <Environment name="simpleValue" type="java.lang.Integer" value="30"/> - - <!-- Editable user database that can also be used by - UserDatabaseRealm to authenticate users --> - <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" - factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/> - - </GlobalNamingResources> - - <!-- Define the Tomcat Stand-Alone Service --> - <Service name="Catalina"> - - <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="8080" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100" - connectionTimeout="20000" disableUploadTimeout="true"/> - - - <!-- Define the top level container in our container hierarchy --> - <Engine name="Catalina" defaultHost="localhost"> - - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/> - - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> - <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - - </Host> - - </Engine> - - </Service> - -</Server> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,52 @@ + +<Server port="8006" shutdown="SHUTDOWN"> + + <!-- Comment these entries out to disable JMX MBeans support used for the + administration web application --> + <Listener className="org.apache.catalina.core.AprLifecycleListener"/> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> + <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> + + <!-- Global JNDI resources --> + <GlobalNamingResources> + + <!-- Test entry for demonstration purposes --> + <Environment name="simpleValue" type="java.lang.Integer" value="30"/> + + <!-- Editable user database that can also be used by + UserDatabaseRealm to authenticate users --> + <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/> + + </GlobalNamingResources> + + <!-- Define the Tomcat Stand-Alone Service --> + <Service name="Catalina"> + + <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --> + <Connector port="8080" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100" + connectionTimeout="20000" disableUploadTimeout="true"/> + + + <!-- Define the top level container in our container hierarchy --> + <Engine name="Catalina" defaultHost="localhost"> + + <!-- This Realm uses the UserDatabase configured in the global JNDI + resources under the key "UserDatabase". Any edits + that are performed against this UserDatabase are immediately + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/> + + <!-- Define the default virtual host + Note: XML Schema validation will not work with Xerces 2.2. + --> + <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> + + </Host> + + </Engine> + + </Service> + +</Server> Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<tomcat-users> - <role rolename="manager"/> - <user username="manager" password="manager" roles="manager"/> -</tomcat-users> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='utf-8'?> +<tomcat-users> + <role rolename="manager"/> + <user username="manager" password="manager" roles="manager"/> +</tomcat-users> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/version.properties 2007-01-26 10:59:18 UTC (rev 2132) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.2.0.GA -repository.id=1.2.0.GA +version.id=2.0.0.CR3 +repository.id=snapshot implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/integration-tomcat/build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -144,12 +144,12 @@ <include name="xercesImpl.jar"/> </fileset> </copy> - <copy todir="${tomcat.common.dir}/lib" overwrite="true"> + <copy todir="${tomcat.common.lib}" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> </fileset> <fileset dir="${tomcat.output.lib.dir}"> <include name="jbossws-tomcat-integration.jar"/> Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-26 10:59:18 UTC (rev 2132) @@ -14,8 +14,8 @@ # Tomcat Home tomcat.home=/usr/java/tomcat -#tomcat.manager.username=manager -#tomcat.manager.password=manager +tomcat.manager.username=manager +tomcat.manager.password=manager # Force thirdparty HTTP get #force.thirdparty.get=true Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -71,6 +71,7 @@ <pathelement location="${lib.dir}/jboss-jaxws.jar"/> <pathelement location="${lib.dir}/jboss-saaj.jar"/> <pathelement location="${lib.dir}/jbossws-client.jar"/> + <pathelement location="${lib.dir}/jbossws-tomcat-integration.jar"/> </path> <path id="compile.classpath"> Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -37,19 +37,19 @@ </condition> <!-- Integration Target Server --> - <condition property="jbossws.integration.target.jboss"> + <condition property="integration.target.jboss"> <isset property="jboss.home"/> </condition> - <condition property="jbossws.integration.target.tomcat"> + <condition property="integration.target.tomcat"> <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> </condition> <!-- Java Endorsed --> <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> + <isset property="integration.target.jboss"/> </condition> <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> </condition> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME @@ -112,7 +112,7 @@ </target> <!-- Check JBoss --> - <target name="check-jboss"> + <target name="check-jboss" if="integration.target.jboss"> <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/> @@ -123,15 +123,19 @@ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="tests-jboss-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target> <!-- Check tomcat --> - <target name="check-tomcat" if="jbossws.integration.target.tomcat"> + <target name="check-tomcat" if="integration.target.tomcat"> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> <condition property="cannot.use.tomcat"> <and> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> <not> <isset property="tomcat.available"/> </not> @@ -139,12 +143,16 @@ </condition> <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="tests-tomcat-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target> <!-- Compile the java sources --> <target name="compile" depends="init,thirdparty" description="compile the sources"> - <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> + <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on" excludesfile="${excludesfile}"> <src path="${common.java}"/> <src path="${java.dir}"/> </javac> Copied: trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (from rev 2129, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt) =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (rev 0) +++ trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,2 @@ + +# Nothing to exclude Copied: trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (from rev 2129, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt) =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (rev 0) +++ trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,16 @@ + +# EJB/Injection excludes +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/** Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -128,12 +128,13 @@ </condition> <!-- Define excluded tests --> - <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"> - <not> + <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> + <or> <available file="${jboss.client}/jboss-ejb3-client.jar"/> - </not> + <isset property="integration.target.tomcat"/> + </or> </condition> - <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> <echo/> @@ -150,7 +151,9 @@ <!-- Init the various classpaths --> - <target name="init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> + + <target name="common-classpath" depends="prepare,thirdparty"> <!-- The combined compile classpath --> <path id="jbossws.jars.classpath"> @@ -179,7 +182,9 @@ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> </path> - + </target> + + <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.jars.classpath"/> @@ -200,6 +205,16 @@ </path> </target> + <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + <!-- The test client classpath --> + <path id="test.client.classpath"> + <path refid="jbossws.jars.classpath"/> + <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <path refid="javac.classpath"/> + </path> + </target> + + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-26 10:59:18 UTC (rev 2132) @@ -23,23 +23,31 @@ // $Id: SysmonTestCase.java 1994 2007-01-18 12:54:34Z heiko.braun(a)jboss.com $ +import java.io.File; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.addressing.AddressingProperties; + import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.jaxws.*; -import org.jboss.ws.core.StubExt; +import org.jboss.ws.extensions.eventing.jaxws.DeliveryType; +import org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.FilterType; +import org.jboss.ws.extensions.eventing.jaxws.GetStatus; +import org.jboss.ws.extensions.eventing.jaxws.Subscribe; +import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; +import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe; -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.addressing.AddressingProperties; -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; - /** * Test the eventing example service. * @@ -69,23 +77,15 @@ if (subscriptionPort == null || managementPort == null) { - if (isTargetJBoss()) - { - URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); - QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService"); + URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); + QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService"); - Service service = Service.create(wsdlURL, defaultServiceName); - subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); - managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); + Service service = Service.create(wsdlURL, defaultServiceName); + subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); + managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); - ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); - ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); - } - else - { - - throw new IllegalArgumentException("JBossAS is the only supported target"); - } + ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); + ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); } } @@ -103,12 +103,9 @@ */ public void testUnsubscribe() throws Exception { - SubscribeResponse subscribeResponse = doSubscribe(null); //SysmonUtil.printSubscriptionDetails(subscribeResponse); - String subscriptionID = subscribeResponse.getSubscriptionId(); - // addressing correlation AddressingProperties unsubscribeProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.UNSUBSCRIBE_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, unsubscribeProps); @@ -117,9 +114,12 @@ AddressingProperties getStatusProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.GET_STATUS_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, getStatusProps); - try { + try + { managementPort.getStatusOp(new GetStatus()); - } catch (Exception e) { + } + catch (Exception e) + { // Ignore return; } Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,12 +1,24 @@ +# Always excludes +org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxws/benchmark/** + +# EJB/Injection excludes org/jboss/test/ws/jaxrpc/jbws1011/** -org/jboss/test/ws/jaxrpc/samples/dynamichandler/** -org/jboss/test/ws/jaxrpc/samples/jmstransport/** -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** -org/jboss/test/ws/jaxrpc/samples/secureejb/** -org/jboss/test/ws/jaxrpc/samples/wsbpel/** -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* -org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.* org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/** org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/webserviceref/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/**