[jbpm-commits] JBoss JBPM SVN: r2067 - in jbpm3/trunk: hudson/hudson-home/jobs/jBPM-Matrix and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Sep 2 07:31:26 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-02 07:31:26 -0400 (Tue, 02 Sep 2008)
New Revision: 2067
Added:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
Removed:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
Modified:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
jbpm3/trunk/pom.xml
Log:
IzPack auto install cannot handle conditions
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-02 11:31:26 UTC (rev 2067)
@@ -38,9 +38,8 @@
#
# Deploy distro
#
-sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install.xml > auto-install.xml
+sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
-sed s:DATABASE:$DATABASE: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
java -jar $DISTRODIR/jbpm-distribution- at version.id@-izpack.jar auto-install.xml
#
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -66,10 +66,8 @@
<panel classname="HelloPanel" />
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
- <!-- Packs and summary panels do not repect the conditions - ->
- <panel classname="PacksPanel" />
+ <panel classname="TreePacksPanel" />
<panel classname="SummaryPanel" />
- -->
<panel classname="InstallPanel" />
<panel classname="FinishPanel" />
</panels>
@@ -96,7 +94,7 @@
</pack>
<!-- jBPM Hypersonic Database -->
- <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" condition="isHypersonic">
+ <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" preselected="yes" condition="isHypersonic">
<description>The Hypersonic Database</description>
<fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data">
<include name="hypersonic/jbpmDB.*" />
@@ -107,7 +105,7 @@
</pack>
<!-- jBPM MySQL Database -->
- <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" condition="isMySQL">
+ <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" preselected="no" condition="isMySQL">
<description>The MySQL Database</description>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
@@ -119,7 +117,7 @@
</pack>
<!-- jBPM PostgreSQL Database -->
- <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" condition="isPostgreSQL">
+ <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" preselected="no" condition="isPostgreSQL">
<description>The PostgreSQL Database</description>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml (from rev 2066, jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml)
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossTargetServer" value="default" />
+ <entry key="jbossSelection" value="CONTAINER" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="installPath" value="JBOSS_HOME" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3" index="0" selected="true" />
+ <pack name="jBPM3 Hypersonic Database" index="1" selected="true" />
+ <pack name="jBPM3 MySQL Database" index="2" selected="false" />
+ <pack name="jBPM3 PostgreSQL Database" index="3" selected="false" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
\ No newline at end of file
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossTargetServer" value="default" />
+ <entry key="jbossSelection" value="CONTAINER" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="installPath" value="JBOSS_HOME" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3" index="0" selected="true" />
+ <pack name="jBPM3 Hypersonic Database" index="1" selected="false" />
+ <pack name="jBPM3 MySQL Database" index="2" selected="true" />
+ <pack name="jBPM3 PostgreSQL Database" index="3" selected="false" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -0,0 +1,23 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossTargetServer" value="default" />
+ <entry key="jbossSelection" value="CONTAINER" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="installPath" value="JBOSS_HOME" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3" index="0" selected="true" />
+ <pack name="jBPM3 Hypersonic Database" index="1" selected="false" />
+ <pack name="jBPM3 MySQL Database" index="2" selected="false" />
+ <pack name="jBPM3 PostgreSQL Database" index="3" selected="true" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -1,17 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.UserInputPanel>
- <userInput>
- <entry key="jbossTargetServer" value="default" />
- <entry key="jbossSelection" value="CONTAINER" />
- <entry key="databaseSelection" value="DATABASE" />
- </userInput>
- </com.izforge.izpack.panels.UserInputPanel>
- <com.izforge.izpack.panels.UserInputPanel>
- <userInput>
- <entry key="installPath" value="JBOSS_HOME" />
- </userInput>
- </com.izforge.izpack.panels.UserInputPanel>
- <com.izforge.izpack.panels.InstallPanel />
- <com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2008-09-02 11:31:26 UTC (rev 2067)
@@ -1 +0,0 @@
- at jboss.home@
\ No newline at end of file
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -12,15 +12,6 @@
<field type="text" variable="jbossTargetServer">
<spec txt="Server:" size="15" set="default" />
</field>
- <field type="divider" />
- <field type="radio" variable="databaseSelection">
- <description align="left" txt="Please choose your target database" />
- <spec>
- <choice txt="Hypersonic" value="hsqldb" set="true" />
- <choice txt="MySQL" value="mysql" />
- <choice txt="PostgreSQL" value="postgresql" />
- </spec>
- </field>
</panel>
<!-- -->
<panel order="1">
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-02 10:51:59 UTC (rev 2066)
+++ jbpm3/trunk/pom.xml 2008-09-02 11:31:26 UTC (rev 2067)
@@ -544,4 +544,4 @@
</dependencies>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
More information about the jbpm-commits
mailing list