Author: thomas.diesler(a)jboss.com Date: 2007-01-23 11:34:41 -0500 (Tue, 23 Jan 2007) New Revision: 2040 Removed: branches/jbossws-1.2.0/build/etc/hudson/ 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/ant.properties.example branches/jbossws-1.2.0/build/build.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.x/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-TRUNK/config.xml branches/jbossws-1.2.0/build/version.properties Log: Automate hudson setup 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-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -59,6 +59,10 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> + + <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/> + <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/hudson-home"/> <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> 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-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -27,6 +27,7 @@ <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"/> @@ -61,6 +62,7 @@ <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"/> @@ -120,7 +122,9 @@ <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> <path refid="core.classpath"/> </path> Modified: branches/jbossws-1.2.0/build/ant.properties.example =================================================================== --- branches/jbossws-1.2.0/build/ant.properties.example 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/ant.properties.example 2007-01-23 16:34:41 UTC (rev 2040) @@ -3,7 +3,11 @@ # # $Id$ -# Required JBoss Home +# JBossWS Hudson Root +#jbossws.hudson.root=/home/tdiesler/workspace +jbossws.hudson.mail=jbossws-dev(a)lists.jboss.com + +# Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 @@ -14,7 +18,7 @@ # The JBoss server instance jboss.server.instance=default -# Tomcat Home +# Optional Tomcat Home tomcat.home=/usr/java/tomcat tomcat.manager.username=manager tomcat.manager.password=manager Modified: branches/jbossws-1.2.0/build/build.xml =================================================================== --- branches/jbossws-1.2.0/build/build.xml 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/build.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -60,5 +60,52 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> + + <target name="setup-hudson" description="Setup the Hudson QA environment"> + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo/> + + <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}"/> + <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/> + <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/> + + <!-- Configure Tomcat --> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + <copy todir="${hudson.tomcat}"> + <fileset dir="${build.dir}/hudson/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + + <!-- Configure Hudson --> + <copy todir="${hudson.home}" overwrite="true"> + <fileset dir="${build.dir}/hudson/hudson-home"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filter token="hudson.home" value="${hudson.home}"/> + <filter token="jbossws.hudson.mail" value="${jbossws.hudson.mail}"/> + </filterset> + </copy> + + <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="* http://localhost:8180/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + </project> 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-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -15,7 +15,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients&gt;heiko.braun(a)jboss.com&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> @@ -29,7 +29,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>/home/hbraun/hudson/jobs/AS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3</description> + <description&gt;@hudson.home(a)/jobs/AS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3&lt;/description&gt; <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> 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-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -15,7 +15,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients&gt;heiko.braun(a)jboss.com&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> @@ -29,7 +29,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>/home/hbraun/hudson/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3</description> + <description&gt;@hudson.home(a)/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3&lt;/description&gt; <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.x/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.x/config.xml 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.x/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -10,7 +10,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients&gt;heiko.braun(a)jboss.com&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> @@ -24,7 +24,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>/home/hbraun/hudson/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2</description> + <description&gt;@hudson.home(a)/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2&lt;/description&gt; <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> 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.0/config.xml 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -8,11 +8,11 @@ # # Module settings # -HUDSON=&quot;/home/hbraun/hudson&quot; +HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; MODULE=&quot;JBossWS-AS-4.0&quot; -WORKSPACE=$HUDSON/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON/jobs/AS-4.0/workspaceBranch_4_0/build/output/jboss-4.0.5.SP1-ejb3 -ENV_DEFAULTS=&quot;-Djboss50.home= -Djboss42.home= -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; +WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace +JBOSS_INSTANCE=$HUDSON_HOME/jobs/AS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +ENV_DEFAULTS=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; cd $WORKSPACE/trunk/build pwd @@ -58,7 +58,7 @@ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients&gt;heiko(a)openj.net&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> 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-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -8,11 +8,11 @@ # # Module settings # -HUDSON=&quot;/home/hbraun/hudson&quot; +HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; MODULE=&quot;JBossWS-AS-4.2&quot; WORKSPACE=$HUDSON/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 -ENV_DEFAULTS=&quot;-Djboss50.home= -Djboss42.home= -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; +JBOSS_INSTANCE=$HUDSON_HOME/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +ENV_DEFAULTS=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; cd $WORKSPACE/trunk/build pwd @@ -60,7 +60,7 @@ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients&gt;heiko(a)openj.net&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-TRUNK/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-TRUNK/config.xml 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-TRUNK/config.xml 2007-01-23 16:34:41 UTC (rev 2040) @@ -8,10 +8,10 @@ # # Module settings # -HUDSON=&quot;/home/hbraun/hudson&quot; +HUDSON_HOME=&amp;quot;@hudson.home(a)&amp;quot; MODULE=&quot;JBossWS-TRUNK&quot; -WORKSPACE=$HUDSON/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2 +WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace +JBOSS_INSTANCE=$HUDSON_HOME/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2 ENV_DEFAULTS=&quot;-Djboss50.home=$JBOSS_INSTANCE -Djbossws.integration.target=jboss50&quot; cd $WORKSPACE/trunk/build @@ -58,7 +58,7 @@ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients&gt;heiko(a)openj.net&lt;/recipients&gt; + <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-01-23 15:31:55 UTC (rev 2039) +++ branches/jbossws-1.2.0/build/version.properties 2007-01-23 16:34:41 UTC (rev 2040) @@ -26,6 +26,7 @@ apache-ant=1.6.5 apache-log4j=1.2.8 apache-logging=1.0.5.GA-jboss +apache-tomcat=5.5.20 apache-xalan=j_2.7.0 apache-xerces=2.7.1 hibernate=3.2.1.GA @@ -43,6 +44,7 @@ oswego-concurrent=1.3.4 qdox=1.4 stax-api=1.0 +sun-hudson=1.74 sun-jaf=1.1 sun-javamail=1.4 sun-servlet=2.4