9:33 p.m.
Author: alex.guizar(a)jboss.com
Date: 2009-12-07 22:33:29 -0500 (Mon, 07 Dec 2009)
New Revision: 5923
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2678: bump jsf-console dependency to 3.2.8
install gpd-deployer along with jsf-console
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java 2009-12-08
03:30:51 UTC (rev 5922)
+++
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java 2009-12-08
03:33:29 UTC (rev 5923)
@@ -27,8 +27,10 @@
import org.jbpm.JbpmConfiguration;
/**
- * Closes the jBPM configuration on servlet context destruction.
<h3>Configuration</h3> Servlet
- * context init parameters
+ * <p>
+ * Closes the jBPM configuration on servlet context destruction.
+ * </p>
+ * <h3>Configuration</h3> Servlet context initialization parameters
* <table border="1">
* <tr>
* <th>Name</th>
@@ -37,7 +39,7 @@
* </tr>
* <tr>
* <td>jbpm.configuration.resource</td>
- * <td>name of the resource that defines the jBPM configuration</td>
+ * <td>name of classpath resource containing the configuration</td>
* <td>jbpm.cfg.xml</td>
* </tr>
* </table>
@@ -49,7 +51,8 @@
private JbpmConfiguration jbpmConfiguration;
public void contextInitialized(ServletContextEvent event) {
- String resource =
event.getServletContext().getInitParameter("jbpm.configuration.resource");
+ String resource = event.getServletContext()
+ .getInitParameter("jbpm.configuration.resource");
jbpmConfiguration = JbpmConfiguration.getInstance(resource);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-08 03:30:51 UTC (rev
5922)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-08 03:33:29 UTC (rev
5923)
@@ -105,6 +105,11 @@
<artifactId>jsf-console</artifactId>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <type>war</type>
+ </dependency>
<!-- Sources -->
<dependency>
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-12-08
03:30:51 UTC (rev 5922)
+++
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-12-08
03:33:29 UTC (rev 5923)
@@ -119,42 +119,40 @@
<description>The jBPM3 Standalone Components</description>
<!-- jbpm3/ -->
- <file src="(a){project.build.assemblyDirectory}/etc/release.notes.html"
targetdir="$INSTALL_PATH"
- override="true" />
- <file src="(a){project.build.assemblyDirectory}/etc/JBossORG-EULA.txt"
targetdir="$INSTALL_PATH"
- override="true" />
+ <file src="(a){project.build.assemblyDirectory}/etc/release.notes.html"
+ targetdir="$INSTALL_PATH" />
+ <file src="(a){project.build.assemblyDirectory}/etc/JBossORG-EULA.txt"
+ targetdir="$INSTALL_PATH" />
<!-- jbpm3/config -->
- <file
src="(a){project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar"
targetdir="$INSTALL_PATH/config"
- unpack="true" override="true" />
- <file src="(a){project.build.assemblyDirectory}/etc/version.info.xml"
targetdir="$INSTALL_PATH/config"
- override="true" />
+ <file
src="(a){project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar"
+ targetdir="$INSTALL_PATH/config" unpack="true" />
+ <file src="(a){project.build.assemblyDirectory}/etc/version.info.xml"
+ targetdir="$INSTALL_PATH/config" />
<!-- jbpm3/database -->
- <file src="(a){project.build.assemblyDirectory}/lib/jbpm-db.jar"
targetdir="$INSTALL_PATH/database"
- unpack="true" override="true" />
+ <file src="(a){project.build.assemblyDirectory}/lib/jbpm-db.jar"
+ targetdir="$INSTALL_PATH/database" unpack="true" />
<!-- jbpm3/designer -->
- <fileset dir="(a){project.build.assemblyDirectory}/lib"
targetdir="$INSTALL_PATH/designer"
- override="true">
+ <fileset dir="(a){project.build.assemblyDirectory}/lib"
targetdir="$INSTALL_PATH/designer">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
- <file src="(a){project.build.assemblyDirectory}/etc/version.info.xml"
targetdir="$INSTALL_PATH/src/resources/gpd"
- override="true" />
+ <file src="(a){project.build.assemblyDirectory}/etc/version.info.xml"
+ targetdir="$INSTALL_PATH/src/resources/gpd" />
<!-- jbpm3/examples -->
<fileset
dir="(a){project.build.assemblyDirectory}/resources/jbpm-examples-dist"
- targetdir="$INSTALL_PATH/examples" override="true" />
+ targetdir="$INSTALL_PATH/examples" />
<!-- jbpm3/docs -->
- <file
src="(a){project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
targetdir="$INSTALL_PATH/docs/userguide"
- unpack="true" override="true" />
- <fileset dir="(a){project.build.assemblyDirectory}/javadoc"
targetdir="$INSTALL_PATH/docs"
- override="true" />
+ <file
src="(a){project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
+ targetdir="$INSTALL_PATH/docs/userguide" unpack="true" />
+ <fileset dir="(a){project.build.assemblyDirectory}/javadoc"
+ targetdir="$INSTALL_PATH/docs" />
<!-- jbpm3/lib -->
- <fileset dir="(a){project.build.assemblyDirectory}/lib"
targetdir="$INSTALL_PATH/lib"
- override="true">
+ <fileset dir="(a){project.build.assemblyDirectory}/lib"
targetdir="$INSTALL_PATH/lib">
<include name="antlr.jar" />
<include name="asm.jar" />
<include name="bsh.jar" />
@@ -169,12 +167,12 @@
<include name="jbpm-identity.jar" />
<include name="junit.jar" />
<include name="jsf-console.war" />
+ <include name="gpd-deployer.war" />
<include name="log4j.jar" />
</fileset>
<!-- jbpm3/src - Must be called 'src' because the GPD has a dependency
on it -->
- <fileset dir="(a){project.build.assemblyDirectory}/src"
targetdir="$INSTALL_PATH/src"
- override="true">
+ <fileset dir="(a){project.build.assemblyDirectory}/src"
targetdir="$INSTALL_PATH/src">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
<include name="jbpm-enterprise-sources.jar" />
@@ -191,31 +189,30 @@
<description>The jBPM3 JBoss Integration</description>
<!-- jbpm/jbpm-service.sar -->
- <fileset
dir="(a){project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
-
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true">
+ <fileset
+
dir="(a){project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
+
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm.cfg.xml" />
<include name="hibernate.extra.hbm.xml" />
</fileset>
<fileset dir="(a){project.build.assemblyDirectory}/lib"
-
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true">
+
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
</fileset>
<file
src="(a){project.build.assemblyDirectory}/lib/jbpm-identity-service.zip"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm/jbpm-enterprise.jar -->
<file
src="(a){project.build.assemblyDirectory}/lib/jbpm-enterprise.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm/jbpm-userguide.war -->
<file
src="(a){project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm-mq-service -->
<file src="(a){resources.directory}/destination/jbpm-mq-service.xml"
@@ -232,7 +229,7 @@
<!-- Database configs to docs/examples/jbpm -->
<fileset
dir="(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
- targetdir="${jbossInstallPath}/docs/examples/jbpm"
override="true">
+ targetdir="${jbossInstallPath}/docs/examples/jbpm">
<include name="hibernate.cfg.db2.xml" />
<include name="hibernate.cfg.hsqldb.xml" />
<include name="hibernate.cfg.mssql.xml" />
@@ -284,7 +281,8 @@
<singlefile condition="isMySQL"
src="(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"
/>
- <file condition="isMySQL"
src="(a){project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
+ <file condition="isMySQL"
+ src="(a){project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Oracle -->
@@ -302,8 +300,8 @@
<singlefile condition="isPostgreSQL"
src="(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"
/>
- <file condition="isPostgreSQL"
src="(a){project.build.assemblyDirectory}/lib/postgresql.jar"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
+ <file condition="isPostgreSQL"
+ src="(a){project.build.assemblyDirectory}/lib/postgresql.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Sybase -->
<file condition="isSybase"
@@ -319,12 +317,16 @@
* JSF Console *
********************************
-->
- <pack name="JSF-Console" parent="jBPM3 JBoss Integration"
required="no" preselected="yes">
+ <pack name="JSF-Console" parent="jBPM3 JBoss Integration"
required="no"
+ preselected="yes">
<description>JSF-Console</description>
<!-- jbpm/jsf-console.war -->
<file src="(a){project.build.assemblyDirectory}/lib/jsf-console.war"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war"
- unpack="true" override="true" />
+ unpack="true" />
+ <file src="(a){project.build.assemblyDirectory}/lib/gpd-deployer.war"
+
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/gpd-deployer.war"
+ unpack="true" />
</pack>
<!--
@@ -337,17 +339,21 @@
</pack>
<!-- JBoss-5.0.1 -->
- <pack name="Download JBoss-5.0.1" required="no"
parent="Optional Components" preselected="no">
+ <pack name="Download JBoss-5.0.1" required="no"
parent="Optional Components"
+ preselected="no">
<description>Download and Install JBoss-5.0.1</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="(a){resources.directory}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/uninstall" />
+ <file src="(a){resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</pack>
<!-- Eclipse-3.4.2 -->
- <pack name="Download Eclipse-3.4.2" required="no"
parent="Optional Components" preselected="no">
+ <pack name="Download Eclipse-3.4.2" required="no"
parent="Optional Components"
+ preselected="no">
<description>Download and Install Eclipse-3.4.2</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="(a){resources.directory}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/uninstall" />
+ <file src="(a){resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</pack>
</packs>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-08 03:33:29 UTC (rev 5923)
@@ -62,7 +62,7 @@
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.j2ee.version>4.0.2</jboss.j2ee.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
- <jbpm.jsf-console.version>3.2.7</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.2.8</jbpm.jsf-console.version>
<jdocbook.version>2.1.2</jdocbook.version>
<junit.version>3.8.1</junit.version>
<mvel.version>1.3.1-java1.4</mvel.version>
@@ -100,6 +100,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <version>${jbpm.jsf-console.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl-designer-site</artifactId>
<version>${jbpm.designer.version}</version>
<type>zip</type>