[jboss-cvs] JBossAS SVN: r85609 - in projects/jboss-osgi/trunk: build/distribution and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 7 17:37:38 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-07 17:37:38 -0500 (Sat, 07 Mar 2009)
New Revision: 85609
Removed:
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/ant-actions-spec.xml
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.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
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/profiles.xml.example
Log:
Add jboss510, jboss600 to matrix - WIP
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -131,7 +131,8 @@
<tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<property name="jboss501.home" value="${jboss501.home}" />
- <property name="jboss.home" value="${jboss.home}" />
+ <property name="jboss510.home" value="${jboss510.home}" />
+ <property name="jboss600.home" value="${jboss600.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-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -32,15 +32,10 @@
<!-- ================================================================== -->
<target name="build-installer" depends="init">
- <echo/>
- <echo message="JBoss Home: ${jboss.home}"/>
- <echo/>
-
<!-- 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="product.version" value="${product.version}" />
<filter token="user.home" value="${user.home}" />
</filterset>
Deleted: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/ant-actions-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/ant-actions-spec.xml 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/ant-actions-spec.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -1,14 +0,0 @@
-<antactions>
- <pack name="Download JBoss-5.0.0">
- <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
- <property name="install.path" value="$INSTALL_PATH"/>
- <target name="download-jboss"/>
- </antcall>
- </pack>
- <pack name="Download Eclipse-3.4.0">
- <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
- <property name="install.path" value="$INSTALL_PATH"/>
- <target name="download-eclipse"/>
- </antcall>
- </pack>
-</antactions>
\ No newline at end of file
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-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -4,12 +4,12 @@
<installpath>@user.home@/jboss-osgi- at product.version@</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
- <pack name="JBoss OSGi Integration" index="0" selected="true" />
+ <pack name="JBossOSGi Integration" index="0" selected="true" />
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
<entry key="jbossTargetServer" value="default" />
- <entry key="jbossSelection" value="jboss501" />
+ <entry key="jbossSelection" value="@target.container@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
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-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -28,15 +28,33 @@
<!-- Variables -->
<variables>
- <variable name="jboss.home" value="@{jboss501.home}" />
+ <variable name="jboss501.home" value="@{jboss501.home}" />
+ <variable name="jboss510.home" value="@{jboss510.home}" />
+ <variable name="jboss600.home" value="@{jboss600.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="${jboss600.home}" condition="isJBoss600" />
</dynamicvariables>
<!-- Conditions -->
<conditions>
+ <!-- Target Server Conditions -->
+ <condition type="variable" id="isJBoss501">
+ <name>jbossSelection</name>
+ <value>jboss501</value>
+ </condition>
+ <condition type="variable" id="isJBoss510">
+ <name>jbossSelection</name>
+ <value>jboss510</value>
+ </condition>
+ <condition type="variable" id="isJBoss600">
+ <name>jbossSelection</name>
+ <value>jboss600</value>
+ </condition>
</conditions>
<!-- Panels -->
@@ -62,12 +80,12 @@
********************************
-->
- <pack name="JBoss OSGi Integration" required="no" preselected="yes">
+ <pack name="JBossOSGi Integration" required="no" preselected="yes">
- <description>The JBoss OSGi Integration</description>
+ <description>The JBossOSGi Integration</description>
<!-- deployers -->
- <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true" condition="isJBoss501">
<include name="metadata-deployer-jboss-beans.xml" />
</fileset>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-03-07 22:37:38 UTC (rev 85609)
@@ -1,10 +1,12 @@
<userInput>
<panel order="0">
- <createForPack name="JBoss OSGi Integration" />
+ <createForPack name="JBossOSGi Integration" />
<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"/>
+ <choice txt="JBoss-5.1.0" value="jboss510"/>
+ <choice txt="JBoss-6.0.0" value="jboss600"/>
</spec>
</field>
<field type="text" variable="jbossTargetServer">
@@ -12,7 +14,7 @@
</field>
</panel>
<panel order="1">
- <createForPack name="JBoss OSGi Integration" />
+ <createForPack name="JBossOSGi Integration" />
<field type="dir" align="left" variable="jbossInstallPath">
<spec txt="JBoss Home:" size="25" set="${jboss.home}" />
</field>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-03-07 22:37:38 UTC (rev 85609)
@@ -14,6 +14,12 @@
jboss501*)
JBOSS_BUILD=jboss-5.0.1.GA
;;
+ jboss510*)
+ JBOSS_BUILD=jboss-5.1.0.Beta1
+ ;;
+ jboss600*)
+ JBOSS_BUILD=jboss-6.0.0.Alpha1
+ ;;
esac
#
Modified: projects/jboss-osgi/trunk/profiles.xml.example
===================================================================
--- projects/jboss-osgi/trunk/profiles.xml.example 2009-03-07 22:15:42 UTC (rev 85608)
+++ projects/jboss-osgi/trunk/profiles.xml.example 2009-03-07 22:37:38 UTC (rev 85609)
@@ -12,6 +12,8 @@
</activation>
<properties>
<jboss501.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
+ <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_1/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
More information about the jboss-cvs-commits
mailing list