[jboss-cvs] JBossAS SVN: r85860 - in projects/jboss-osgi/branches/tdiesler/build: distribution/src/main/resources/installer and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-03-15 14:42:32 -0400 (Sun, 15 Mar 2009)
New Revision: 85860

Removed:
   projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/jobs/Embedded-JDK1.5/
   projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/jobs/Embedded-JDK1.6/
   projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/jobs/Embedded-Matrix/
Modified:
   projects/jboss-osgi/branches/tdiesler/build/distribution/scripts/antrun-installer.xml
   projects/jboss-osgi/branches/tdiesler/build/distribution/src/main/resources/installer/auto-install-template.xml
   projects/jboss-osgi/branches/tdiesler/build/hudson/build.xml
   projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/command.sh
Log:
wip

Modified: projects/jboss-osgi/branches/tdiesler/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/build/distribution/scripts/antrun-installer.xml	2009-03-15 18:15:55 UTC (rev 85859)
+++ projects/jboss-osgi/branches/tdiesler/build/distribution/scripts/antrun-installer.xml	2009-03-15 18:42:32 UTC (rev 85860)
@@ -35,14 +35,20 @@
   <!-- ================================================================== -->
   <target name="build-installer" depends="init">
 
+    <!-- Unselect JBossOSGi Integration pack if ${target.container} == 'runtime' -->
+    <condition property="jboss.integration" value="false" else="true">
+      <equals arg1="${target.container}" arg2="runtime"/>
+    </condition>
+    
   	<!-- Filter the installer scripts -->
     <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
       <fileset dir="${resources.dir}/installer" />
       <filterset>
         <filter token="jboss.home" value="${jboss.home}" />
+        <filter token="jboss.integration" value="${jboss.integration}" />
         <filter token="product.version" value="${product.version}" />
         <filter token="target.container" value="${target.container}" />
-        <filter token="installpath" value="${output.dir}/jboss-osgi-${product.version}" />
+        <filter token="installpath" value="${output.dir}/installpath" />
       </filterset>
     </copy>
   	

Modified: projects/jboss-osgi/branches/tdiesler/build/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-03-15 18:15:55 UTC (rev 85859)
+++ projects/jboss-osgi/branches/tdiesler/build/distribution/src/main/resources/installer/auto-install-template.xml	2009-03-15 18:42:32 UTC (rev 85860)
@@ -5,7 +5,7 @@
   </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="true" />
+    <pack name="JBossOSGi Integration" index="1" selected="@jboss.integration@" />
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>

Modified: projects/jboss-osgi/branches/tdiesler/build/hudson/build.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/build/hudson/build.xml	2009-03-15 18:15:55 UTC (rev 85859)
+++ projects/jboss-osgi/branches/tdiesler/build/hudson/build.xml	2009-03-15 18:42:32 UTC (rev 85860)
@@ -25,7 +25,6 @@
        <copyjob prefix="${hudson.job.prefix}-" job="Container-Matrix"/>
        <copyjob prefix="${hudson.job.prefix}-" job="Container-JDK1.5"/>
        <copyjob prefix="${hudson.job.prefix}-" job="Container-JDK1.6"/>
-       <copyjob prefix="${hudson.job.prefix}-" job="Embedded-Matrix"/>
        <copyjob prefix="" job="JBoss-5.1.0"/>
        <copyjob prefix="" job="JBoss-6.0.0"/>
      </sequential>

Modified: projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/command.sh	2009-03-15 18:15:55 UTC (rev 85859)
+++ projects/jboss-osgi/branches/tdiesler/build/hudson/hudson-home/command.sh	2009-03-15 18:42:32 UTC (rev 85860)
@@ -31,7 +31,7 @@
     rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE  
   ;;
   'runtime')
-	JBOSS_HOME=$DISTRODIR/jboss-osgi-$VERSION/runtime
+	JBOSS_HOME=$DISTRODIR/installpath/runtime
   ;;
   *)
 	echo "Unsupported container: $CONTAINER"
@@ -65,7 +65,7 @@
 $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # Was it successfully started?
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8090 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
   $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR