[jboss-cvs] JBossAS SVN: r83601 - in projects/jboss-felix/trunk/modules/distribution: scripts and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-01-29 03:47:38 -0500 (Thu, 29 Jan 2009)
New Revision: 83601

Modified:
   projects/jboss-felix/trunk/modules/distribution/pom.xml
   projects/jboss-felix/trunk/modules/distribution/scripts/antrun-installer.xml
   projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml
Log:
switch to jboss501

Modified: projects/jboss-felix/trunk/modules/distribution/pom.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/pom.xml	2009-01-29 08:22:11 UTC (rev 83600)
+++ projects/jboss-felix/trunk/modules/distribution/pom.xml	2009-01-29 08:47:38 UTC (rev 83601)
@@ -102,7 +102,7 @@
             <configuration>
               <tasks>
                 <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
-                <property name="jboss500.home" value="${jboss500.home}" />
+                <property name="jboss501.home" value="${jboss501.home}" />
                 <property name="product.name" value="${project.name}" />
                 <property name="product.short.name" value="${artifactId}" />
                 <property name="product.version" value="${project.version}" />

Modified: projects/jboss-felix/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/scripts/antrun-installer.xml	2009-01-29 08:22:11 UTC (rev 83600)
+++ projects/jboss-felix/trunk/modules/distribution/scripts/antrun-installer.xml	2009-01-29 08:47:38 UTC (rev 83601)
@@ -33,7 +33,7 @@
   <target name="build-installer" depends="init">
 
   	<echo/>
-  	<echo message="JBoss Home: ${jboss500.home}"/>
+  	<echo message="JBoss Home: ${jboss501.home}"/>
   	<echo/>
   	
   	<!-- Filter the installer scripts -->

Modified: projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2009-01-29 08:22:11 UTC (rev 83600)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2009-01-29 08:47:38 UTC (rev 83601)
@@ -28,7 +28,7 @@
 
   <!-- Variables -->
   <variables>
-    <variable name="jboss.home" value="@{jboss500.home}" />
+    <variable name="jboss.home" value="@{jboss501.home}" />
   </variables>
 
   <!-- Dynamic Variables -->
@@ -45,6 +45,7 @@
     <panel classname="TargetPanel" />
     <panel classname="TreePacksPanel" />
     <panel classname="UserInputPanel" />
+    <panel classname="UserInputPanel" />
     <panel classname="SummaryPanel" />
     <panel classname="InstallPanel" />
     <panel classname="FinishPanel" />

Modified: projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml	2009-01-29 08:22:11 UTC (rev 83600)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml	2009-01-29 08:47:38 UTC (rev 83601)
@@ -1,11 +1,20 @@
 <userInput>
   <panel order="0">
     <createForPack name="JBoss OSGi Integration" />
-    <field type="dir" align="left" variable="jbossInstallPath">
-      <spec txt="JBoss Home:" size="25" set="${jboss.home}" />
+    <field type="radio" variable="jbossSelection">
+      <description align="left" txt="Please choose your target server" />
+      <spec>
+        <choice txt="JBoss-5.0.1" value="jboss501" set="true"/>
+      </spec>
     </field>
     <field type="text" variable="jbossTargetServer">
       <spec txt="Server:" size="15" set="web" />
     </field>
   </panel>
+  <panel order="1">
+    <createForPack name="JBoss OSGi Integration" />
+    <field type="dir" align="left" variable="jbossInstallPath">
+      <spec txt="JBoss Home:" size="25" set="${jboss.home}" />
+    </field>
+  </panel>
 </userInput>
\ No newline at end of file