Author: thomas.diesler(a)jboss.com Date: 2009-05-29 02:04:35 -0400 (Fri, 29 May 2009) New Revision: 89518 Added: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-container/ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/config.xml Removed: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.1.0/ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/ Modified: projects/jboss-osgi/trunk/distribution/scripts/antrun-installer.xml projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml projects/jboss-osgi/trunk/hudson/ant.properties.example projects/jboss-osgi/trunk/hudson/build.xml projects/jboss-osgi/trunk/hudson/hudson-home/command.sh projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-container/config.xml Log: Add initial support for jboss520 Modified: projects/jboss-osgi/trunk/distribution/scripts/antrun-installer.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/scripts/antrun-installer.xml 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/distribution/scripts/antrun-installer.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -31,6 +31,7 @@ <echo message="jboss.home=${jboss.home}"/> <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> + <echo message="jboss520.home=${jboss520.home}"/> <echo message="jboss600.home=${jboss600.home}"/> </target> Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -30,6 +30,7 @@ <variables> <variable name="jboss501.home" value=&quot;(a){jboss501.home}&quot; /> <variable name="jboss510.home" value=&quot;(a){jboss510.home}&quot; /> + <variable name="jboss520.home" value=&quot;(a){jboss520.home}&quot; /> <variable name="jboss600.home" value=&quot;(a){jboss600.home}&quot; /> </variables> @@ -37,6 +38,7 @@ <dynamicvariables> <variable name="jboss.home" value="${jboss501.home}" condition="isJBoss501" /> <variable name="jboss.home" value="${jboss510.home}" condition="isJBoss510" /> + <variable name="jboss.home" value="${jboss520.home}" condition="isJBoss520" /> <variable name="jboss.home" value="${jboss600.home}" condition="isJBoss600" /> </dynamicvariables> @@ -62,6 +64,10 @@ <name>jbossSelection</name> <value>jboss510</value> </condition> + <condition type="variable" id="isJBoss520"> + <name>jbossSelection</name> + <value>jboss520</value> + </condition> <condition type="variable" id="isJBoss600"> <name>jbossSelection</name> <value>jboss600</value> Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -16,6 +16,7 @@ <spec> <choice txt="JBoss-5.0.1" value="jboss501" set="true"/> <choice txt="JBoss-5.1.0" value="jboss510"/> + <choice txt="JBoss-5.2.0" value="jboss520"/> <choice txt="JBoss-6.0.0" value="jboss600"/> </spec> </field> Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example =================================================================== --- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-05-29 06:04:35 UTC (rev 89518) @@ -15,7 +15,7 @@ hudson.username=changeme hudson.password=changeme -hudson.maven.path=/usr/java/apache-maven-2.0.9 +hudson.maven.path=/usr/java/apache-maven-2.1.0 hudson.root=/home/hudson/workspace/hudson/jboss-osgi @@ -26,6 +26,7 @@ hudson.http.port=8280 #hudson.jboss501.zip=file:///home/hudson/download/java/jboss/jboss-5.0.1.GA.zip +#hudson.jboss510.zip=file:///home/hudson/download/java/jboss/jboss-5.1.0.GA.zip hudson.mail.recipients= hudson.smtp.host=localhost Modified: projects/jboss-osgi/trunk/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/build.xml 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/hudson/build.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -15,19 +15,20 @@ <property name="hudson.dir" value="${basedir}"/> <property name="hudson.target.dir" value="${hudson.dir}/target"/> - <property name="project.root.dir" value="${basedir}/../.."/> + <property name="project.root.dir" value="${basedir}/.."/> <!-- ================================================================== --> <!-- Hudson Jobs --> <!-- ================================================================== --> <macrodef name="copyjobs"> <sequential> - <copyjob index="0" prefix="" job="JBoss-5.1.0"/> + <copyjob index="0" prefix="" job="JBoss-5.2.0"/> <copyjob index="1" prefix="" job="JBoss-6.0.0"/> <copyjob index="2" prefix="${hudson.job.prefix}" job="jbossosgi-embedded"/> <copyjob index="3" prefix="${hudson.job.prefix}" job="jbossosgi-jdk15"/> <copyjob index="4" prefix="${hudson.job.prefix}" job="jbossosgi-jdk16"/> - <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix"/> + <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-container"/> + <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-framework"/> </sequential> </macrodef> @@ -75,12 +76,13 @@ <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip"/> <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/> <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/> + <available property="jboss510.available" file="${thirdparty.dir}/jboss-5.1.0.GA.zip"/> </target> <!-- Get thirdparty dependencies --> - <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss501"> + <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss501,get-jboss510"> <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/> </target> <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available"> @@ -93,6 +95,10 @@ <property name="hudson.jboss501.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip&quo... <get src="${hudson.jboss501.zip}" dest="${thirdparty.dir}/jboss-5.0.1.GA.zip" usetimestamp="true" verbose="true"/> </target> + <target name="get-jboss510" depends="init-thirdparty" unless="jboss510.available"> + <property name="hudson.jboss501.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA.zip&quo... + <get src="${hudson.jboss501.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/> + </target> <!-- Setup the Hudson Tomcat instance Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-29 05:52:39 UTC (rev 89517) +++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-29 06:04:35 UTC (rev 89518) @@ -31,6 +31,15 @@ cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh ;; + 'jboss520') + JBOSS_BUILD=jboss-5.2.0.Beta + JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip + RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD + RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log + rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE + cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org + cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh + ;; 'jboss600') JBOSS_BUILD=jboss-6.0.0.Alpha1 JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0 (from rev 89516, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.1.0) Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-29 05:27:08 UTC (rev 89516) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -33,7 +33,7 @@ HUDSONDIR=$OSGIDIR/hudson HUDSONBIN=$HUDSONDIR/hudson-home/bin -JBOSS_VERSION=jboss-5.1.0.GA +JBOSS_VERSION=jboss-5.2.0.Beta JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-container (from rev 89516, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix) Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-container/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-29 05:27:08 UTC (rev 89516) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-container/config.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -35,8 +35,6 @@ <name>framework</name> <values> <string>felix</string> - <string>equinox</string> - <string>knopflerfish</string> </values> </axis> <axis> @@ -44,6 +42,7 @@ <values> <string>jboss501</string> <string>jboss510</string> + <string>jboss520</string> <string>jboss600</string> <string>runtime</string> </values> Added: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/config.xml (rev 0) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/config.xml 2009-05-29 06:04:35 UTC (rev 89518) @@ -0,0 +1,89 @@ +<?xml version='1.0' encoding='UTF-8'?> +<matrix-project> + <actions class="java.util.concurrent.CopyOnWriteArrayList"/> + <description>Build and test the JBossOSGi @version.id@ Matrix</description> + <logRotator> + <daysToKeep>60</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties> + <hudson.security.AuthorizationMatrixProperty/> + </properties> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@hudson.osgi.url(a)&lt;/remote&gt; + <local>jboss-osgi</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 20 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> + <axes> + <axis> + <name>framework</name> + <values> + <string>felix</string> + <string>equinox</string> + <string>knopflerfish</string> + </values> + </axis> + <axis> + <name>container</name> + <values> + <string>jboss510</string> + <string>runtime</string> + </values> + </axis> + <axis> + <name>jdk</name> + <values> + <string>jdk1.5</string> + <string>jdk1.6</string> + </values> + </axis> + </axes> + <builders> + <hudson.tasks.Shell> + <command> +OSGIDIR=$WORKSPACE/jboss-osgi +HUDSONDIR=$OSGIDIR/hudson + +export FRAMEWORK=$framework +export CONTAINER=$container + +export JBOSS_BINDADDR=(a)jboss.bind.address@ + +# copy the maven profile +cp @hudson.maven.profile@ $OSGIDIR/profiles.xml + +# +# call command.sh +# +/bin/sh $HUDSONDIR/hudson-home/command.sh + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers/> +</matrix-project> Property changes on: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-framework/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF