[jbpm-commits] JBoss JBPM SVN: r6829 - in jbpm3/branches/jbpm-3.2-soa: distribution and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Nov 17 00:03:58 EST 2010
Author: alex.guizar at jboss.com
Date: 2010-11-17 00:03:57 -0500 (Wed, 17 Nov 2010)
New Revision: 6829
Modified:
jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-template.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-tomcat.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_eng.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_spa.xml
jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-spec.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2978 offer tomcat 5.5 option from installer, in addition to tomcat 6.0
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -193,6 +193,14 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>hibernate-jbc-cacheprovider</artifactId>
</dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-template.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-template.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -20,18 +20,15 @@
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="jbossTargetServer" value="@jboss.server@" />
+ <entry key="jbossInstallPath" value="@jboss.home@" />
<entry key="jbossSelection" value="@container@" />
+ <entry key="jbossTargetServer" value="@jboss.server@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="jbossInstallPath" value="@jboss.home@" />
- </userInput>
- </com.izforge.izpack.panels.UserInputPanel>
- <com.izforge.izpack.panels.UserInputPanel>
- <userInput>
<entry key="tomcatInstallPath" value="@tomcat.home@" />
+ <entry key="tomcatSelection" value="@container@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-tomcat.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-tomcat.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/auto-install-tomcat.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -20,18 +20,15 @@
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="jbossTargetServer" value="@jboss.server@" />
+ <entry key="jbossInstallPath" value="@jboss.home@" />
<entry key="jbossSelection" value="@container@" />
+ <entry key="jbossTargetServer" value="@jboss.server@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="jbossInstallPath" value="@jboss.home@" />
- </userInput>
- </com.izforge.izpack.panels.UserInputPanel>
- <com.izforge.izpack.panels.UserInputPanel>
- <userInput>
<entry key="tomcatInstallPath" value="@tomcat.home@" />
+ <entry key="tomcatSelection" value="@container@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -40,7 +40,8 @@
<variable name="jboss423.home" value="@{jboss423.home}" />
<variable name="jboss501.home" value="@{jboss501.home}" />
<variable name="jboss510.home" value="@{jboss510.home}" />
- <variable name="tomcat.home" value="@{tomcat.home}" />
+ <variable name="tomcat55.home" value="@{tomcat55.home}" />
+ <variable name="tomcat60.home" value="@{tomcat60.home}" />
</variables>
<!-- Dynamic Variables -->
@@ -49,11 +50,13 @@
<variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" />
<variable name="jboss.home" value="${jboss501.home}" condition="isJBoss501" />
<variable name="jboss.home" value="${jboss510.home}" condition="isJBoss510" />
+ <variable name="tomcat.home" value="${tomcat60.home" condition="isTomcat60" />
+ <variable name="tomcat.home" value="${tomcat55.home" condition="isTomcat55" />
</dynamicvariables>
<!-- Conditions -->
<conditions>
- <!-- Target Server Conditions -->
+ <!-- JBoss AS Conditions -->
<condition type="variable" id="isJBoss405">
<name>jbossSelection</name>
<value>jboss405</value>
@@ -71,7 +74,17 @@
<value>jboss510</value>
</condition>
- <!-- Target Database Conditions -->
+ <!-- Tomcat Conditions -->
+ <condition type="variable" id="isTomcat55">
+ <name>tomcatSelection</name>
+ <value>tomcat55</value>
+ </condition>
+ <condition type="variable" id="isTomcat60">
+ <name>tomcatSelection</name>
+ <value>tomcat60</value>
+ </condition>
+
+ <!-- Database Conditions -->
<condition type="variable" id="isDB2">
<name>dbSelection</name>
<value>db2</value>
@@ -110,7 +123,6 @@
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
- <panel classname="UserInputPanel" />
<panel classname="SummaryPanel" />
<panel classname="InstallPanel" />
<panel classname="FinishPanel" />
@@ -397,18 +409,25 @@
-->
<pack name="Tomcat Integration" required="no" preselected="no">
<description>Web server integration</description>
+ <!-- server/lib -->
+ <file src="@{assemblyDirectory}/lib/jbpm-tomcat.jar" targetdir="${tomcatInstallPath}/server/lib"
+ condition="isTomcat55" />
+ <!-- common/lib -->
+ <file src="@{assemblyDirectory}/lib/hsqldb.jar" targetdir="${tomcatInstallPath}/common/lib"
+ condition="isTomcat55" />
<!-- lib -->
- <file src="@{assemblyDirectory}/lib/jbpm-tomcat.jar"
- targetdir="${tomcatInstallPath}/lib" />
- <file src="@{assemblyDirectory}/lib/hsqldb.jar" targetdir="${tomcatInstallPath}/lib" />
+ <file src="@{assemblyDirectory}/lib/jbpm-tomcat.jar" targetdir="${tomcatInstallPath}/lib"
+ condition="isTomcat60" />
+ <file src="@{assemblyDirectory}/lib/hsqldb.jar" targetdir="${tomcatInstallPath}/lib"
+ condition="isTomcat60" />
<!-- webapps/jbpm-console -->
<file src="@{assemblyDirectory}/lib/jsf-console-tomcat.war"
targetdir="${tomcatInstallPath}/webapps/jbpm-console"
unpack="true" />
<fileset dir="@{assemblyDirectory}/lib"
- targetdir="${tomcatInstallPath}/webapps/jbpm-console/WEB-INF/lib">
+ targetdir="${tomcatInstallPath}/webapps/jbpm-console/WEB-INF/lib">
<include name="antlr.jar" />
<include name="asm.jar" />
<include name="backport-util-concurrent.jar" />
@@ -427,6 +446,12 @@
<singlefile src="@{assemblyDirectory}/config/hibernate.cfg.tomcat.xml"
target="${tomcatInstallPath}/webapps/jbpm-console/WEB-INF/classes/hibernate.cfg.xml" />
+ <fileset dir="@{assemblyDirectory}/lib" condition="isTomcat55"
+ targetdir="${tomcatInstallPath}/webapps/jbpm-console/WEB-INF/lib">
+ <include name="el-api.jar" />
+ <include name="el-ri.jar" />
+ </fileset>
+
<!-- work/jbpm-console -->
<fileset dir="@{resourcesDirectory}/database/hypersonic"
targetdir="${tomcatInstallPath}/work/Catalina/localhost/jbpm-console">
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_eng.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -4,5 +4,6 @@
<str id="jboss.configuration" txt="Server configuration" />
<str id="jboss.home" txt="JBoss AS directory" />
<str id="tomcat.home" txt="Tomcat directory" />
+ <str id="tomcat.selection" txt="Tomcat version" />
<str id="database.selection" txt="Database" />
</langpack>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_spa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -4,5 +4,6 @@
<str id="jboss.configuration" txt="Configuración del servidor" />
<str id="jboss.home" txt="Directorio de JBoss AS" />
<str id="tomcat.home" txt="Directorio de Tomcat" />
+ <str id="tomcat.selection" txt="Versión de Tomcat" />
<str id="database.selection" txt="Base de datos" />
</langpack>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-spec.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/user-input-spec.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -2,6 +2,10 @@
<userInput>
<panel order="0">
<createForPack name="JBoss AS Integration" />
+ <field type="dir" align="left" variable="jbossInstallPath">
+ <spec id="jboss.home" size="20" set="${jboss.home}" />
+ </field>
+ <field type="space" />
<field type="radio" variable="jbossSelection">
<description align="left" id="jboss.selection" />
<spec>
@@ -13,22 +17,24 @@
</field>
<field type="space" />
<field type="text" variable="jbossTargetServer">
- <spec id="jboss.configuration" size="5" set="all" />
+ <spec id="jboss.configuration" size="10" set="all" />
</field>
</panel>
<panel order="1">
- <createForPack name="JBoss AS Integration" />
- <field type="dir" align="left" variable="jbossInstallPath">
- <spec id="jboss.home" size="20" set="${jboss.home}" />
- </field>
- </panel>
- <panel order="2">
<createForPack name="Tomcat Integration" />
<field type="dir" align="left" variable="tomcatInstallPath">
<spec id="tomcat.home" size="20" set="${tomcat.home}" />
</field>
+ <field type="space" />
+ <field type="radio" variable="tomcatSelection">
+ <description align="left" id="tomcat.selection" />
+ <spec>
+ <choice txt="Tomcat 6.0" value="tomcat60" set="true" />
+ <choice txt="Tomcat 5.5" value="tomcat55" />
+ </spec>
+ </field>
</panel>
- <panel order="3">
+ <panel order="2">
<createForPack name="JBoss AS Integration" />
<field type="radio" variable="dbSelection">
<description align="left" id="database.selection" />
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-17 00:53:13 UTC (rev 6828)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-17 05:03:57 UTC (rev 6829)
@@ -189,9 +189,14 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.2</version>
+ <version>1.0</version>
</dependency>
<dependency>
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.gravel</groupId>
<artifactId>gravel</artifactId>
<version>1.0.0.GA</version>
More information about the jbpm-commits
mailing list