[jbpm-commits] JBoss JBPM SVN: r3071 - in jbpm3/trunk: modules/distribution and 13 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Nov 25 04:58:54 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-11-25 04:58:53 -0500 (Tue, 25 Nov 2008)
New Revision: 3071
Added:
jbpm3/trunk/modules/integration/api/deploy.sh
jbpm3/trunk/modules/integration/api/scripts/
jbpm3/trunk/modules/integration/api/scripts/assembly-config.xml
jbpm3/trunk/modules/integration/api/src/main/resources/hibernate.extra.hbm.xml
jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml
jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml
Removed:
jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml
Modified:
jbpm3/trunk/modules/distribution/pom.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/jar/pom.xml
jbpm3/trunk/modules/integration/api/pom.xml
jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java
jbpm3/trunk/modules/integration/jboss42/pom.xml
jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java
jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java
jbpm3/trunk/modules/integration/jboss42/src/test/resources/jndi.properties
jbpm3/trunk/pom.xml
Log:
Enable SimpleDeploymentTest
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -87,6 +87,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-integration-api</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-integration-jboss42</artifactId>
<classifier>config</classifier>
<version>${version}</version>
@@ -112,6 +118,10 @@
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-spec-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-spec-dialect-api10</artifactId>
+ </dependency>
<!-- jBPM Projects -->
<dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -54,6 +54,7 @@
<outputDirectory>resources/jbpm-integration-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
+ <include>*:jbpm-integration-api:jar:config</include>
<include>*:jbpm-integration-jboss42:jar:config</include>
</includes>
<unpack>true</unpack>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -177,6 +177,16 @@
<pack name="jBPM3 Server Components" required="yes" preselected="yes">
<description>The jBPM3 Server Components</description>
+ <!-- jbpm/jbpm-integration.beans -->
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true">
+ <include name="jbpm-integration-api.jar" />
+ <include name="jbpm-spec-api.jar" />
+ <include name="jbpm-spec-dialect-api10.jar" />
+ </fileset>
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true">
+ <include name="jboss-beans.xml" />
+ </fileset>
+
<!-- jbpm/jbpm-service.sar -->
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
<include name="jbpm.cfg.xml" />
@@ -188,9 +198,7 @@
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
- <include name="jbpm-integration-api.jar" />
<include name="jbpm-integration-jboss42.jar" />
- <include name="jbpm-spec-api.jar" />
<include name="slf4j-api.jar" />
<include name="slf4j-log4j12.jar" />
</fileset>
Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -82,8 +82,6 @@
<dependency>
<groupId>org.jboss.client</groupId>
<artifactId>jbossall-client</artifactId>
- <!-- verify that this version works for all target containers -->
- <version>4.2.2.GA</version>
<scope>test</scope>
</dependency>
<dependency>
Added: jbpm3/trunk/modules/integration/api/deploy.sh
===================================================================
--- jbpm3/trunk/modules/integration/api/deploy.sh (rev 0)
+++ jbpm3/trunk/modules/integration/api/deploy.sh 2008-11-25 09:58:53 UTC (rev 3071)
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+cp target/jbpm-integration-api-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans
Property changes on: jbpm3/trunk/modules/integration/api/deploy.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/integration/api/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/api/pom.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/api/pom.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -51,6 +51,17 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-identity</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-identity</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel</artifactId>
<version>${mvel.version}</version>
@@ -103,6 +114,25 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly-config</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-config.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -140,6 +170,14 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>jbpm-cfg-beans.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Added: jbpm3/trunk/modules/integration/api/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/integration/api/scripts/assembly-config.xml (rev 0)
+++ jbpm3/trunk/modules/integration/api/scripts/assembly-config.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbpm-cfg-beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/api/scripts/assembly-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-25 09:58:53 UTC (rev 3071)
@@ -30,10 +30,13 @@
import javax.management.ObjectName;
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
import org.jbpm.api.client.ProcessEngine;
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.ProcessDefinitionService;
import org.jbpm.api.service.ProcessService;
+import org.jbpm.integration.model.ProcessDefinitionImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,6 +53,7 @@
// The set of registered ProcessDefinitions
private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>();
+ private JbpmConfiguration jbpmConfigCache;
@Override
public void setProcessEngine(ProcessEngine engine)
@@ -73,14 +77,40 @@
throw new IllegalStateException("Process definition already registered: " + procDef);
log.debug("registerProcessDefinition: " + procDef);
+
+ // Works with the default configuration
+ JbpmConfiguration jbpmConfig = getJbpmConfiguration();
+ JbpmContext jbpmContext = jbpmConfig.createJbpmContext();
- // Save the ProcessDefinition through the PersistenceService
- ObjectName procDefID = procDef.getKey();
- procDefs.put(procDefID, procDef);
-
+ ObjectName procDefID;
+ try
+ {
+ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef;
+ jbpmContext.deployProcessDefinition(procDefImpl.getOldProcessDefinition());
+
+ procDefID = procDef.getKey();
+ procDefs.put(procDefID, procDef);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
return procDefID;
}
+ private JbpmConfiguration getJbpmConfiguration()
+ {
+ if (jbpmConfigCache == null)
+ {
+ jbpmConfigCache = JbpmConfiguration.getInstance();
+ }
+ return jbpmConfigCache;
+ }
+
public boolean unregisterProcessDefinition(ObjectName procDefID)
{
boolean removed = false;
@@ -96,8 +126,26 @@
for (ObjectName procID : procService.getProcesses(procDef.getName(), null))
procService.unregisterProcess(procID);
- procDefs.remove(procDefID);
- removed = true;
+ // Works with the default configuration
+ JbpmConfiguration jbpmConfig = getJbpmConfiguration();
+ JbpmContext jbpmContext = jbpmConfig.createJbpmContext();
+ try
+ {
+ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef;
+ long oldID = procDefImpl.getOldProcessDefinition().getId();
+ jbpmContext.getGraphSession().deleteProcessDefinition(oldID);
+
+ procDefs.remove(procDefID);
+ removed = true;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
}
return removed;
}
Added: jbpm3/trunk/modules/integration/api/src/main/resources/hibernate.extra.hbm.xml
===================================================================
--- jbpm3/trunk/modules/integration/api/src/main/resources/hibernate.extra.hbm.xml (rev 0)
+++ jbpm3/trunk/modules/integration/api/src/main/resources/hibernate.extra.hbm.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+ <!-- ################################################## -->
+ <!-- # Additional mappings defined per module go here # -->
+ <!-- ################################################## -->
+
+</hibernate-mapping>
Property changes on: jbpm3/trunk/modules/integration/api/src/main/resources/hibernate.extra.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -1,48 +0,0 @@
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jbpm.api.client.internal.KernelLocator">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
- <!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl">
- <property name="services">
- <set elementClass="org.jbpm.api.service.Service">
- <inject bean="jBPMDialectHandlerService"/>
- <inject bean="jBPMProcessBuilderService"/>
- <inject bean="jBPMProcessDefinitionService"/>
- <inject bean="jBPMProcessService"/>
- </set>
- </property>
- </bean>
-
- <!-- The PersistenceService -->
- <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" />
-
- <!-- The ProcessService -->
- <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl">
- <property name="interceptors">
- <list elementClass="java.lang.String">
- <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value>
- </list>
- </property>
- </bean>
-
- <!-- The DialectHandlerService -->
- <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl">
- <property name="dialectHandlers">
- <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler">
- <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry>
- <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry>
- </map>
- </property>
- </bean>
- <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" />
- <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" />
-
- <!-- Other Services -->
- <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" />
- <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" />
-
-</deployment>
Added: jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml (rev 0)
+++ jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -0,0 +1,52 @@
+<!--
+ Note, this uses the bean-deployer-2.0 schema
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!-- The ProcessEngine -->
+ <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl">
+ <property name="services">
+ <set elementClass="org.jbpm.api.service.Service">
+ <inject bean="jBPMDialectHandlerService"/>
+ <inject bean="jBPMProcessBuilderService"/>
+ <inject bean="jBPMProcessDefinitionService"/>
+ <inject bean="jBPMProcessService"/>
+ </set>
+ </property>
+ </bean>
+
+ <!-- The PersistenceService -->
+ <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" />
+
+ <!-- The ProcessService -->
+ <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl">
+ <property name="interceptors">
+ <list elementClass="java.lang.String">
+ <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- The DialectHandlerService -->
+ <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl">
+ <property name="dialectHandlers">
+ <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler">
+ <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry>
+ <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" />
+ <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" />
+
+ <!-- Other Services -->
+ <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" />
+ <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" />
+
+</deployment>
Modified: jbpm3/trunk/modules/integration/jboss42/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -72,8 +72,14 @@
<artifactId>jboss-common</artifactId>
<version>${jboss.common.version}</version>
</dependency>
-
+
+ <!-- Test Dependencies -->
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -81,6 +87,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -103,4 +115,31 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+
+ <!--
+ Name: no-jboss-bind-address
+ Descr: Skip tests if no jboss.bind address is given
+ -->
+ <profile>
+ <id>no-jboss-bind-address</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -10,6 +10,7 @@
<directory>${basedir}/src/main/etc</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>jboss-beans.xml</include>
<include>par-deployer.xml</include>
</includes>
</fileSet>
Added: jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -0,0 +1,52 @@
+<!--
+ Note, this uses the JBoss42 compatible bean-deployer-1.0 schema
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!-- The ProcessEngine -->
+ <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl">
+ <property name="services">
+ <set elementClass="org.jbpm.api.service.Service">
+ <inject bean="jBPMDialectHandlerService"/>
+ <inject bean="jBPMProcessBuilderService"/>
+ <inject bean="jBPMProcessDefinitionService"/>
+ <inject bean="jBPMProcessService"/>
+ </set>
+ </property>
+ </bean>
+
+ <!-- The PersistenceService -->
+ <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" />
+
+ <!-- The ProcessService -->
+ <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl">
+ <property name="interceptors">
+ <list elementClass="java.lang.String">
+ <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- The DialectHandlerService -->
+ <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl">
+ <property name="dialectHandlers">
+ <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler">
+ <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry>
+ <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" />
+ <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" />
+
+ <!-- Other Services -->
+ <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" />
+ <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" />
+
+</deployment>
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-25 09:58:53 UTC (rev 3071)
@@ -54,13 +54,6 @@
}
@Override
- protected void startService() throws Exception
- {
- super.startService();
-
- }
-
- @Override
@SuppressWarnings("unchecked")
public void create(DeploymentInfo di) throws DeploymentException
{
@@ -69,15 +62,12 @@
URL pdURL = getProcessDefinitionURL(di);
log.info("Deploy ProcessDefinition: " + pdURL);
- // Get get ProcessDefinitionService
- ProcessEngine engine = Configuration.getProcessEngine();
- procDefService = engine.getService(ProcessDefinitionService.class);
-
try
{
// Parese and register the procdef
- ProcessDefinition procDef = procDefService.parseProcessDefinition(pdURL);
- procDefService.registerProcessDefinition(procDef);
+ ProcessDefinitionService pdService = getProcessDefinitionService();
+ ProcessDefinition procDef = pdService.parseProcessDefinition(pdURL);
+ pdService.registerProcessDefinition(procDef);
// Remember the procDefID
di.context.put(ProcessDefinition.class.getName(), procDef.getKey());
@@ -103,7 +93,8 @@
{
try
{
- procDefService.unregisterProcessDefinition(procDefID);
+ ProcessDefinitionService pdService = getProcessDefinitionService();
+ pdService.unregisterProcessDefinition(procDefID);
}
catch (RuntimeException rte)
{
@@ -125,4 +116,15 @@
return pdURL;
}
+
+ private ProcessDefinitionService getProcessDefinitionService()
+ {
+ // This is done lazily because the deployers become available before MC beans
+ if (procDefService == null)
+ {
+ ProcessEngine engine = Configuration.getProcessEngine();
+ procDefService = engine.getService(ProcessDefinitionService.class);
+ }
+ return procDefService;
+ }
}
\ No newline at end of file
Modified: jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-25 09:58:53 UTC (rev 3071)
@@ -37,12 +37,12 @@
public void testSimpleDeploy() throws Exception
{
- //deploy(getResourceURL(PAR_ARCHIVE));
+ deploy(getResourceURL(PAR_ARCHIVE));
}
public void testSimpleUndeploy() throws Exception
{
- //undeploy(getResourceURL(PAR_ARCHIVE));
+ undeploy(getResourceURL(PAR_ARCHIVE));
}
}
Modified: jbpm3/trunk/modules/integration/jboss42/src/test/resources/jndi.properties
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/test/resources/jndi.properties 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/modules/integration/jboss42/src/test/resources/jndi.properties 2008-11-25 09:58:53 UTC (rev 3071)
@@ -1,3 +1,3 @@
-java.naming.provider.url=jnp://localhost:1099
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming.client
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-11-25 09:50:34 UTC (rev 3070)
+++ jbpm3/trunk/pom.xml 2008-11-25 09:58:53 UTC (rev 3071)
@@ -69,6 +69,7 @@
<jbpm.designer.version>3.1.5</jbpm.designer.version>
<jbpm.gwt-console.version>1.0.0-Beta1</jbpm.gwt-console.version>
<jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version>
+ <jboss.client.version>4.2.2.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
<junit.version>3.8.1</junit.version>
@@ -167,16 +168,6 @@
<version>${dom4j.version}</version>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
<groupId>dumbster</groupId>
<artifactId>dumbster</artifactId>
<version>${dumbster.version}</version>
@@ -277,6 +268,16 @@
<version>${apache.jackrabbit.version}</version>
</dependency>
<dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
@@ -292,6 +293,11 @@
<version>${hibernate.validator.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.client.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.gravel</groupId>
<artifactId>gravel</artifactId>
<version>${jboss.gravel.version}</version>
@@ -443,8 +449,10 @@
<id>distro</id>
<modules>
<module>modules/distribution</module>
+ <!--
<module>modules/db</module>
<module>modules/userguide</module>
+ -->
</modules>
<build>
<plugins>
More information about the jbpm-commits
mailing list