Author: thomas.diesler(a)jboss.com Date: 2007-05-23 03:28:11 -0400 (Wed, 23 May 2007) New Revision: 3202 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-testsuite.xml Log: Include wstx in SunRI classpath Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT clean deploy-jboss42 +ant $ENVIRONMENT clobber deploy-jboss42 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT clean deploy-jboss50 +ant $ENVIRONMENT clobber deploy-jboss50 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT clean deploy-jboss42 +ant $ENVIRONMENT clobber deploy-jboss42 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT clean deploy-jboss50 +ant $ENVIRONMENT clobber deploy-jboss50 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # Build jbws-jboss42 # cd $JBWSDIR/integration/jbws -ant $ENVIRONMENT clean deploy-jboss42 +ant $ENVIRONMENT clobber deploy-jboss42 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # Build deploy-jboss50 # cd $JBWSDIR/integration/jbws -ant $ENVIRONMENT clean deploy-jboss50 +ant $ENVIRONMENT clobber deploy-jboss50 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # Build sunri-jboss50 # cd $JBWSDIR/integration/sunri -ant $ENVIRONMENT clean deploy-jboss50 +ant $ENVIRONMENT clobber deploy-jboss50 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -28,7 +28,7 @@ # Build xfire # cd $JBWSDIR/integration/xfire -ant $ENVIRONMENT clean deploy-jboss50 +ant $ENVIRONMENT clobber deploy-jboss50 # # start jbossas Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -40,6 +40,9 @@ <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"/> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -24,7 +24,7 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="tests-init" depends="jars,tests-classpath"> + <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> @@ -41,6 +41,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> </path> <path id="tests.extra.classpath"> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -62,6 +62,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -40,6 +40,9 @@ <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 07:28:11 UTC (rev 3202) @@ -24,7 +24,7 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="tests-init" depends="jars,tests-classpath"> + <target name="tests-init" depends="tests-classpath"> <!-- Cannot use XFire client @@ -47,6 +47,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> </path> <path id="xfire.classpath">