[jboss-cvs] JBossAS SVN: r101318 - in projects/jboss-osgi/trunk/hudson: hudson-home and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-02-23 02:31:39 -0500 (Tue, 23 Feb 2010)
New Revision: 101318

Added:
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/
Removed:
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/
Modified:
   projects/jboss-osgi/trunk/hudson/build.xml
   projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
Log:
Update jboss600 to 6.0.0.M2

Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml	2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/build.xml	2010-02-23 07:31:39 UTC (rev 101318)
@@ -82,7 +82,7 @@
     <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"/>
-    <available property="jboss600.available" file="${thirdparty.dir}/jboss-6.0.0.M1.zip"/>
+    <available property="jboss600.available" file="${thirdparty.dir}/jboss-6.0.0.M2.zip"/>
   </target>
 	
   <!-- 
@@ -91,7 +91,7 @@
   <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss501,get-jboss510,get-jboss600">
     <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
     <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.1.0.GA.zip"/>
-    <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-6.0.0.M1.zip"/>
+    <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-6.0.0.M2.zip"/>
   </target>
   <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available">
     <get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bin/apache-tomcat-${apache-tomcat}.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
@@ -108,8 +108,8 @@
     <get src="${hudson.jboss510.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/>
   </target>
   <target name="get-jboss600" depends="init-thirdparty" unless="jboss600.available">
-    <property name="hudson.jboss600.zip" value="http://downloads.sourceforge.net/jboss/jboss-6.0.0.M1.zip"/>
-    <get src="${hudson.jboss600.zip}" dest="${thirdparty.dir}/jboss-6.0.0.M1.zip" usetimestamp="true" verbose="true"/>
+    <property name="hudson.jboss600.zip" value="http://downloads.sourceforge.net/jboss/jboss-6.0.0.M2.zip"/>
+    <get src="${hudson.jboss600.zip}" dest="${thirdparty.dir}/jboss-6.0.0.M2.zip" usetimestamp="true" verbose="true"/>
   </target>
   
   <!-- 

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh	2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh	2010-02-23 07:31:39 UTC (rev 101318)
@@ -31,7 +31,7 @@
   ;;
   'jboss600')
     SERVER_NAME=default
-    JBOSS_BUILD=jboss-6.0.0.M1
+    JBOSS_BUILD=jboss-6.0.0.M2
     JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
 	RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
 	RUNTIME_LOG=$RUNTIME_HOME/server/$SERVER_NAME/log/server.log

Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote (from rev 101317, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox)

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml	2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml	2010-02-23 07:31:39 UTC (rev 101318)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <matrix-project>
   <actions class="java.util.concurrent.CopyOnWriteArrayList"/>
-  <description>Build and test the JBossOSGi @version.id@ Matrix with Equinox</description>
+  <description>Build and test the JBossOSGi @version.id@ Remote Matrix</description>
   <logRotator>
     <daysToKeep>60</daysToKeep>
     <numToKeep>-1</numToKeep>
@@ -48,14 +48,16 @@
       </values>
     </axis>
     <axis>
-      <name>jdk</name>
+      <name>framework</name>
       <values>
-        <string>jdk1.6</string>
-        <string>jdk1.5</string>
+        <string>equinox</string>
+        <string>felix</string>
+        <string>jbossmc</string>
       </values>
     </axis>
   </axes>
-  <combinationFilter>!((container=='jboss600' || container=='jboss601') &amp;&amp; jdk=='jdk1.5')</combinationFilter>
+  <combinationFilter>!((container=='jboss501' || container=='jboss510') &amp;&amp; framework=='jbossmc')</combinationFilter>
+  <jdk>jdk1.6</jdk>
   <builders>
     <hudson.tasks.Shell>
       <command>