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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Mar 23 06:58:35 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-03-23 06:58:35 -0400 (Mon, 23 Mar 2009)
New Revision: 86195

Modified:
   projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
   projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
Log:
Install runtime as seperate pack

Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-23 10:09:09 UTC (rev 86194)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-23 10:58:35 UTC (rev 86195)
@@ -27,7 +27,9 @@
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
-  <target name="init"/>
+  <target name="init">
+    <available property="runtime.available" file="${jboss.runtime.dir}/bin/run.sh" type="file" />
+  </target>
 
   <!-- ================================================================== -->
   <!-- Distribution                                                       -->
@@ -51,7 +53,7 @@
       </filterset>
     </copy>
   	
-    <!-- Run the IzPack Ant task -->
+    <!-- Define the IzPack Ant task -->
     <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask">
       <classpath>
         <pathelement path="${maven.runtime.classpath}" />

Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml	2009-03-23 10:09:09 UTC (rev 86194)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml	2009-03-23 10:58:35 UTC (rev 86195)
@@ -29,12 +29,25 @@
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
   <target name="init">
+  	<available property="jboss.source.dir.available" file="${jboss.source.dir}" type="dir"/>
+    <mkdir dir="${jboss.target.dir}"/>
   </target>
 
+	
   <!-- ================================================================== -->
   <!-- Distribution                                                       -->
   <!-- ================================================================== -->
-  <target name="build-runtime" depends="init">
+  <target name="check-runtime-available" depends="init" unless="jboss.source.dir.available">
+  	<echo/>
+  	<echo>***************************************</echo>
+  	<echo>*                                     *</echo>
+  	<echo>* Building Installer without Runtime! *</echo>
+  	<echo>* Please define: ${jboss501.home}     *</echo>
+  	<echo>*                                     *</echo>
+  	<echo>***************************************</echo>
+  </target>
+	
+  <target name="build-runtime" depends="check-runtime-available" if="jboss.source.dir.available">
 
   	<echo/>
   	<echo message="JBoss Source: ${jboss.source.dir}"/>
@@ -42,7 +55,7 @@
   	<echo/>
   	
     <mkdir dir="${jboss.target.server.dir}/lib"/>
-    
+  	
     <!-- BIN -->
     <copy todir="${jboss.target.dir}">
       <fileset dir="${jboss.source.dir}">

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-03-23 10:09:09 UTC (rev 86194)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-03-23 10:58:35 UTC (rev 86195)
@@ -5,7 +5,8 @@
   </com.izforge.izpack.panels.TargetPanel>
   <com.izforge.izpack.panels.TreePacksPanel>
     <pack name="JBossOSGi Distribution" index="0" selected="true" />
-    <pack name="JBossOSGi Integration" index="1" selected="@jboss.integration@" />
+    <pack name="JBossOSGi Runtime" index="1" selected="true" />
+    <pack name="JBossOSGi Integration" index="2" selected="@jboss.integration@" />
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-23 10:09:09 UTC (rev 86194)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-23 10:58:35 UTC (rev 86195)
@@ -31,6 +31,7 @@
     <variable name="jboss501.home" value="@{jboss501.home}" />
     <variable name="jboss510.home" value="@{jboss510.home}" />
     <variable name="jboss600.home" value="@{jboss600.home}" />
+    <variable name="runtime.available" value="@{runtime.available}" />
   </variables>
 
   <!-- Dynamic Variables -->
@@ -42,7 +43,6 @@
 
   <!-- Conditions -->
   <conditions>
-    <!-- Target Server Conditions -->
     <condition type="variable" id="isJBoss501">
       <name>jbossSelection</name>
       <value>jboss501</value>
@@ -55,6 +55,10 @@
       <name>jbossSelection</name>
       <value>jboss600</value>
     </condition>
+    <condition type="variable" id="installRuntime">
+      <name>runtime.available</name>
+      <value>true</value>
+    </condition>
   </conditions>
 
   <!-- Panels -->
@@ -125,14 +129,23 @@
         <include name="jboss-osgi-service-webconsole-sources.jar" />
       </fileset>
       
+    </pack>
+    
+    <!-- 
+    ********************************
+    *                              *  
+    *   JBoss OSGi Runtime         *
+    *                              *
+    ********************************
+    -->
+    
+    <pack name="JBossOSGi Runtime" required="no" preselected="yes" condition="installRuntime">
+    
+      <description>The JBossOSGi Runtime</description>
+
       <!-- JBossOSGi Runtime -->
       <fileset dir="@{jboss.runtime.dir}" targetdir="$INSTALL_PATH/runtime" override="true"/>
       
-      <!-- JBossOSGi Runtime deployers 
-      <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="$INSTALL_PATH/runtime/server/default/deployers" override="true" condition="isJBoss501">
-      </fileset>
-      -->
-      
       <!-- JBossOSGi Runtime deployers/osgi.deployer -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-runtime-deployer.jar" />




More information about the jboss-cvs-commits mailing list