[jboss-cvs] JBossAS SVN: r96719 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-11-23 04:05:03 -0500 (Mon, 23 Nov 2009)
New Revision: 96719

Modified:
   projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
   projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
Log:
Add support for AS600M1

Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml	2009-11-23 08:09:57 UTC (rev 96718)
+++ projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml	2009-11-23 09:05:03 UTC (rev 96719)
@@ -31,8 +31,8 @@
     <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}"/>
+    <echo message="jboss601.home=${jboss601.home}"/>
   </target>
 
   <!-- ================================================================== -->

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-11-23 08:09:57 UTC (rev 96718)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-11-23 09:05:03 UTC (rev 96719)
@@ -41,16 +41,16 @@
   <variables>
     <variable name="jboss501.home" value="@{jboss501.home}" />
     <variable name="jboss510.home" value="@{jboss510.home}" />
-    <variable name="jboss520.home" value="@{jboss520.home}" />
     <variable name="jboss600.home" value="@{jboss600.home}" />
+    <variable name="jboss601.home" value="@{jboss601.home}" />
   </variables>
 
   <!-- Dynamic Variables -->
   <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" />
+    <variable name="jboss.home" value="${jboss601.home}" condition="isJBoss601" />
   </dynamicvariables>
 
   <!-- Conditions -->
@@ -75,14 +75,14 @@
       <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>
     </condition>
+    <condition type="variable" id="isJBoss601">
+      <name>jbossSelection</name>
+      <value>jboss601</value>
+    </condition>
     <condition type="variable" id="isServerMinimal">
       <name>jbossTargetServer</name>
       <value>minimal</value>

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml	2009-11-23 08:09:57 UTC (rev 96718)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml	2009-11-23 09:05:03 UTC (rev 96719)
@@ -14,10 +14,10 @@
     <field type="radio" variable="jbossSelection">
       <description align="left" txt="Please choose your target container" />
       <spec>
-        <choice txt="JBoss-5.0.1" value="jboss501" set="true"/>
+        <choice txt="JBoss-5.0.1" value="jboss501"/>
         <choice txt="JBoss-5.1.0" value="jboss510"/>
-        <choice txt="JBoss-5.2.0" value="jboss520"/>
-        <choice txt="JBoss-6.0.0" value="jboss600"/>
+        <choice txt="JBoss-6.0.0.M1" value="jboss600" set="true"/>
+        <choice txt="JBoss-6.0.0-SNAPSHOT" value="jboss601"/>
       </spec>
     </field>
     <field type="text" variable="jbossTargetServer">
@@ -29,8 +29,8 @@
     <field type="radio" variable="jbossSelection">
       <description align="left" txt="Please choose your target container" />
       <spec>
-        <choice txt="JBoss-5.2.0" value="jboss520" set="true"/>
-        <choice txt="JBoss-6.0.0" value="jboss600"/>
+        <choice txt="JBoss-6.0.0.M1" value="jboss600" set="true"/>
+        <choice txt="JBoss-6.0.0-SNAPSHOT" value="jboss601"/>
       </spec>
     </field>
     <field type="text" variable="jbossTargetServer">

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml	2009-11-23 08:09:57 UTC (rev 96718)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml	2009-11-23 09:05:03 UTC (rev 96719)
@@ -48,7 +48,7 @@
 # Build JBoss
 # 
 cd jbossas
-mvn clean install
+build/build.sh clean main
 
 #
 # Start JBossAS