Author: thomas.diesler(a)jboss.com Date: 2009-04-03 02:34:11 -0400 (Fri, 03 Apr 2009) New Revision: 86723 Added: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/ Removed: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5/ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6/ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix/ Modified: 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/config.xml projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml Log: Add equinox to matrix 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-04-03 06:23:47 UTC (rev 86722) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -44,11 +44,11 @@ <!-- Conditions --> <conditions> <condition type="variable" id="isFelix"> - <name>runtimeSelection</name> + <name>frameworkSelection</name> <value>felix</value> </condition> <condition type="variable" id="isEquinox"> - <name>runtimeSelection</name> + <name>frameworkSelection</name> <value>equinox</value> </condition> <condition type="variable" id="isJBoss501"> 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-04-03 06:23:47 UTC (rev 86722) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -3,8 +3,8 @@ <field type="radio" variable="frameworkSelection"> <description align="left" txt="Please choose the OSGi Framework" /> <spec> - <choice txt="Apache Felix" value="felix" set="true"/> - <choice txt="Eclipse Equinox" value="equinox"/> + <choice txt="Felix" value="felix" set="true"/> + <choice txt="Equinox" value="equinox"/> </spec> </field> </panel> Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml 2009-04-03 06:23:47 UTC (rev 86722) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -10,9 +10,9 @@ <tr align="left"><th>Bind Addr&lt;/th&gt;&lt;td&gt;@jboss.bind.address(a)&lt;/td&gt;&lt;/tr&gt; <tr align="left"><th>JavaDoc</th><td><a href='job/Container-JDK1.6/javadoc/'>SPI</a></td></tr> <tr align="left"><th>Userguide</th><td> -<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>&nbsp; -<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>&nbsp; -<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>&nbsp; +<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>&nbsp; +<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>&nbsp; +<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>&nbsp; </td></tr> </table> ]]> Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15 (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5) Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5/config.xml 2009-04-03 05:45:11 UTC (rev 86719) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -11,6 +11,11 @@ <hudson.model.ParametersDefinitionProperty> <parameterDefinitions> <hudson.model.StringParameterDefinition> + <name>FRAMEWORK</name> + <optional>false</optional> + <defaultValue>felix</defaultValue> + </hudson.model.StringParameterDefinition> + <hudson.model.StringParameterDefinition> <name>CONTAINER</name> <optional>false</optional> <defaultValue>jboss501</defaultValue> Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16 (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6) Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6/config.xml 2009-04-03 05:45:11 UTC (rev 86719) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -11,6 +11,11 @@ <hudson.model.ParametersDefinitionProperty> <parameterDefinitions> <hudson.model.StringParameterDefinition> + <name>FRAMEWORK</name> + <optional>false</optional> + <defaultValue>felix</defaultValue> + </hudson.model.StringParameterDefinition> + <hudson.model.StringParameterDefinition> <name>CONTAINER</name> <optional>false</optional> <defaultValue>jboss501</defaultValue> Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix) Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix/config.xml 2009-04-03 05:45:11 UTC (rev 86719) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-03 06:34:11 UTC (rev 86723) @@ -32,6 +32,12 @@ </triggers> <axes> <axis> + <name>framework</name> + <values> + <string>felix</string> + </values> + </axis> + <axis> <name>container</name> <values> <string>jboss501</string> @@ -54,6 +60,7 @@ OSGIDIR=$WORKSPACE/jboss-osgi HUDSONDIR=$OSGIDIR/build/hudson +export FRAMEWORK=$framework export CONTAINER=$container export JBOSS_BINDADDR=(a)jboss.bind.address@