Author: thomas.diesler(a)jboss.com Date: 2007-01-23 19:30:28 -0500 (Tue, 23 Jan 2007) New Revision: 2055 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/ Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/build/build.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml Log: More hudson Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -111,8 +111,6 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - <echo message="${jbossws.svn.url}"/> - </target> </project> \ No newline at end of file Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -27,7 +27,6 @@ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> @@ -62,7 +61,6 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.2.0/build/build.xml =================================================================== --- branches/jbossws-1.2.0/build/build.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/build.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -61,11 +61,14 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> - <target name="hudson" depends="init" description="Setup the Hudson QA environment"> + <target name="hudson-setup" depends="init" description="Setup the Hudson QA environment"> <echo/> <echo message="hudson.root = ${hudson.root}"/> <echo/> + <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + <mkdir dir="${hudson.root}"/> <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> @@ -96,22 +99,44 @@ </filterset> </copy> - <mkdir dir="${build.output.dir}"/> - <exec executable="${hudson.tomcat}/bin/catalina.sh"> + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup sucessfuly *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> <arg line="stop"/> </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stoped sucessfuly *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init" description="Start the Hudson QA environment"> + + <mkdir dir="${build.output.dir}"/> <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log"> <arg line="start"/> </exec> <echo/> <echo message="*************************************"/> - <echo message="* Hudson sucessfuly started *"/> + <echo message="* Hudson started sucessfuly *"/> <echo message="* http://localhost:8180/hudson *"/> <echo message="*************************************"/> <echo/> </target> - </project> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -3,7 +3,7 @@ <builders class="vector"> <hudson.tasks.Shell> <command> -cd trunk +cd Branch_4_0 rm -f thirdparty/libraries.ent ./build/build.sh clean main </command> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -3,7 +3,7 @@ <builders class="vector"> <hudson.tasks.Shell> <command> -cd trunk +cd Branch_4_2 rm -f thirdparty/libraries.ent ./build/build.sh clean main </command> Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0 (from rev 2053, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2) Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-23 23:45:33 UTC (rev 2053) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -9,10 +9,10 @@ # # Module settings # -HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; -MODULE=&quot;JBossWS-AS-4.2&quot; +HUDSON_HOME=(a)hudson.home@ +MODULE=JBossWS-AS-4.0 WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # Assign the SVNDIR @@ -24,16 +24,20 @@ cp ant.properties.example ant.properties # -# deploy to jboss50 +# stop jbossas # -ant $ENVIRONMENT deploy-jboss50 +cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +chmod +x $JBOSS_INSTANCE/bin/jboss.sh +$JBOSS_INSTANCE/bin/jboss.sh stop + +# +# deploy to jboss +# +ant $ENVIRONMENT deploy-jboss40 # -# (re)start jbossas +# start jbossas # -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop $JBOSS_INSTANCE/bin/jboss.sh start sleep 30 @@ -41,7 +45,7 @@ # execute tests # cd $SVNDIR/jbossws-tests -#ant $ENVIRONMENT tests | grep FIXME | sort -u +ant $ENVIRONMENT tests | grep FIXME | sort -u # # copy test reports Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -9,8 +9,8 @@ # # Module settings # -HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; -MODULE=&quot;JBossWS-AS-4.2&quot; +HUDSON_HOME=(a)hudson.home@ +MODULE=JBossWS-AS-4.2 WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -24,16 +24,20 @@ cp ant.properties.example ant.properties # -# deploy to jboss50 +# stop jbossas # -ant $ENVIRONMENT deploy-jboss50 +cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +chmod +x $JBOSS_INSTANCE/bin/jboss.sh +$JBOSS_INSTANCE/bin/jboss.sh stop + +# +# deploy to jboss +# +ant $ENVIRONMENT deploy-jboss42 # -# (re)start jbossas +# start jbossas # -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop $JBOSS_INSTANCE/bin/jboss.sh start sleep 30 @@ -41,7 +45,7 @@ # execute tests # cd $SVNDIR/jbossws-tests -#ant $ENVIRONMENT tests | grep FIXME | sort -u +ant $ENVIRONMENT tests | grep FIXME | sort -u # # copy test reports Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:11:30 UTC (rev 2054) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:30:28 UTC (rev 2055) @@ -9,8 +9,8 @@ # # Module settings # -HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; -MODULE=&quot;JBossWS-AS-5.0&quot; +HUDSON_HOME=(a)hudson.home@ +MODULE=JBossWS-AS-5.0 WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -24,16 +24,20 @@ cp ant.properties.example ant.properties # -# deploy to jboss50 +# stop jbossas # +cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +chmod +x $JBOSS_INSTANCE/bin/jboss.sh +$JBOSS_INSTANCE/bin/jboss.sh stop + +# +# deploy to jboss +# ant $ENVIRONMENT deploy-jboss50 # -# (re)start jbossas +# start jbossas # -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop $JBOSS_INSTANCE/bin/jboss.sh start sleep 30 @@ -41,7 +45,7 @@ # execute tests # cd $SVNDIR/jbossws-tests -#ant $ENVIRONMENT tests | grep FIXME | sort -u +ant $ENVIRONMENT tests | grep FIXME | sort -u # # copy test reports