[jbossws-commits] JBossWS SVN: r3062 - in trunk: build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2 and 9 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 18:15:42 -0400 (Sat, 12 May 2007) New Revision: 3062 Modified: 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-Tests-AS-4.0.5/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/Release-Matrix-Step2/config.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbws-jboss42/ant-import/build-thirdparty.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/sunri-jboss50/ant-import/build-thirdparty.xml Log: Fix hudson AS runs 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-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # 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-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss42 # 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-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss50 # 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-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean 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.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean 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-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss42 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean tests 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-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -3,7 +3,21 @@ <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-AS-4.0.5, JBWS-Tests-AS-4.0.5-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.5, JBWS-Samples-TC-5.5</childProjects> + <childProjects> + JBWS-Tests-AS-5.0, + JBWS-Tests-AS-4.2, + JBWS-Tests-AS-4.0, + JBWS-Tests-AS-4.0.5, + JBWS-Tests-TC-5.5, + JBAS-Tests-AS-5.0, + JBAS-Tests-AS-4.2, + JBAS-Tests-AS-4.0, + JBWS-Samples-AS-5.0, + JBWS-Samples-AS-4.2, + JBWS-Samples-AS-4.0, + JBWS-Samples-AS-4.0.5, + JBWS-Samples-TC-5.5 + </childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -105,12 +105,12 @@ <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> - <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-thirdparty-classpath"> + <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-jars"> <!-- The compile classpath for jbossws core --> <path id="core.thirdparty.classpath"> <path refid="spi.thirdparty.classpath"/> - <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${core.thirdparty.dir}/activation.jar"/> Modified: trunk/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -49,13 +49,15 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> <!-- The compile classpath for jboss42 integration --> <path id="jbws42.integration.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes14"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -49,13 +49,15 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> <!-- The compile classpath for jboss50 integration --> <path id="jbws50.integration.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes14"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> Modified: trunk/sunri-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -81,12 +81,12 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="spi-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,spi-jars"> <!-- The compile classpath for jboss50 integration --> <path id="sunri50.integration.classpath"> <path refid="spi.thirdparty.classpath"/> - <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>