5:28 p.m.
Author: jbarrez
Date: 2009-08-27 18:28:33 -0400 (Thu, 27 Aug 2009)
New Revision: 5571
Modified:
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/pom.xml
Log:
* Integrated Signavio into jBPM distribution (JBPM-2479)
* Enhanced demo setup on Tomcat
* Fixed bug (JpdlProcessDefinition cannot be cast to List) -> due to examples.jar
missing on the classpath.
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2009-08-27 22:13:23 UTC (rev 5570)
+++ jbpm4/trunk/modules/distro/pom.xml 2009-08-27 22:28:33 UTC (rev 5571)
@@ -144,7 +144,16 @@
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-hibernate</artifactId>
</dependency>
+
+ <!-- Signavio -->
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.signavio</groupId>
+ <artifactId>jbpmeditor</artifactId>
+ <type>war</type>
+ <version>1.0</version>
+ </dependency>
+
<!-- Please sort by groupid -->
<dependency>
<groupId>org.apache.ant</groupId>
Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 22:13:23 UTC (rev
5570)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 22:28:33 UTC (rev
5571)
@@ -36,7 +36,7 @@
<exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude>
<exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude>
<exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude>
- <exclude>org.jbpm.jbpm4.dependencies.signavio:signavio:war</exclude>
+
<exclude>org.jbpm.jbpm4.dependencies.signavio:jbpmeditor:war</exclude>
<exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude>
</excludes>
<outputDirectory>lib</outputDirectory>
@@ -50,9 +50,9 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jbpm.jbpm4.dependencies.signavio:signavio:war</include>
+
<include>org.jbpm.jbpm4.dependencies.signavio:jbpmeditor:war</include>
</includes>
- <outputFileNameMapping>signavio.war</outputFileNameMapping>
+ <outputFileNameMapping>jbpmeditor.war</outputFileNameMapping>
<outputDirectory>install/src/signavio</outputDirectory>
</dependencySet>
</dependencySets>
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 22:13:23 UTC
(rev 5570)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 22:28:33 UTC
(rev 5571)
@@ -24,6 +24,8 @@
<property name="jdbc.properties.dir"
value="${install.src.dir}/jdbc" />
<property name="mail.cfg" value="default" />
<property file="${jbpm.home}/install/src/jdbc/${database}.properties"
/>
+
+ <property name="examples.file"
value="${jbpm.home}/examples/target/examples.jar"/>
<property name="tomcat.version" value="6.0.20" />
<property name="tomcat.parent.dir" value="${jbpm.home}" />
@@ -32,6 +34,8 @@
<property name="tomcat.distro.dir" value="downloads" />
<property name="tomcat.distro.url"
value="http://www.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}...
/>
<property name="tomcat.distro.path"
value="${tomcat.distro.dir}/${tomcat.filename}" />
+ <property name="tomcat.lib.dir" value="${tomcat.home}/lib" />
+ <property name="tomcat.webapps.dir"
value="${tomcat.home}/webapps" />
<property name="hsqldb.server.install.dir"
value="${jbpm.home}/hsqldb-server"/>
<property name="hsqldb.server.source.dir"
value="${jbpm.home}/install/src/hsqldb-server" />
@@ -46,8 +50,17 @@
<property name="jboss.server.configuration" value="default"
/>
<property name="jboss.server.config.dir"
value="${jboss.home}/server/${jboss.server.configuration}" />
<property name="jboss.server.data.dir"
value="${jboss.home}/server/${jboss.server.configuration}/data" />
+ <property name="jboss.server.deploy.dir"
value="${jboss.home}/server/${jboss.server.configuration}/deploy" />
- <!-- GENERAL CONDITIONS -->
+ <property name="signavio.war.file.name" value="jbpmeditor.war"
/>
+ <property name="signavio.src.dir"
value="${jbpm.home}/install/src/signavio" />
+ <property name="signavio.repo.dir.name"
value="signavio-repository" />
+ <property name="signavio.repo.dir"
value="${jbpm.home}/${signavio.repo.dir.name}"/>
+
+ <dirname property="current.dir" file="../jbpm.jar" />
+ <echo message="current dir = ${current.dir}" />
+
+ <!-- GENERAL CONDITIONS -->
<condition property="is.jboss.distro.available">
<available file="${jboss.distro.path}" />
</condition>
@@ -119,18 +132,18 @@
depends="install.jboss, install.jbpm.into.jboss, start.jboss"
description="installs jboss, installs jbpm into jboss, starts jboss,
creates the jBPM DB schema, deploys examples, loads example identities, installs and
starts eclipse">
<antcall target="create.jbpm.schema" />
- <ant antfile="${jbpm.home}/examples/build.xml"
target="create.and.deploy.examples" />
+ <antcall target="install.examples.into.jboss" />
<antcall target="load.example.identities" />
<antcall target="install.eclipse" />
<antcall target="start.eclipse" />
</target>
- <target name="demo.teardown"
+ <target name="demo.teardown.jboss"
description="drops the jbpm db schema and stops jboss">
<ant antfile="${jbpm.home}/db/build.xml"
target="drop.jbpm.schema" />
<antcall target="stop.jboss" />
</target>
-
+
<!-- ### CLEAN CONFIGURATION DIR ########################################### -->
<target name="clean.cfg.dir" description="Deletes the
${cfg.dest.dir}">
<delete dir="${cfg.dest.dir}" />
@@ -271,6 +284,9 @@
<include name="gwt-console-rpc.jar" />
</fileset>
</copy>
+
+ <!-- Copy Signavio war into /webapps -->
+ <antcall target="install.signavio.into.jboss" />
<copy todir="${jboss.server.config.dir}/deploy/jbpm"
overwrite="true">
<fileset dir="${jbpm.home}/lib">
@@ -327,6 +343,15 @@
<property name="container.lib.dir"
value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
<antcall target="internal.copy.database.driver" />
</target>
+
+ <!-- ### INSTALL EXAMPLES INTO JBOSS
################################################ -->
+ <target name="install.examples.into.jboss">
+ <ant antfile="${jbpm.home}/examples/build.xml"
target="create.and.deploy.examples" />
+ <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" />
+ <copy file="${examples.file}"
+ todir="${jboss.server.config.dir}/deploy/jbpm/userlibs"
+ overwrite="true" />
+ </target>
<!-- ### START JBOSS ################################################### -->
<target name="start.jboss"
@@ -352,6 +377,23 @@
<arg line="-S"/>
</exec>
</target>
+
+ <!-- ### TOMCAT DEMO SETUP ################################################ -->
+ <target name="demo.setup.tomcat"
+ depends="delete.tomcat, install.tomcat, install.jbpm.into.tomcat"
+ description="installs tomcat, installs jbpm into tomcat, starts tomcat,
creates the jBPM DB schema, deploys examples, loads example identities, installs and
starts eclipse">
+
+ <condition property="hsqldb.needed">
+ <equals arg1="${database}" arg2="hsqldb" />
+ </condition>
+ <antcall target="internal.install.and.start.hqsldb.if.needed" />
+ <antcall target="create.jbpm.schema" />
+ <antcall target="install.examples.into.tomcat" />
+ <antcall target="install.example.identities.into.tomcat" />
+ <antcall target="start.tomcat" />
+ <antcall target="install.eclipse" />
+ <antcall target="start.eclipse" />
+ </target>
<!-- ### REINSTALL TOMCAT ################################################ -->
<target name="reinstall.tomcat"
@@ -395,7 +437,7 @@
<!-- ### INSTALL JBPM INTO TOMCAT ####################################### -->
<target name="install.jbpm.into.tomcat"
depends="create.cfg"
- description="Installs jBPM into tomcat">
+ description="Installs jBPM into tomcat">
<property name="is.tomcat" value="true" />
@@ -446,6 +488,9 @@
</fileset>
</copy>
+ <!-- Copy Signavio war into /webapps -->
+ <antcall target="install.signavio.into.tomcat" />
+
<!-- Rename wars (the context root is configured by WEB-INF/jboss-web.xml,
which is neglected by Tomcat -->
<move file="${tomcat.home}/webapps/gwt-console-jbpm.war"
tofile="${tomcat.home}/webapps/jbpm-console.war" />
@@ -463,23 +508,14 @@
</target>
- <!-- ### TOMCAT DEMO SETUP ################################################ -->
- <target name="demo.setup.tomcat"
- depends="install.tomcat, install.jbpm.into.tomcat"
- description="installs tomcat, installs jbpm into tomcat, starts tomcat,
creates the jBPM DB schema, deploys examples, loads example identities, installs and
starts eclipse">
-
- <condition property="hsqldb.needed">
- <equals arg1="${database}" arg2="hsqldb" />
- </condition>
- <antcall target="internal.install.and.start.hqsldb.if.needed" />
-
- <antcall target="create.jbpm.schema" />
- <ant antfile="${jbpm.home}/examples/build.xml"
target="deploy.examples.into.tomcat" />
- <antcall target="install.example.identities.into.tomcat" />
- <antcall target="start.tomcat" />
- <ant antfile="${jbpm.home}/gpd/build.xml"
target="install.eclipse" />
- <ant antfile="${jbpm.home}/gpd/build.xml"
target="start.eclipse" />
- </target>
+ <!-- ### INSTALL EXAMPLES INTO TOMCAT
################################################ -->
+ <target name="install.examples.into.tomcat"
+ description="deploys all the example processes">
+ <ant antfile="${jbpm.home}/examples/build.xml"
target="create.and.deploy.examples" />
+ <copy file="${examples.file}"
+ todir="${tomcat.home}/lib"
+ overwrite="true" />
+ </target>
<!-- ### INSTALL HSQLDB SERVER ################################################
-->
<target name="install.hsqldb.server">
@@ -647,7 +683,7 @@
tofile="${tomcat.home}/conf/server.xml"
overwrite="true">
<filterset
filtersfile="${jdbc.properties.dir}/${database}.properties" />
- </copy>
+ </copy>
</target>
<!-- ### START HSQLDB DATABASE MGR ##################################### -->
@@ -669,6 +705,38 @@
<echo message="Copying database driver ${database.driver} to
${database.driver.destination.dir}" />
<copy file="${jbpm.home}/lib/${database.driver}"
todir="${database.driver.destination.dir}" />
</target>
+
+ <!-- ### INSTALL SIGNAVIO INTO JBOSS ##################################### -->
+ <target name="install.signavio.into.jboss"
depends="internal.set.signavio.repo.dir">
+ <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly
-->
+ <unzip src="${signavio.src.dir}/${signavio.war.file.name}"
dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
+ </target>
+
+ <!-- ### INSTALL SIGNAVIO INTO TOMCAT ##################################### -->
+ <target name="install.signavio.into.tomcat"
depends="internal.set.signavio.repo.dir">
+ <copy file="${signavio.src.dir}/${signavio.war.file.name}"
todir="${tomcat.webapps.dir}"/>
+ </target>
+
+ <!-- ### SET SIGNAVIO REPO DIR ##################################### -->
+ <target name="internal.set.signavio.repo.dir">
+ <mkdir dir="${jbpm.home}/signavio-repository" />
+
+ <!-- unzip the signavio war -->
+ <property name="temp.signavio.unzip"
value="${jbpm.home}/temp-signavio-unzip" />
+ <delete dir="${temp.signavio.unzip}" />
+ <mkdir dir="${temp.signavio.unzip}" />
+ <unzip src="${jbpm.home}/install/src/signavio/${signavio.war.file.name}"
dest="${temp.signavio.unzip}" />
+
+ <!-- replace the repo dir in he unzipped WEB-INF/web.xml -->
+ <replaceregexp file="${temp.signavio.unzip}/WEB-INF/web.xml"
flags="s"
+
match="<param-name>fileSystemRootDirectory</param-name>.*?<param-value>.*?</param-value>"
+
replace="<param-name>fileSystemRootDirectory</param-name><param-value>${current.dir}/${signavio.repo.dir.name}</param-value>"/>
+
+ <!-- zip it up again and copy it back to /lib-->
+ <zip destfile="${temp.signavio.unzip}/${signavio.war.file.name}"
basedir="${temp.signavio.unzip}" />
+ <copy file="${temp.signavio.unzip}/${signavio.war.file.name}"
todir="${signavio.src.dir}" overwrite="true"/>
+ <delete dir="${temp.signavio.unzip}" />
+ </target>
<!-- ### INSTALL ECLIPSE ################################################ -->
<target name="install.eclipse"
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-08-27 22:13:23 UTC (rev 5570)
+++ jbpm4/trunk/pom.xml 2009-08-27 22:28:33 UTC (rev 5571)
@@ -65,6 +65,7 @@
<mail.version>1.4.1</mail.version>
<report.engine.version>2.3.2</report.engine.version>
<servlet-api.version>2.5</servlet-api.version>
+ <signavio.jbpmeditor.version>1.0</signavio.jbpmeditor.version>
<spring.version>2.0.8</spring.version>
<stax.api.version>1.0.1</stax.api.version>
<wiser.version>1.2</wiser.version>
@@ -176,21 +177,20 @@
<version>${version}</version>
</dependency>
-
<!-- GWT console -->
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console</artifactId>
<version>${gwt.console.version}</version>
<classifier>jbpm</classifier>
- <type>war</type>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server</artifactId>
<version>${gwt.console.version}</version>
<classifier>jbpm</classifier>
- <type>war</type>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
@@ -212,6 +212,14 @@
<version>${jbpm.gpd.version}</version>
</dependency>
+ <!-- Signavio editor -->
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.signavio</groupId>
+ <artifactId>jbpmeditor</artifactId>
+ <type>war</type>
+ <version>${signavio.jbpmeditor.version}</version>
+ </dependency>
+
<!-- External dependencies -->
<!-- Please sort by groupid -->
<dependency>