September 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r2062 - jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-01 13:36:56 -0400 (Mon, 01 Sep 2008) New Revision: 2062 Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java Log: Use java:comp/env/ejb/CommandServiceBean Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-01 15:32:58 UTC (rev 2061) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-01 17:36:56 UTC (rev 2062) @@ -46,7 +46,7 @@ protected void setUp() throws Exception { if (commandServiceHome == null) { InitialContext initialContext = new InitialContext(); - commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:ejb/CommandServiceBean"); + commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/CommandServiceBean"); } commandService = commandServiceHome.create(); }

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2061 - jbpm3/trunk.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-01 11:32:58 -0400 (Mon, 01 Sep 2008) New Revision: 2061 Modified: jbpm3/trunk/pom.xml Log: Fix cactus dependency version Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-09-01 15:29:04 UTC (rev 2060) +++ jbpm3/trunk/pom.xml 2008-09-01 15:32:58 UTC (rev 2061) @@ -10,7 +10,8 @@   -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM</name> <groupId>org.jboss.jbpm</groupId> @@ -262,10 +263,15 @@ </dependency> <dependency> <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.javaEE.12-13-14</artifactId> + <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> <version>${apache.cactus.version}</version> </dependency> <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.integration.shared.api</artifactId> + <version>${apache.cactus.version}</version> + </dependency> + <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <version>${apache.jackrabbit.version}</version> @@ -538,5 +544,4 @@ </dependencies> </profile> </profiles> - -</project> +</project> \ No newline at end of file

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2060 - jbpm3/trunk/modules/enterprise.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-01 11:29:04 -0400 (Mon, 01 Sep 2008) New Revision: 2060 Modified: jbpm3/trunk/modules/enterprise/pom.xml Log: remove cactus version Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 14:01:56 UTC (rev 2059) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 15:29:04 UTC (rev 2060) @@ -60,13 +60,11 @@ <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> - <version>1.8.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.integration.shared.api</artifactId> - <version>1.8.0</version> <scope>test</scope> </dependency> <dependency>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2059 - jbpm3/trunk/modules/enterprise.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-01 10:01:56 -0400 (Mon, 01 Sep 2008) New Revision: 2059 Modified: jbpm3/trunk/modules/enterprise/pom.xml Log: Disable failing tests Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 13:52:15 UTC (rev 2058) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 14:01:56 UTC (rev 2059) @@ -151,6 +151,18 @@ </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> + <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude> +  + <exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> </project> \ No newline at end of file

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2058 - in jbpm3/trunk/modules: distribution/scripts and 11 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-09-01 09:52:15 -0400 (Mon, 01 Sep 2008) New Revision: 2058 Added: jbpm3/trunk/modules/enterprise/scripts/ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml jbpm3/trunk/modules/enterprise/src/test/resources/webapp/ Removed: jbpm3/trunk/modules/enterprise/src/test/ear/ jbpm3/trunk/modules/enterprise/src/test/webapp/ Modified: jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/scripts/install-definition.xml jbpm3/trunk/modules/enterprise/pom.xml jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java jbpm3/trunk/modules/enterprise/src/test/resources/cactus.properties jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/jboss-web.xml jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/web.xml jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/web/JobExecutorLauncher.java jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml Log: WIP - enterprise tests Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -46,6 +46,12 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-core</artifactId> <version>${version}</version> </dependency> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -77,7 +77,7 @@  <target name="configure" depends="init"> - <property name="hibernate.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-core-config/hibernate.cfg.xml"/> + <property name="hibernate.cfg.xml" value="${deploy.artifacts.resources}/jbpm-config/hibernate.cfg.xml"/> <macro-disable file="${hibernate.cfg.xml}" section="JDBC connection properties"/> <macro-enable file="${hibernate.cfg.xml}" section="DataSource properties"/> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -16,9 +16,10 @@ <unpack>false</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-jpdl-core-config</outputDirectory> + <outputDirectory>resources/jbpm-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> + <include>*:jbpm-enterprise:jar:config</include> <include>*:jbpm-jpdl-core:jar:config</include> </includes> <unpack>true</unpack> Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -71,8 +71,10 @@  <pack name="jBPM3 Config" required="yes" installGroups="Main"> <description>The jBPM default configuration</description> - <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-core-config/hibernate.cfg.xml" - targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar"/> + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-config" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar"> + <include name="hibernate.cfg.xml"/> + <include name="jbpm.cfg.xml"/> + </fileset> </pack>  Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -10,15 +10,13 @@   - <project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM - Enterprise</name> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-enterprise</artifactId> - <packaging>ejb</packaging> + <packaging>jar</packaging>  <parent> @@ -47,14 +45,31 @@ <artifactId>jms</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <scope>provided</scope> + </dependency>  <dependency> <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.javaEE.12-13-14</artifactId> + <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> + <version>1.8.0</version> <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.integration.shared.api</artifactId> + <version>1.8.0</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -64,41 +79,78 @@ <artifactId>log4j</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <scope>provided</scope> - </dependency> </dependencies>  <build> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <ant antfile="scripts/antrun-test-jars.xml" target="build-test-jars" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <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-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/test-dependencies</outputDirectory> + <includeScope>test</includeScope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <showDeprecation>false</showDeprecation> </configuration> </plugin> <plugin> - <artifactId>maven-ejb-plugin</artifactId> + <artifactId>maven-jar-plugin</artifactId> <configuration> - <ejbVersion>2.1</ejbVersion> + <excludes> + <exclude>jbpm.cfg.xml</exclude> + </excludes> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <skipTests>true</skipTests> - </configuration> - </plugin> </plugins> </build> - </project> \ No newline at end of file Added: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml =================================================================== --- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>jBPM enterprise test archive builder</description> + +  +  +  + + <target name="build-test-jars" description="Build the test deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"/> + <lib dir="${tests.output.dir}/test-dependencies"> + <include name="aspectjrt*.jar"/> + <include name="cactus*.jar"/> + <include name="junit*.jar"/> + </lib> + <webinf dir="${tests.resources.dir}/webapp/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + + </target> + +</project> Property changes on: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -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>src/main/resources</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm.cfg.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -0,0 +1,38 @@ +<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> + +  + <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" /> + +  + <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" /> + <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" /> + <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" /> + <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" /> + <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" /> + <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" /> + <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" /> + <string name="resource.mail.templates" value="jbpm.mail.templates.xml" /> + + <int name="jbpm.byte.block.size" value="1024" singleton="true" /> + <string name="jbpm.mail.smtp.host" value="localhost" /> + <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" /> + <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" /> + <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" /> + +  + <null name="jbpm.job.executor" /> + +</jbpm-configuration> Property changes on: jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-01 13:52:15 UTC (rev 2058) @@ -21,6 +21,7 @@ */ package org.jbpm.msg.jms; +import java.rmi.RemoteException; import java.util.Iterator; import java.util.Set; import java.util.Timer; @@ -37,25 +38,25 @@ import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; import org.jbpm.command.StartProcessInstanceCommand; -import org.jbpm.ejb.LocalCommandService; -import org.jbpm.ejb.LocalCommandServiceHome; +import org.jbpm.ejb.RemoteCommandService; +import org.jbpm.ejb.RemoteCommandServiceHome; import org.jbpm.enterprise.test.ActionRecorder; import org.jbpm.enterprise.test.Recorder; public class AsyncProcessingTest extends ServletTestCase { - private LocalCommandService commandService; + private RemoteCommandService commandService; static int nbrOfConcurrentProcessExecutions = 20; static int maxWaitTime = 30000; protected void setUp() throws Exception { InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); + RemoteCommandServiceHome localCommandServiceHome = (RemoteCommandServiceHome) initialContext.lookup("ejb/CommandServiceBean"); commandService = localCommandServiceHome.create(); } - public void testBulkJobs() { + public void testBulkJobs() throws RemoteException { Recorder.resetCollections(); deleteAllJobs(); deployProcess(); @@ -66,7 +67,7 @@ assertEquals(expectedResults, Recorder.collectedResults); } - protected void deleteAllJobs() { + protected void deleteAllJobs() throws RemoteException { execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { @@ -77,12 +78,12 @@ }); } - protected Object execute(Command command) { + protected Object execute(Command command) throws RemoteException { return commandService.execute(command); } - protected void deployProcess() { + protected void deployProcess() throws RemoteException { log.debug("start deploy process"); execute(new DeployProcessCommand( "<process-definition name='bulk messages'>" + @@ -121,7 +122,7 @@ "</process-definition>")); } - protected void launchProcesses() { + protected void launchProcesses() throws RemoteException { for (int i=0; i<nbrOfConcurrentProcessExecutions; i++) { StartProcessInstanceCommand command = new StartProcessInstanceCommand(); command.setProcessName("bulk messages"); @@ -146,7 +147,7 @@ return expectedResults; } - private void processAllJobs(final long maxWait) { + private void processAllJobs(final long maxWait) throws RemoteException { boolean jobsAvailable = true; // install a timer that will interrupt if it takes too long @@ -175,7 +176,7 @@ } } - protected int getNbrOfJobsAvailable() { + protected int getNbrOfJobsAvailable() throws RemoteException { Integer nbrOfJobsAvailable = (Integer) execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { @@ -192,7 +193,7 @@ return nbrOfJobsAvailable.intValue(); } - protected boolean areJobsAvailable() { + protected boolean areJobsAvailable() throws RemoteException { return (getNbrOfJobsAvailable()>0); } Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-01 13:52:15 UTC (rev 2058) @@ -46,7 +46,7 @@ protected void setUp() throws Exception { if (commandServiceHome == null) { InitialContext initialContext = new InitialContext(); - commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); + commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:ejb/CommandServiceBean"); } commandService = commandServiceHome.create(); } Modified: jbpm3/trunk/modules/enterprise/src/test/resources/cactus.properties =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/resources/cactus.properties 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/enterprise/src/test/resources/cactus.properties 2008-09-01 13:52:15 UTC (rev 2058) @@ -1 +1 @@ -cactus.contextURL = http://localhost:8080/test \ No newline at end of file +cactus.contextURL = http://localhost:8080/enterprise-test \ No newline at end of file Copied: jbpm3/trunk/modules/enterprise/src/test/resources/webapp (from rev 2053, jbpm3/trunk/modules/enterprise/src/test/webapp) Modified: jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/jboss-web.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/jboss-web.xml 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/jboss-web.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -3,12 +3,29 @@ "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" > <jboss-web> + <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> <jndi-name>java:/JbpmDS</jndi-name> </resource-ref> + <resource-ref> <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> <jndi-name>java:JmsXA</jndi-name> </resource-ref> + + <ejb-local-ref> + <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> + <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name> + </ejb-local-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> </jboss-web> \ No newline at end of file Modified: jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/webapp/WEB-INF/web.xml 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF/web.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -15,19 +15,17 @@ </servlet-mapping> <ejb-local-ref> - <ejb-ref-name>ejb/LocalCommandServiceBean</ejb-ref-name> + <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> <ejb-ref-type>Session</ejb-ref-type> <local-home>org.jbpm.ejb.LocalCommandServiceHome</local-home> <local>org.jbpm.ejb.LocalCommandService</local> - <ejb-link>CommandServiceBean</ejb-link> </ejb-local-ref> <ejb-local-ref> - <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> <ejb-ref-type>Entity</ejb-ref-type> <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> <local>org.jbpm.ejb.LocalTimerEntity</local> - <ejb-link>TimerEntityBean</ejb-link> </ejb-local-ref> <resource-ref> @@ -46,7 +44,6 @@ <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> <message-destination-type>javax.jms.Queue</message-destination-type> <message-destination-usage>Produces</message-destination-usage> - <message-destination-link>JobQueue</message-destination-link> </message-destination-ref> </web-app> Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2008-09-01 13:52:15 UTC (rev 2058) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -74,11 +75,15 @@ Configuration configuration = new Configuration(); // if a special hibernate configuration xml file is specified, - if (cfgXmlResource!=null) { + if (cfgXmlResource != null) + { // use the configured file name - log.debug("creating hibernate configuration resource '"+cfgXmlResource+"'"); + URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(cfgXmlResource); + log.debug("creating hibernate configuration resource '" + cfgURL + "'"); configuration.configure(cfgXmlResource); - } else { + } + else + { log.debug("using default hibernate configuration resource (hibernate.cfg.xml)"); configuration.configure(); } Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/web/JobExecutorLauncher.java =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/web/JobExecutorLauncher.java 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/web/JobExecutorLauncher.java 2008-09-01 13:52:15 UTC (rev 2058) @@ -25,6 +25,7 @@ import javax.servlet.ServletContextListener; import org.jbpm.JbpmConfiguration; +import org.jbpm.job.executor.JobExecutor; /** * Starts the job executor on servlet context initialization and stops it on @@ -50,14 +51,17 @@ private JbpmConfiguration jbpmConfiguration; public void contextInitialized(ServletContextEvent event) { - String jbpmCfgResource = event.getServletContext().getInitParameter( - "jbpm.configuration.resource"); + String jbpmCfgResource = event.getServletContext().getInitParameter("jbpm.configuration.resource"); jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource); - jbpmConfiguration.getJobExecutor().start(); + JobExecutor jobExecutor = jbpmConfiguration.getJobExecutor(); + if (jobExecutor != null) + jobExecutor.start(); } public void contextDestroyed(ServletContextEvent event) { - jbpmConfiguration.getJobExecutor().stop(); + JobExecutor jobExecutor = jbpmConfiguration.getJobExecutor(); + if (jobExecutor != null) + jobExecutor.stop(); } } Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-09-01 12:30:40 UTC (rev 2057) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-09-01 13:52:15 UTC (rev 2058) @@ -1,3 +1,4 @@ +    @@ -5,18 +6,6 @@  <mapping resource="hibernate.extra.hbm.xml" /> -  -  -  -  -  -  -  -  <!-- <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2057 - jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-09-01 08:30:40 -0400 (Mon, 01 Sep 2008) New Revision: 2057 Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java Log: changed method name to setPackageName on process definition Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-09-01 12:19:59 UTC (rev 2056) +++ jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-09-01 12:30:40 UTC (rev 2057) @@ -67,7 +67,7 @@ processDefinition.setName(name); String packageName = XmlUtil.attribute(documentElement, "package"); - processDefinition.setCategory(packageName); + processDefinition.setPackageName(packageName); Integer version = XmlUtil.attributeInteger(documentElement, "version", false, parse); if (version!=null) {

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2056 - jbpm4/pvm/trunk.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-09-01 08:19:59 -0400 (Mon, 01 Sep 2008) New Revision: 2056 Modified: jbpm4/pvm/trunk/readme.html Log: removed skip tests from explaining how to run the test suite Modified: jbpm4/pvm/trunk/readme.html =================================================================== --- jbpm4/pvm/trunk/readme.html 2008-09-01 11:03:14 UTC (rev 2055) +++ jbpm4/pvm/trunk/readme.html 2008-09-01 12:19:59 UTC (rev 2056) @@ -12,7 +12,7 @@ <code>mvn -DskipTests clean install</code> <h2>Run the test suite</h2> -<code>mvn -DskipTests clean surefire-report:report</code> +<code>mvn clean surefire-report:report</code> <h2>Create the distribution package</h2> <code>mvn -DskipTests clean package assembly:assembly</code>

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2055 - in jbpm4/jpdl/trunk/modules/core/src: test/java/org/jbpm/jpdl/controlflow and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-09-01 07:03:14 -0400 (Mon, 01 Sep 2008) New Revision: 2055 Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/jpdl/trunk/modules/core/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java Log: refactoring updates Modified: jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-09-01 10:53:57 UTC (rev 2054) +++ jbpm4/jpdl/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-09-01 11:03:14 UTC (rev 2055) @@ -67,7 +67,7 @@ processDefinition.setName(name); String packageName = XmlUtil.attribute(documentElement, "package"); - processDefinition.setPackageName(packageName); + processDefinition.setCategory(packageName); Integer version = XmlUtil.attributeInteger(documentElement, "version", false, parse); if (version!=null) { Modified: jbpm4/jpdl/trunk/modules/core/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java =================================================================== --- jbpm4/jpdl/trunk/modules/core/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-09-01 10:53:57 UTC (rev 2054) +++ jbpm4/jpdl/trunk/modules/core/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-09-01 11:03:14 UTC (rev 2055) @@ -26,7 +26,7 @@ import org.jbpm.pvm.PvmException; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.model.ProcessDefinition; +import org.jbpm.pvm.model.OpenProcessDefinition; /**

17 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r2054 - in jbpm4/pvm/trunk/modules/core/src: main/java/org/jbpm/pvm/internal/cmd and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-09-01 06:53:57 -0400 (Mon, 01 Sep 2008) New Revision: 2054 Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ExecutionService.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java Log: added executionId to variables methods in services and commands Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ExecutionService.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ExecutionService.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/ExecutionService.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -122,16 +122,32 @@ Execution signalExecution(String executionId, Map<String, Object> parameters); - /** creates or overwrites a variable value on the referenced execution */ + /** creates or overwrites a variable value on the referenced execution + * TODO REMOVE */ Execution setVariable(long executionDbid, String name, Object value); - /** creates or overwrites the variable values on the referenced execution */ + /** creates or overwrites the variable values on the referenced execution + * TODO REMOVE */ Execution setVariables(long executionDbid, Map<String, Object> variables); - /** retrieves a variable */ + /** retrieves a variable + * TODO REMOVE */ Object getVariable(long executionDbid, String variableName); - /** retrieves a map of variables */ + /** retrieves a map of variables + * TODO REMOVE */ Map<String, Object> getVariables(long executionDbid, List<String> variableNames); + /** creates or overwrites a variable value on the referenced execution */ + Execution setVariable(String executionId, String name, Object value); + + /** creates or overwrites the variable values on the referenced execution */ + Execution setVariables(String executionId, Map<String, Object> variables); + + /** retrieves a variable */ + Object getVariable(String executionId, String variableName); + + /** retrieves a map of variables */ + Map<String, Object> getVariables(String executionId, List<String> variableNames); + } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -25,16 +25,27 @@ import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.session.DbSession; +import org.jbpm.pvm.session.PvmDbSession; /** * @author Tom Baeyens */ public abstract class AbstractCommand<T> implements Command<T> { - - protected ClientExecution getExecution(Environment environment, long executionId) { + + // TODO: REMOVE + protected ClientExecution getExecution(Environment environment, long executionDbid) { DbSession dbSession = environment.get(DbSession.class); - ClientExecution execution = dbSession.get(ExecutionImpl.class, executionId); + ClientExecution execution = dbSession.get(ExecutionImpl.class, executionDbid); if (execution==null) { + throw new CommandException("execution "+executionDbid+" doesn't exist"); + } + return execution; + } + + protected ClientExecution getExecution(Environment environment, String executionId) { + PvmDbSession dbSession = environment.get(PvmDbSession.class); + ClientExecution execution = dbSession.findExecutionById(executionId); + if (execution==null) { throw new CommandException("execution "+executionId+" doesn't exist"); } return execution; Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.Execution; +import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.session.PvmDbSession; @@ -37,7 +37,8 @@ private static final long serialVersionUID = 1L; - protected long executionDbid; + protected long executionDbid = -1; + protected String executionId; protected List<String> variableNames; public GetVariablesCmd(long executionDbid, List<String> variableNames) { @@ -45,9 +46,23 @@ this.variableNames = variableNames; } + public GetVariablesCmd(String executionId, List<String> variableNames) { + this.executionId = executionId; + this.variableNames = variableNames; + } + public Map<String, Object> execute(Environment environment) throws Exception { - ExecutionImpl execution = environment.get(PvmDbSession.class).get(ExecutionImpl.class, executionDbid); + PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); + + ClientExecution execution = null; + + if (executionId!=null) { + execution = pvmDbSession.findExecutionById(executionId); + } else { + execution = pvmDbSession.get(ExecutionImpl.class, executionDbid); + } + Map<String, Object> variables = new HashMap<String, Object>(); for (String variableName : variableNames) { Object value = execution.getVariable(variableName); Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -21,8 +21,6 @@ */ package org.jbpm.pvm.internal.cmd; -import java.util.Map; - import org.jbpm.pvm.Execution; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; @@ -35,35 +33,48 @@ private static final long serialVersionUID = 1L; - protected long executionId; + protected long executionDbid; + protected String executionId = null; public SetVariablesCmd() { } - public SetVariablesCmd(long executionId) { - this.executionId = executionId; + // TODO: REMOVE + public SetVariablesCmd(long executionDbid) { + this.executionDbid = executionDbid; } - public SetVariablesCmd(long executionId, Map<String, Object> variables) { + // TODO: REMOVE + public SetVariablesCmd(long executionDbid, String key, Object variable) { + this.executionDbid = executionDbid; + addVariable(key, variable); + } + + public SetVariablesCmd(String executionId) { this.executionId = executionId; - this.variables = variables; } - public SetVariablesCmd(long executionId, String key, Object variable) { + public SetVariablesCmd(String executionId, String key, Object variable) { this.executionId = executionId; addVariable(key, variable); } public Execution execute(Environment environment) throws Exception { - ClientExecution execution = getExecution(environment, executionId); + ClientExecution execution = null; + if (executionId!=null) { + execution = getExecution(environment, executionId); + } else { + execution = getExecution(environment, executionDbid); + } + execution.setVariables(variables); return execution; } public long getExecutionId() { - return executionId; + return executionDbid; } public void setExecutionId(long executionId) { - this.executionId = executionId; + this.executionDbid = executionId; } } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -31,6 +31,13 @@ Map<String, Object> variables; + public void addVariable(String key, Object variable) { + if (variables==null) { + variables = new HashMap<String, Object>(); + } + variables.put(key, variable); + } + public Map<String, Object> getVariables() { return variables; } @@ -38,11 +45,4 @@ public void setVariables(Map<String, Object> variables) { this.variables = variables; } - - public void addVariable(String key, Object variable) { - if (variables==null) { - variables = new HashMap<String, Object>(); - } - variables.put(key, variable); - } } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.svc; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -147,21 +148,50 @@ return commandService.execute(new FindExecutionCmd(executionId)); } + // TODO: REMOVE public Object getVariable(long executionDbid, String variableName) { return commandService.execute(new GetVariableCmd(executionDbid, variableName)); } + // TODO: REMOVE public Map<String, Object> getVariables(long executionDbid, List<String> variableNames) { return commandService.execute(new GetVariablesCmd(executionDbid, variableNames)); } + // TODO: REMOVE public Execution setVariable(long executionDbid, String name, Object value) { Map<String, Object> variables = new HashMap<String, Object>(); variables.put(name, value); return setVariables(executionDbid, variables); } + // TODO: REMOVE public Execution setVariables(long executionDbid, Map<String, Object> variables) { - return commandService.execute(new SetVariablesCmd(executionDbid, variables)); + SetVariablesCmd cmd = new SetVariablesCmd(executionDbid); + cmd.setVariables(variables); + return commandService.execute(cmd); } + + + public Object getVariable(String executionId, String variableName) { + List<String> variableNames = new ArrayList<String>(); + variableNames.add(variableName); + return commandService.execute(new GetVariablesCmd(executionId, variableNames)); + } + + public Map<String, Object> getVariables(String executionId, List<String> variableNames) { + return commandService.execute(new GetVariablesCmd(executionId, variableNames)); + } + + public Execution setVariable(String executionId, String name, Object value) { + SetVariablesCmd cmd = new SetVariablesCmd(executionId); + cmd.addVariable(name, value); + return commandService.execute(cmd); + } + + public Execution setVariables(String executionId, Map<String, Object> variables) { + SetVariablesCmd cmd = new SetVariablesCmd(executionId); + cmd.setVariables(variables); + return commandService.execute(cmd); + } } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -30,8 +30,6 @@ import org.jbpm.pvm.Execution; import org.jbpm.pvm.ExecutionService; import org.jbpm.pvm.ProcessService; -import org.jbpm.pvm.activity.ActivityExecution; -import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.ProcessFactory; @@ -43,19 +41,11 @@ */ public class ExecutionServiceTest extends DbTestCase { - public static class WaitState implements ExternalActivity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - execution.waitForSignal(); - } - public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { - throw new UnsupportedOperationException(); - } - } - public void testStartExecutionById() { ProcessService processService = getEnvironmentFactory().get(ProcessService.class); + // deploy process with key 'NCLFU' and version 1 + // then we know that the key for this process will be 'NCLFU:1' ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion") .version(1) .key("NCLFU") @@ -67,6 +57,7 @@ ExecutionService executionService = getEnvironmentFactory().get(ExecutionService.class); + // start an execution for the process with the given id Execution execution = executionService.startExecution("NCLFU:1"); assertNotNull(execution); @@ -79,12 +70,14 @@ // if there is no user defined name or key specified in the execution, // the default id generator will create a unique id like this: processDefinitionId/execution.dbid assertEquals("NCLFU:1/", execution.getId().substring(0,8)); + // the last part of the execution key should be the dbid. Long.parseLong(execution.getId().substring(8)); } - public void testStartExecutionByIdWithKey() { + public void testStartExecutionByIdWithGivenExecutionKey() { ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - + + // deploy the same process with a given key and version ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion") .version(1) .key("NCLFU") @@ -120,13 +113,15 @@ .done(); processService.deploy(new Deployment(processDefinition)); - + + // create the map with variables Map<String, Object> variables = new HashMap<String, Object>(); variables.put("a", new Integer(1)); variables.put("b", "text"); ExecutionService executionService = getEnvironmentFactory().get(ExecutionService.class); + // provide the variables in the start execution method Execution execution = executionService.startExecution("NCLFU:1", variables); long executionDbid = execution.getDbid(); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-08-31 12:29:31 UTC (rev 2053) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -28,8 +28,6 @@ import org.jbpm.pvm.ProcessDefinition; import org.jbpm.pvm.ProcessService; import org.jbpm.pvm.PvmException; -import org.jbpm.pvm.api.db.svc.ExecutionServiceTest.WaitState; -import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.test.base.DbTestCase; @@ -205,46 +203,29 @@ public void testFindProcessDefinitionByNameAndVersion() { ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(1); + // create a process with a user specified version + ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion") + .version(35) + .node("initial").initial().behaviour(WaitState.class) + .done(); + + // deploy it + Deployment deployment = new Deployment(processDefinition); + processService.deploy(deployment); - processService.deploy(new Deployment(processDefinition)); + // load it with by name and version + processDefinition = processService.findProcessDefinition("nuclear fusion", 35); - ProcessDefinition retrieved = processService.findProcessDefinition("nuclear fusion", 1); - assertNotNull(retrieved); - assertEquals("nuclear fusion", retrieved.getName()); - assertEquals(1, retrieved.getVersion()); + // verify that the right process definition was returned + assertEquals("nuclear fusion", processDefinition.getName()); + assertEquals(35, processDefinition.getVersion()); } public void testFindProcessDefinitionNames() { + deployMultipleVersionsOfProcesses(); + ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(2); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("ultimate seduction"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("publish book"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(3); - processService.deploy(new Deployment(processDefinition)); - List<String> processNames = processService.findProcessDefinitionNames(); List<String> expected = new ArrayList<String>(); @@ -256,33 +237,10 @@ } public void testFindProcessDefinitions() { + deployMultipleVersionsOfProcesses(); + ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(2); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("ultimate seduction"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("publish book"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(3); - processService.deploy(new Deployment(processDefinition)); - List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); assertNotNull(processDefinitions); @@ -298,33 +256,10 @@ } public void testFindLatestProcessDefinition() { + deployMultipleVersionsOfProcesses(); + ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(2); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("ultimate seduction"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("publish book"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(3); - processService.deploy(new Deployment(processDefinition)); - ProcessDefinition retrieved = processService.findLatestProcessDefinition("nuclear fusion"); assertNotNull(retrieved); @@ -333,37 +268,57 @@ } public void testLatestProcessDefinition() { + deployMultipleVersionsOfProcesses(); + ProcessService processService = getEnvironmentFactory().get(ProcessService.class); - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(2); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("ultimate seduction"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("publish book"); - processDefinition.setVersion(1); - processService.deploy(new Deployment(processDefinition)); - - processDefinition = new ProcessDefinitionImpl(); - processDefinition.setName("nuclear fusion"); - processDefinition.setVersion(3); - processService.deploy(new Deployment(processDefinition)); - ProcessDefinition retrieved = processService.findLatestProcessDefinition("nuclear fusion"); assertNotNull(retrieved); assertEquals("nuclear fusion", retrieved.getName()); assertEquals(3, retrieved.getVersion()); } + + + /** deploys 3 versions of process with name 'nuclear fusion', and one version + * of the processes 'ultimate seduction' and 'publish book' */ + void deployMultipleVersionsOfProcesses() { + ProcessService processService = getEnvironmentFactory().get(ProcessService.class); + + ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion") + .node("initial").initial().behaviour(WaitState.class) + .done(); + Deployment deployment = new Deployment(processDefinition); + processService.deploy(deployment); + + processDefinition = ProcessFactory.build("ultimate seduction") + .node("initial").initial().behaviour(WaitState.class) + .done(); + deployment = new Deployment(processDefinition); + processService.deploy(deployment); + + processDefinition = ProcessFactory.build("ultimate seduction") + .node("initial").initial().behaviour(WaitState.class) + .done(); + deployment = new Deployment(processDefinition); + processService.deploy(deployment); + + processDefinition = ProcessFactory.build("nuclear fusion") + .node("initial").initial().behaviour(WaitState.class) + .done(); + deployment = new Deployment(processDefinition); + processService.deploy(deployment); + + processDefinition = ProcessFactory.build("publish book") + .node("initial").initial().behaviour(WaitState.class) + .done(); + deployment = new Deployment(processDefinition); + processService.deploy(deployment); + + processDefinition = ProcessFactory.build("nuclear fusion") + .node("initial").initial().behaviour(WaitState.class) + .done(); + deployment = new Deployment(processDefinition); + processService.deploy(deployment); + } } Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java (rev 0) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java 2008-09-01 10:53:57 UTC (rev 2054) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.api.db.svc; + +import java.util.Map; + +import org.jbpm.pvm.activity.ActivityExecution; +import org.jbpm.pvm.activity.ExternalActivity; + +public class WaitState implements ExternalActivity { + private static final long serialVersionUID = 1L; + public void execute(ActivityExecution execution) { + execution.waitForSignal(); + } + public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { + throw new UnsupportedOperationException(); + } +} \ No newline at end of file

17 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits September 2008