11:27 p.m.
Author: alex.guizar(a)jboss.com
Date: 2008-09-09 00:27:12 -0400 (Tue, 09 Sep 2008)
New Revision: 2145
Modified:
jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/pom.xml
Log:
[JBPM-1717] disabled job executor launcher and resolved ejb and destination references in
web.xml
removed jars from jbpm-console.war/WEB-INF/lib which duplicated the libraries and
configuration files in jbpm-service.sar
Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-08 16:05:24
UTC (rev 2144)
+++ jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-09 04:27:12
UTC (rev 2145)
@@ -21,6 +21,16 @@
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
+ <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name>
+ </ejb-local-ref>
+
+ <message-destination-ref>
+
<message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
+ <jndi-name>queue/JbpmJobQueue</jndi-name>
+ </message-destination-ref>
==== EJB local references (end) -->
</jboss-web>
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-08 16:05:24 UTC
(rev 2144)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-09 04:27:12 UTC
(rev 2145)
@@ -26,7 +26,7 @@
</replace>
</sequential>
</macrodef>
-
+
<macrodef name="macro-enable">
<attribute name="file" />
<attribute name="section" />
@@ -41,7 +41,7 @@
</replace>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
@@ -56,32 +56,32 @@
<!-- Initialization -->
<!-- ================================================================== -->
<target name="init">
-
+
<echo />
<echo message="jboss.home=${jboss.home}" />
-
+
</target>
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
<target name="configure" depends="init">
-
+
<property name="hsqldb.cfg.xml"
value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.hsqldb.xml"/>
<macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection
properties"/>
<macro-enable file="${hsqldb.cfg.xml}" section="DataSource
properties"/>
<macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction
properties"/>
-
+
<property name="mysql.cfg.xml"
value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.mysql.xml"/>
<macro-disable file="${mysql.cfg.xml}" section="JDBC connection
properties"/>
<macro-enable file="${mysql.cfg.xml}" section="DataSource
properties"/>
<macro-enable file="${mysql.cfg.xml}" section="JTA transaction
properties"/>
-
+
<property name="postgresql.cfg.xml"
value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.postgresql.xml"/>
<macro-disable file="${postgresql.cfg.xml}" section="JDBC
connection properties"/>
<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>
@@ -91,13 +91,20 @@
<condition property="database.is.postgresql" value="true"
else="false">
<equals arg1="${database}" arg2="postgresql"/>
</condition>
+
+ <property name="web.xml"
value="${deploy.artifacts.resources}/jbpm-console/WEB-INF/web.xml"/>
+ <macro-disable file="${web.xml}" section="Job executor
launcher"/>
+ <macro-enable file="${web.xml}" section="EJB local
references"/>
+
+ <macro-enable
file="${deploy.artifacts.resources}/jbpm-console/WEB-INF/jboss-web.xml"
+ section="EJB local references"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
<target name="build-installer" depends="configure">
-
+
<copy todir="${filtered.resources.dir}" filtering="true"
overwrite="true">
<fileset dir="${resources.dir}/installer" />
<filterset>
@@ -122,9 +129,8 @@
<!-- http://jira.codehaus.org/browse/IZPACK-151 -->
<copy file="${deploy.artifacts.lib}/jbpm-core-config.jar"
tofile="${deploy.artifacts.lib}/jbpm-core-config.zip" />
- <copy file="${deploy.artifacts.lib}/jbpm-console.war"
tofile="${deploy.artifacts.lib}/jbpm-console.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook"
tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" />
-
+
<!-- Run installer build -->
<echo message="Running IzPack to build the installer..." />
<izpack input="${resources.dir}/installer/install-definition.xml"
output="${output.dir}/${product.short.name}-${product.version}-izpack.jar"
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-08
16:05:24 UTC (rev 2144)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-09
04:27:12 UTC (rev 2145)
@@ -41,6 +41,14 @@
</includes>
<unpack>false</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>resources/jbpm-console</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jbpm-console:war</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
---
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-08
16:05:24 UTC (rev 2144)
+++
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-09
04:27:12 UTC (rev 2145)
@@ -10,9 +10,11 @@
<uninstaller name="remove.task" write="yes" />
</info>
<guiprefs width="600" height="480" resizable="no">
+ <!--
<laf name="kunststoff">
<os family="unix" />
</laf>
+ -->
</guiprefs>
<locale>
<langpack iso3="eng" />
@@ -33,14 +35,14 @@
<res id="userInputSpec.xml"
src="(a){filtered.resources.dir}/user-input-spec.xml" />
<res id="TargetPanel.dir"
src="(a){filtered.resources.dir}/target-panel-dir.txt" />
</resources>
-
+
<!-- Variables -->
<variables>
<variable name="jboss422.home" value="(a){jboss422.home}" />
<variable name="jboss423.home" value="(a){jboss423.home}" />
<variable name="jboss500.home" value="(a){jboss500.home}" />
</variables>
-
+
<!-- Dynamic Variables -->
<dynamicvariables>
<variable name="jboss.home" value="${jboss422.home}"
condition="isJBoss422" />
@@ -49,7 +51,7 @@
<variable name="installPath"
value="$INSTALL_PATH/jboss-4.2.2.GA" condition="isJBoss422Download"
/>
<variable name="jbossTargetServer" value="default"
condition="isJBoss422Download" />
</dynamicvariables>
-
+
<!-- Conditions -->
<conditions>
<condition type="packselection" id="isJBoss422Download">
@@ -68,7 +70,7 @@
<value>jboss500</value>
</condition>
</conditions>
-
+
<!-- Panels -->
<panels>
<panel classname="HelloPanel" />
@@ -81,27 +83,26 @@
<panel classname="FinishPanel" />
<!-- http://jira.codehaus.org/browse/IZPACK-154 -->
</panels>
-
+
<!-- Packs -->
<packs>
<!-- jBPM3 Standalone -->
<pack name="jBPM3 Standalone" required="yes"
preselected="yes">
<description>The jBPM3 Standalone Components</description>
-
+
<!-- jbpm3/config -->
<file src="(a){deploy.artifacts.dir}/lib/jbpm-core-config.zip"
targetdir="$INSTALL_PATH/jbpm3/config"
unpack="true" override="true" />
-
+
<!-- jbpm3/docs -->
<file src="(a){deploy.artifacts.dir}/lib/jbpm-userguide.zip"
targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
unpack="true" override="true" />
-
+
<!-- jbpm3/lib -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="$INSTALL_PATH/jbpm3/lib" override="true">
<include name="jbpm-enterprise.jar" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
-
<include name="activation.jar" />
<include name="antlr.jar" />
<include name="asm.jar" />
@@ -113,42 +114,42 @@
<include name="hibernate.jar" />
<include name="hsqldb.jar" />
</fileset>
-
+
<!-- jbpm3/src -->
<fileset dir="(a){deploy.artifacts.dir}/src"
targetdir="$INSTALL_PATH/jbpm3/src" override="true">
<include name="jbpm-core-sources.jar" />
<include name="jbpm-identity-sources.jar" />
</fileset>
</pack>
-
+
<!-- Optional Downloads -->
<pack name="Optional Downloads" required="no"
preselected="no">
<description>Optional jBPM3 Downloads</description>
</pack>
-
+
<!-- JBoss-4.2.2 -->
<pack name="Download JBoss-4.2.2" required="no"
parent="Optional Downloads" preselected="no">
<description>Download and Install JBoss-4.2.2</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
<file src="(a){resources.dir}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/Uninstaller"/>
</pack>
-
+
<!-- Eclipse-3.4.0 -->
<pack name="Download Eclipse-3.4.0" required="no"
parent="Optional Downloads" preselected="no">
<description>Download and Install Eclipse-3.4.0</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
<file src="(a){resources.dir}/installer/download-helper.xml"
targetdir="$INSTALL_PATH/tmp"/>
</pack>
-
+
<!-- jBPM3 Server Components -->
<pack name="jBPM3 Server Components" required="yes"
preselected="yes">
<description>The jBPM3 Server Components</description>
-
+
<!-- jbpm -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"
override="true">
<include name="jbpm-enterprise.jar" />
</fileset>
-
+
<!-- jbpm/jbpm-service.sar -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
@@ -158,22 +159,25 @@
<file
src="(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
/>
<file src="(a){deploy.artifacts.dir}/lib/jbpm-identity-service.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
unpack="true" override="true" />
-
+
<!-- jbpm/jbpm-console.war -->
- <file src="(a){deploy.artifacts.dir}/lib/jbpm-console.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
- unpack="true" override="true" />
-
+ <fileset dir="(a){deploy.artifacts.dir}/resources/jbpm-console"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
+ override="true">
+ <exclude name="WEB-INF/lib/jbpm-jpdl-core-*.jar" />
+ <exclude name="WEB-INF/lib/jbpm-jpdl-identity-*.jar" />
+ </fileset>
+
<!-- jbpm/jbpm-userguide.war -->
<file src="(a){deploy.artifacts.dir}/lib/jbpm-userguide.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
-
+
</pack>
<!-- jBPM Databases -->
<pack name="jBPM3 Databases" required="no"
preselected="no">
<description>The jBPM3 Supported Databases.</description>
</pack>
-
+
<!-- jBPM Hypersonic Database -->
<pack name="jBPM3 Hypersonic Database" required="no"
parent="jBPM3 Databases" preselected="yes">
<description>The Hypersonic Database</description>
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-08 16:05:24 UTC (rev 2144)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-09 04:27:12 UTC (rev 2145)
@@ -167,12 +167,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- https://jira.jboss.org/jira/browse/JBPM-1717 -->
- <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>