Author: thomas.diesler(a)jboss.com
Date: 2008-09-11 03:45:00 -0400 (Thu, 11 Sep 2008)
New Revision: 2172
Added:
jbpm3/trunk/modules/enterprise/jar/src/main/etc/
jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml
Removed:
jbpm3/trunk/modules/enterprise/jar/src/main/resources/jbpm.cfg.xml
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml
Log:
Unpack enterprise beans
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-11 06:47:07 UTC (rev 2171)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-11 07:45:00 UTC (rev 2172)
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-enterprise-archive</artifactId>
+ <artifactId>jbpm-enterprise-bundle</artifactId>
<version>${version}</version>
<type>ear</type>
</dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-11 06:47:07 UTC
(rev 2171)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-11 07:45:00 UTC
(rev 2172)
@@ -122,7 +122,7 @@
<mkdir dir="${izpack.temp.dir}" />
<!--
http://jira.codehaus.org/browse/IZPACK-151 -->
- <copy file="${deploy.artifacts.lib}/jbpm-enterprise-archive.ear"
tofile="${deploy.artifacts.lib}/jbpm-enterprise-archive.zip" />
+ <copy file="${deploy.artifacts.lib}/jbpm-enterprise-bundle.ear"
tofile="${deploy.artifacts.lib}/jbpm-enterprise-bundle.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-core-config.jar"
tofile="${deploy.artifacts.lib}/jbpm-core-config.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook"
tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" />
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-11
06:47:07 UTC (rev 2171)
+++
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-11
07:45:00 UTC (rev 2172)
@@ -109,7 +109,7 @@
<!-- jbpm3/lib -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="$INSTALL_PATH/jbpm3/lib" override="true">
- <include name="jbpm-enterprise-archive.ear" />
+ <include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
<include name="activation.jar" />
@@ -167,7 +167,7 @@
unpack="true" override="true" />
<!-- jbpm/jbpm-enterprise.ear -->
- <file src="(a){deploy.artifacts.dir}/lib/jbpm-enterprise-archive.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise-archive.ear"
+ <file src="(a){deploy.artifacts.dir}/lib/jbpm-enterprise-bundle.zip"
targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise-bundle.ear"
unpack="true" override="true" />
<!-- jbpm/jbpm-userguide.war -->
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-11 06:47:07 UTC (rev 2171)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-11 07:45:00 UTC (rev 2172)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM - Enterprise Bundle</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-enterprise-archive</artifactId>
+ <artifactId>jbpm-enterprise-bundle</artifactId>
<packaging>ear</packaging>
<!-- Parent -->
@@ -102,6 +102,7 @@
<ejbModule>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-enterprise-beans</artifactId>
+ <unpack>true</unpack>
</ejbModule>
<jarModule>
<groupId>org.jboss.jbpm</groupId>
Modified: jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml 2008-09-11 06:47:07 UTC
(rev 2171)
+++ jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml 2008-09-11 07:45:00 UTC
(rev 2172)
@@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <directory>${basedir}/src/main/etc</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>jbpm.cfg.xml</include>
Copied: jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml (from rev 2169,
jbpm3/trunk/modules/enterprise/jar/src/main/resources/jbpm.cfg.xml)
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml
(rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml 2008-09-11 07:45:00 UTC
(rev 2172)
@@ -0,0 +1,19 @@
+<jbpm-configuration>
+
+ <jbpm-context>
+ <service name="persistence"
factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
+ <service name="message"
factory="org.jbpm.msg.jms.JmsMessageServiceFactoryImpl" />
+ <service name="scheduler"
factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory"
/>
+ <service name="logging"
factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <service name="authentication"
factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory"
/>
+ </jbpm-context>
+
+ <!--
+ Note, that the default job executor needs to be overwritten with a null value.
+ In the enterprise configuration there should be no job executor.
+ Async messaging is there bound to jms and timers to ejb timers.
+ -->
+ <null name="jbpm.job.executor" />
+
+</jbpm-configuration>
Deleted: jbpm3/trunk/modules/enterprise/jar/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/resources/jbpm.cfg.xml 2008-09-11 06:47:07
UTC (rev 2171)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/resources/jbpm.cfg.xml 2008-09-11 07:45:00
UTC (rev 2172)
@@ -1,19 +0,0 @@
-<jbpm-configuration>
-
- <jbpm-context>
- <service name="persistence"
factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
- <service name="message"
factory="org.jbpm.msg.jms.JmsMessageServiceFactoryImpl" />
- <service name="scheduler"
factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
- <service name="tx" factory="org.jbpm.tx.TxServiceFactory"
/>
- <service name="logging"
factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
- <service name="authentication"
factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory"
/>
- </jbpm-context>
-
- <!--
- Note, that the default job executor needs to be overwritten with a null value.
- In the enterprise configuration there should be no job executor.
- Async messaging is there bound to jms and timers to ejb timers.
- -->
- <null name="jbpm.job.executor" />
-
-</jbpm-configuration>