Author: thomas.diesler(a)jboss.com Date: 2007-01-24 17:56:06 -0500 (Wed, 24 Jan 2007) New Revision: 2095 Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 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-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml Log: AS tests Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -76,6 +76,7 @@ <filter token="version.id" value="${version.id}"/> <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> + <filter token="hudson.home" value="${hudson.home}"/> <filtersfile file="${build.dir}/ant.properties"/> </filterset> </copy> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,10 +9,10 @@ MODULE=AS-4.0 SVNBASE=Branch_4_0 -if [ -d "$SVNBASE" ]; then - svn up -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE +if [ ! -d "$SVNBASE" ]; then + svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE else - svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn up fi cd $SVNBASE Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,10 +9,10 @@ MODULE=AS-4.0-jdk14 SVNBASE=Branch_4_0 -if [ -d "$SVNBASE" ]; then - svn up -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE +if [ ! -d "$SVNBASE" ]; then + svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE else - svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn up fi cd $SVNBASE Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,10 +9,10 @@ MODULE=AS-4.2 SVNBASE=Branch_4_2 -if [ -d "$SVNBASE" ]; then - svn up -r(a)hudson.jboss42.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE +if [ ! -d "$SVNBASE" ]; then + svn co -r(a)hudson.jboss42.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE else - svn co -r(a)hudson.jboss42.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn up fi cd $SVNBASE Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,10 +9,10 @@ MODULE=AS-5.0 SVNBASE=trunk -if [ -d "$SVNBASE" ]; then - svn up -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE +if [ ! -d "$SVNBASE" ]; then + svn co -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE else - svn co -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE + svn up fi cd $SVNBASE 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-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,11 +9,17 @@ MODULE=JBAS-Tests-AS-4.0 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ -SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME 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 # cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh @@ -27,6 +33,12 @@ ant $ENVIRONMENT deploy-jboss40 # +# build the testsuite +# +cd $JBOSS_INSTANCE/../../../testsuite +./build.sh main + +# # start jbossas # $JBOSS_INSTANCE/bin/jboss.sh start @@ -35,8 +47,7 @@ # # execute tests # -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh $ENVIRONMENT tests-webservice tests-report +./build.sh tests-webservice tests-report # # stop jbossas 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-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,11 +9,17 @@ MODULE=JBAS-Tests-AS-4.0-jdk14 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ -SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME JBOSS_INSTANCE=$HUDSON_HOME/jobs/AS-4.0/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 # cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh @@ -27,18 +33,23 @@ ant $ENVIRONMENT deploy-jboss40-jdk14 # +# build the testsuite +# +export JAVA_HOME=(a)hudson.jdk14@ +cd $JBOSS_INSTANCE/../../../testsuite +./build.sh main + +# # start jbossas # -export JAVA_HOME=(a)hudson.jdk14@ $JBOSS_INSTANCE/bin/jboss.sh start sleep 30 # # execute tests # -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh $ENVIRONMENT tests-webservice tests-report - +./build.sh tests-webservice tests-report + # # stop jbossas # 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-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,11 +9,17 @@ MODULE=JBAS-Tests-AS-4.2 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ -SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME 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 # cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh @@ -27,6 +33,12 @@ ant $ENVIRONMENT deploy-jboss42 # +# build the testsuite +# +cd $JBOSS_INSTANCE/../../../testsuite +./build.sh main + +# # start jbossas # $JBOSS_INSTANCE/bin/jboss.sh start @@ -35,8 +47,7 @@ # # execute tests # -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh $ENVIRONMENT tests-webservice tests-report +./build.sh tests-webservice tests-report # # stop jbossas 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-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -9,11 +9,17 @@ MODULE=JBAS-Tests-AS-5.0 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ -SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME -JBOSS_INSTANCE=$HUDSON_HOME/jobs/AS-5.0/workspace/trunk/bui@hudson.jboss50.build@.0.0.Beta2 +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME +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 # cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh @@ -27,6 +33,12 @@ ant $ENVIRONMENT deploy-jboss50 # +# build the testsuite +# +cd $JBOSS_INSTANCE/../../../testsuite +./build.sh main + +# # start jbossas # $JBOSS_INSTANCE/bin/jboss.sh start @@ -35,8 +47,7 @@ # # execute tests # -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh $ENVIRONMENT tests-webservice tests-report +./build.sh tests-webservice tests-report # # stop jbossas Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -321,6 +321,15 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> + <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> </target> <!-- Deploy jbossws to jboss40 jdk1.4 --> @@ -351,6 +360,16 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> + <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar"/> + </fileset> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -155,8 +155,15 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> - <!-- The JBossAS testsuite references jbossws-client.jar from thirdparty - <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/--> + <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-24 22:08:22 UTC (rev 2094) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-24 22:56:06 UTC (rev 2095) @@ -164,8 +164,15 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <!-- The JBossAS testsuite references jbossws-client.jar from thirdparty - <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/--> + <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> </target> <!-- ================================================================== -->