[jbpm-commits] JBoss JBPM SVN: r2105 - in jbpm3/trunk: modules/distribution and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 4 10:41:42 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-04 10:41:42 -0400 (Thu, 04 Sep 2008)
New Revision: 2105
Added:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml
Removed:
jbpm3/trunk/modules/distribution/docs/
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
Modified:
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
Log:
Use common auto-install-template
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-04 14:41:42 UTC (rev 2105)
@@ -25,7 +25,7 @@
unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
-ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
+ENVIRONMENT="-Ddatabase=$DATABASE -Djboss.bind.address=$JBOSS_BINDADDR -Djboss.id=$CONTAINER -Djboss.home=$JBOSS_HOME"
#
# log dependency tree
@@ -46,7 +46,7 @@
#
# build the tests
#
-mvn -Ddatabase=$DATABASE process-test-classes 2>&1; MVN_STATUS=$?
+mvn $ENVIRONMENT process-test-classes 2>&1; MVN_STATUS=$?
if [ $MVN_STATUS -ne 0 ]; then
echo maven exit status $MVN_STATUS
exit 1
@@ -55,9 +55,8 @@
#
# Deploy distro
#
-sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
-sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; mv tmp.xml auto-install.xml
-cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar auto-install.xml
+AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml
+cat $AUTO_INSTALL; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar $AUTO_INSTALL
#
# start jbossas
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -136,13 +136,14 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="database" value="${database}" />
+ <property name="jboss.home" value="${jboss422.home}" />
+ <property name="jboss.id" value="jboss422" />
<property name="product.name" value="${project.name}" />
<property name="product.short.name" value="${artifactId}" />
<property name="product.version" value="${project.version}" />
- <property name="jboss422.home" value="${jboss422.home}" />
- <property name="jboss423.home" value="${jboss423.home}" />
- <property name="jboss500.home" value="${jboss500.home}" />
- <ant antfile="scripts/antrun-installer.xml" target="installer" />
+ <property name="user.home" value="${user.home}" />
+ <ant antfile="scripts/antrun-installer.xml" target="build-installer" />
</tasks>
</configuration>
</execution>
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -58,18 +58,8 @@
<target name="init">
<echo />
- <echo message="jboss422.home=${jboss422.home}" />
- <echo message="jboss423.home=${jboss423.home}" />
- <echo message="jboss500.home=${jboss500.home}" />
+ <echo message="jboss.home=${jboss.home}" />
- <property name="jboss.server.instance" value="default" />
- <property name="jboss422.available.file" value="${jboss422.home}/client/jboss-client.jar" />
- <property name="jboss423.available.file" value="${jboss423.home}/client/jboss-client.jar" />
- <property name="jboss500.available.file" value="${jboss500.home}/client/jboss-client.jar" />
-
- <available property="jboss422.available" file="${jboss422.available.file}" />
- <available property="jboss423.available" file="${jboss423.available.file}" />
- <available property="jboss500.available" file="${jboss500.available.file}" />
</target>
<!-- ================================================================== -->
@@ -92,18 +82,32 @@
<macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/>
<macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/>
+ <condition property="database.is.hsqldb" value="true" else="false">
+ <equals arg1="${database}" arg2="hsqldb"/>
+ </condition>
+ <condition property="database.is.mysql" value="true" else="false">
+ <equals arg1="${database}" arg2="mysql"/>
+ </condition>
+ <condition property="database.is.postgresql" value="true" else="false">
+ <equals arg1="${database}" arg2="postgresql"/>
+ </condition>
</target>
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
- <target name="installer" depends="configure">
+ <target name="build-installer" depends="configure">
<copy todir="${filtered.resources.dir}" filtering="true">
<fileset dir="${resources.dir}/installer" />
<filterset>
- <filter token="jboss.home" value="${jboss422.home}" />
+ <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />
+ <filter token="database.is.mysql" value="${database.is.mysql}" />
+ <filter token="database.is.postgresql" value="${database.is.postgresql}" />
+ <filter token="jboss.id" value="${jboss.id}" />
+ <filter token="jboss.home" value="${jboss.home}" />
<filter token="product.version" value="${product.version}" />
+ <filter token="user.home" value="${user.home}" />
</filterset>
</copy>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-hsqldb.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -1,23 +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" />
- </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
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-mysql.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -1,23 +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" />
- </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
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-04 13:45:19 UTC (rev 2104)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-postgresql.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -1,23 +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" />
- </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
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-09-04 14:41:42 UTC (rev 2105)
@@ -0,0 +1,31 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.TargetPanel>
+ <installpath>@user.home@/jBPM- at product.version@</installpath>
+ </com.izforge.izpack.panels.TargetPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3 Standalone" index="0" selected="true" />
+ <pack name="Optional Downloads" index="1" selected="false" />
+ <pack name="Download JBoss-4.2.2" index="2" selected="false" />
+ <pack name="Download Eclipse-3.4.0" index="3" selected="false" />
+ <pack name="jBPM3 Server Components" index="4" selected="true" />
+ <pack name="jBPM3 Databases" index="5" selected="true" />
+ <pack name="jBPM3 Hypersonic Database" index="6" selected="@database.is.hsqldb@" />
+ <pack name="jBPM3 MySQL Database" index="7" selected="@database.is.mysql@" />
+ <pack name="jBPM3 PostgreSQL Database" index="8" selected="@database.is.postgresql@" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossTargetServer" value="default" />
+ <entry key="jbossSelection" value="@jboss.id@" />
+ </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.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbpm-commits
mailing list