Author: thomas.diesler(a)jboss.com Date: 2007-01-27 15:30:01 -0500 (Sat, 27 Jan 2007) New Revision: 2170 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml branches/jbossws-1.2.0/integration-jboss50/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt Log: Exclude merged AS tests for jboss50 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-27 20:30:01 UTC (rev 2170) @@ -31,17 +31,17 @@ ant $ENVIRONMENT clean deploy-jboss40 # +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# # 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 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-27 20:30:01 UTC (rev 2170) @@ -33,17 +33,17 @@ export JAVA_HOME=(a)hudson.jdk14@ # +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# # 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 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-27 20:30:01 UTC (rev 2170) @@ -31,17 +31,17 @@ ant $ENVIRONMENT clean deploy-jboss42 # +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# # 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 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-27 20:30:01 UTC (rev 2170) @@ -31,17 +31,17 @@ ant $ENVIRONMENT clean deploy-jboss50 # +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# # 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 Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-27 20:30:01 UTC (rev 2170) @@ -141,8 +141,6 @@ <!-- Deploy jbossws to jboss50 --> <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> - <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -175,6 +173,10 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> + <!-- Copy jboss-xml-binding.jar --> + <copy todir="${jboss50.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-27 19:44:23 UTC (rev 2169) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-27 20:30:01 UTC (rev 2170) @@ -1,7 +1,18 @@ # Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/interop.** +org/jboss/test/ws/jaxrpc/benchmark.** +org/jboss/test/ws/jaxws/benchmark.** +# Resolve before JBoss50 goes final +org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* +org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* +org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* +org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* +org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.* +org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.* +org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* +org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* +org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* +