[jbpm-commits] JBoss JBPM SVN: r4335 - in jbpm4/branches/tbaeyens/modules: deployment and 25 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 26 12:05:51 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-03-26 12:05:51 -0400 (Thu, 26 Mar 2009)
New Revision: 4335
Modified:
jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java
jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java
jbpm4/branches/tbaeyens/modules/deployment/
jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/pvm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part3.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/jpdl.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/branches/tbaeyens/modules/integration/jboss4/src/main/java/org/jbpm/integration/jboss4/JBPMDeployer.java
jbpm4/branches/tbaeyens/modules/integration/jboss5/src/main/java/org/jbpm/integration/jboss5/JBPMDeployer.java
jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SavePolicy.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessAttachmentsTest.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessServiceTest.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml
Log:
deployment and repository
Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,64 +21,31 @@
*/
package org.jbpm;
-import java.io.File;
import java.io.InputStream;
-import java.io.Serializable;
import java.net.URL;
-import java.util.List;
import java.util.zip.ZipInputStream;
+import org.jbpm.client.ClientProcessDefinition;
-/** a deployment unit, containing all information in source format from which
- * a process definition will be created and stored in the process repository.
- *
- * <p>A deployment takes a bunch of files as input. Files must have a name
- * and optionally they can have a type. During deployment, the type can be
- * deducted from the filename automatically. Use the <code>addXxxx</code>-methods
- * to add files to the deployment. Use {@link #setFileType(String, String)} to
- * set the file type programmatically.
- * </p>
- *
- * <p>The deployment also manages a map of objects. The deployers will typically
- * generate those objects based on the corresponding file contents. E.g. the
- * jpdl deployer will produce a <code>order.jpdl.xml</code>
- * {@link ProcessDefinition}-object from the <code>order.jpdl.xml</code> file.
- * </p>
- *
- * <p>Typically, a deployer will save the created objects into the database.
- * </p>
- *
- * <p>Users can also supply objects programmatically with {@link #addObject(String, Object)}.
- * </p>
- *
+/**
* @author Tom Baeyens
*/
-public interface Deployment extends Serializable {
+public interface Deployment {
+ String getName();
Deployment setName(String name);
+
+ long getTimestamp();
Deployment setTimestamp(long timestamp);
- Deployment addResource(String resource);
- Deployment addFile(File file);
- Deployment addUrl(URL url);
- Deployment addInputStream(String name, InputStream inputStream);
- Deployment addString(String name, String string);
- Deployment addArchiveResource(String resource);
- Deployment addArchiveFile(File file);
- Deployment addArchiveUrl(URL url);
- Deployment addArchive(ZipInputStream zipInputStream);
- Deployment addDirectory(String directory);
- Deployment addDirectoryCanonical(String directory);
- Deployment addDirectory(File directory);
- Deployment addDirectoryCanonical(File directory);
- Deployment addProcessDefinition(ProcessDefinition processDefinition);
+ Deployment addResourceFromString(String resourceName, String string);
+ Deployment addResourceFromInputStream(String resourceName, InputStream inputStream);
+ Deployment addResourceFromClasspath(String resourceName);
+ Deployment addResourceFromUrl(URL url);
+ Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
+
+ /** @return deploymentId */
+ long deploy();
- Deployment setFileType(String fileName, String fileType);
-
- Deployment deploy();
-
- /** the deployed process definitions. */
- List<ProcessDefinition> getProcessDefinitions();
- /** the problems encountered during deployment */
- List<Problem> getProblems();
+ Deployment addProcessDefinition(ClientProcessDefinition processDefinition);
}
Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -30,9 +30,14 @@
public interface ProcessEngine {
/** the {@link ProcessService process service} that provides access
- * to the process repository. */
+ * to the process repository.
+ * @deprecated */
ProcessService getProcessService();
+ /** the {@link RepositoryService repository service} that provides access
+ * to the process repository. */
+ RepositoryService getRepositoryService();
+
/** the {@link ExecutionService execution service} that provides access
* to the runtime executions repository. */
ExecutionService getExecutionService();
Property changes on: jbpm4/branches/tbaeyens/modules/deployment
___________________________________________________________________
Name: svn:ignore
+ target
Modified: jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -33,10 +33,10 @@
import org.jbpm.ManagementService;
import org.jbpm.ProcessEngine;
import org.jbpm.ProcessService;
+import org.jbpm.RepositoryService;
import org.jbpm.TaskService;
import org.jbpm.cmd.CommandService;
import org.jbpm.job.Job;
-import org.jbpm.pvm.internal.repository.api.RepositoryService;
import org.jbpm.pvm.internal.stream.StringStreamInput;
import org.jbpm.task.Task;
import org.jbpm.test.BaseJbpmTestCase;
@@ -138,7 +138,7 @@
public void deployJpdlXmlString(String jpdlXmlString) {
long deploymentDbid =
repositoryService.createDeployment()
- .addStreamInput("xmlstring.jpdl.xml", new StringStreamInput(jpdlXmlString))
+ .addResourceFromString("xmlstring.jpdl.xml", jpdlXmlString)
.deploy();
registerDeployment(deploymentDbid);
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,12 +28,8 @@
<discriminator><column name="CLASS_" /></discriminator>
<version name="dbversion" column="DBVERSION_" />
- <many-to-one name="activity"
- class="org.jbpm.pvm.internal.model.ActivityImpl"
- column="ACT_"
- lazy="false"
- foreign-key="FK_EXEC_ACT"
- index="IDX_EXEC_ACT" />
+ <property name="activityName" column="ACTIVITYNAME_" />
+ <property name="processDefinitionId" column="PROCDEFID_" />
<property name="hasVariables" column="HASVARS_" />
<map name="variables"
@@ -63,19 +59,13 @@
<property name="priority" column="PRIORITY_" />
<property name="historyActivityInstanceDbid" column="HISACTINST_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCESS_"
- foreign-key="FK_EXEC_PROCESS"
- index="IDX_EXEC_PROCESS" />
+ <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / -->
- <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" />
-
- <many-to-one name="transitionOrigin"
+ <!-- many-to-one name="transitionOrigin"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="TRANSORIG_"
foreign-key="FK_EXEC_TRANSORIG"
- index="IDX_EXEC_TRANSORIG" />
+ index="IDX_EXEC_TRANSORIG" / -->
<list name="executions"
cascade="all-delete-orphan"
@@ -212,7 +202,7 @@
<property name="text" type="text" column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -240,21 +230,22 @@
cascade="none"
foreign-key="FK_JOB_EXE"
index="IDX_JOB_EXE"/>
- <many-to-one name="commandDescriptor"
+
+ <!-- many-to-one name="commandDescriptor"
column="CMDDESCR_"
class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
cascade="all"
foreign-key="FK_JOB_CMDDESCR"
- index="IDX_JOB_CMDDESCR"/>
+ index="IDX_JOB_CMDDESCR"/ -->
<subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg">
<subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg">
<property name="signalName" column="SIGNAL_" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
column="NODE_"
cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"/ -->
</subclass>
<subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" />
@@ -357,20 +348,20 @@
]]>
</query>
- <query name="findExecutionByKey">
+ <!-- query name="findExecutionByKey">
<![CDATA[
select execution
from org.jbpm.pvm.internal.model.ExecutionImpl as execution
where execution.key = :executionKey
and execution.processDefinition.name = :processDefinitionName
]]>
- </query>
+ </query -->
<query name="findProcessInstanceIds">
<![CDATA[
select processInstance.id
from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance
- where processInstance.processDefinition.id = :processDefinitionId
+ where processInstance.processDefinitionId = :processDefinitionId
and processInstance.parent is null
]]>
</query>
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.history.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -18,11 +18,11 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
+ <!-- many-to-one name="processDefinition"
class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
column="PROCDEF_"
foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
+ index="IDX_HISTPI_PROCDEF" / -->
<set name="historyActivityInstances"
cascade="all">
@@ -48,11 +48,11 @@
foreign-key="FK_HAI_HPI"
index="IDX_HAI_HPI" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="ACTIVITY_"
foreign-key="FK_HISTAI_ACT"
- index="IDX_HISTAI_ACT" />
+ index="IDX_HISTAI_ACT" / -->
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.jpdl.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -3,7 +3,7 @@
<hibernate-mapping default-access="field">
- <subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
+ <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
discriminator-value="jpdl">
<map name="swimlaneDefinitions"
@@ -22,7 +22,7 @@
<map-key type="string" column="NAME_" />
<one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" />
</map>
- </subclass>
+ </subclass -->
<subclass name="org.jbpm.jpdl.internal.model.JpdlExecution"
extends="org.jbpm.pvm.internal.model.ExecutionImpl"
@@ -38,7 +38,7 @@
</map>
</subclass>
- <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
+ <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -118,5 +118,6 @@
index="IDX_ACT_TASKDEF" />
</subclass>
</class>
+ -->
</hibernate-mapping>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.task.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
- <!-- ### ASSIGNABLE DEFINITIONS ######################################### -->
+ <!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
table="JBPM_ASSIGNDEF"
discriminator-value="A" >
@@ -32,8 +32,9 @@
<subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
</subclass>
+ -->
- <!-- ### TASK DEFINITION ################################################ -->
+ <!-- ### TASK DEFINITION ################################################
<subclass name="TaskDefinitionImpl" discriminator-value="T">
<property name="priority" column="PRIORITY_"/>
@@ -60,6 +61,7 @@
</list>
</subclass>
</class>
+ -->
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
@@ -116,11 +118,11 @@
column="SWIMLANE_"
foreign-key="FK_TASK_SWIML" />
- <many-to-one name="taskDefinition"
+ <!-- many-to-one name="taskDefinition"
column="TASKDEF_"
class="org.jbpm.pvm.internal.task.TaskDefinitionImpl"
foreign-key="FK_TSK_TASKDEF"
- index="IDX_TSK_TASKDEF" />
+ index="IDX_TSK_TASKDEF" / -->
<list name="comments" cascade="all-delete-orphan">
<key column="TASK_" />
@@ -169,10 +171,10 @@
<property name="name" column="NAME_"/>
<property name="assignee" column="ASSIGNEE_"/>
- <many-to-one name="swimlaneDefinition"
+ <!-- many-to-one name="swimlaneDefinition"
class="SwimlaneDefinitionImpl"
column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
+ foreign-key="FK_SWIMLANE_DEF" / -->
<many-to-one name="execution"
class="org.jbpm.pvm.internal.model.ExecutionImpl"
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/pvm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/pvm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/pvm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,4 +1,4 @@
- <mapping resource="jbpm.definition.hbm.xml" />
+ <mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,5 +1,2 @@
<deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
+ <jpdl-deployer />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,6 +4,8 @@
<process-engine-context>
+ <repository-service />
+ <repository-cache />
<process-service />
<execution-service />
<history-service />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,8 +1,6 @@
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
</hibernate-configuration>
<hibernate-session-factory />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part3.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part3.jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part3.jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,6 +1,3 @@
- <check-process />
- <check-problems />
- <save />
</deployer-manager>
<script-manager default-expression-language="juel"
@@ -30,6 +27,7 @@
<transaction-context>
<transaction />
+ <repository-session />
<pvm-db-session />
<job-db-session />
<task-db-session />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/jpdl.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/jpdl.include.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/jpdl.include.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,2 +1,2 @@
<!-- jpdl bindings -->
- <binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
+ <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -50,6 +50,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
@@ -65,13 +67,11 @@
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.AssignFileTypesBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProcessBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.SaveBinding" />
<!-- interceptors -->
<binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -23,7 +23,7 @@
ExecutionService executionService = processEngine.getExecutionService();
Deployment deployment = processService.createDeployment();
- deployment.addResource("org/jbpm/examples/services/process.jpdl.xml");
+ deployment.addResourceFromClasspath("org/jbpm/examples/services/process.jpdl.xml");
deployment.deploy();
Execution processInstance = executionService.startProcessInstanceByKey("simple");
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,6 +4,8 @@
<process-engine-context>
+ <repository-service />
+ <repository-cache />
<process-service />
<execution-service />
<history-service />
@@ -18,20 +20,12 @@
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
</hibernate-configuration>
<hibernate-session-factory />
<deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
- <check-process />
- <check-problems />
- <save />
+ <jpdl-deployer />
</deployer-manager>
<script-manager default-expression-language="juel"
@@ -61,6 +55,7 @@
<transaction-context>
<transaction />
+ <repository-session />
<pvm-db-session />
<job-db-session />
<task-db-session />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,12 +28,8 @@
<discriminator><column name="CLASS_" /></discriminator>
<version name="dbversion" column="DBVERSION_" />
- <many-to-one name="activity"
- class="org.jbpm.pvm.internal.model.ActivityImpl"
- column="ACT_"
- lazy="false"
- foreign-key="FK_EXEC_ACT"
- index="IDX_EXEC_ACT" />
+ <property name="activityName" column="ACTIVITYNAME_" />
+ <property name="processDefinitionId" column="PROCDEFID_" />
<property name="hasVariables" column="HASVARS_" />
<map name="variables"
@@ -63,19 +59,13 @@
<property name="priority" column="PRIORITY_" />
<property name="historyActivityInstanceDbid" column="HISACTINST_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCESS_"
- foreign-key="FK_EXEC_PROCESS"
- index="IDX_EXEC_PROCESS" />
+ <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / -->
- <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" />
-
- <many-to-one name="transitionOrigin"
+ <!-- many-to-one name="transitionOrigin"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="TRANSORIG_"
foreign-key="FK_EXEC_TRANSORIG"
- index="IDX_EXEC_TRANSORIG" />
+ index="IDX_EXEC_TRANSORIG" / -->
<list name="executions"
cascade="all-delete-orphan"
@@ -212,7 +202,7 @@
<property name="text" type="text" column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -240,21 +230,22 @@
cascade="none"
foreign-key="FK_JOB_EXE"
index="IDX_JOB_EXE"/>
- <many-to-one name="commandDescriptor"
+
+ <!-- many-to-one name="commandDescriptor"
column="CMDDESCR_"
class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
cascade="all"
foreign-key="FK_JOB_CMDDESCR"
- index="IDX_JOB_CMDDESCR"/>
+ index="IDX_JOB_CMDDESCR"/ -->
<subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg">
<subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg">
<property name="signalName" column="SIGNAL_" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
column="NODE_"
cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"/ -->
</subclass>
<subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" />
@@ -357,20 +348,20 @@
]]>
</query>
- <query name="findExecutionByKey">
+ <!-- query name="findExecutionByKey">
<![CDATA[
select execution
from org.jbpm.pvm.internal.model.ExecutionImpl as execution
where execution.key = :executionKey
and execution.processDefinition.name = :processDefinitionName
]]>
- </query>
+ </query -->
<query name="findProcessInstanceIds">
<![CDATA[
select processInstance.id
from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance
- where processInstance.processDefinition.id = :processDefinitionId
+ where processInstance.processDefinitionId = :processDefinitionId
and processInstance.parent is null
]]>
</query>
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -15,7 +15,7 @@
<property name="hibernate.format_sql">true</property>
<property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <mapping resource="jbpm.definition.hbm.xml" />
+ <mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -18,11 +18,11 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
+ <!-- many-to-one name="processDefinition"
class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
column="PROCDEF_"
foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
+ index="IDX_HISTPI_PROCDEF" / -->
<set name="historyActivityInstances"
cascade="all">
@@ -48,11 +48,11 @@
foreign-key="FK_HAI_HPI"
index="IDX_HAI_HPI" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="ACTIVITY_"
foreign-key="FK_HISTAI_ACT"
- index="IDX_HISTAI_ACT" />
+ index="IDX_HISTAI_ACT" / -->
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -3,7 +3,7 @@
<hibernate-mapping default-access="field">
- <subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
+ <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
discriminator-value="jpdl">
<map name="swimlaneDefinitions"
@@ -22,7 +22,7 @@
<map-key type="string" column="NAME_" />
<one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" />
</map>
- </subclass>
+ </subclass -->
<subclass name="org.jbpm.jpdl.internal.model.JpdlExecution"
extends="org.jbpm.pvm.internal.model.ExecutionImpl"
@@ -38,7 +38,7 @@
</map>
</subclass>
- <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
+ <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -118,5 +118,6 @@
index="IDX_ACT_TASKDEF" />
</subclass>
</class>
+ -->
</hibernate-mapping>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
- <!-- ### ASSIGNABLE DEFINITIONS ######################################### -->
+ <!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
table="JBPM_ASSIGNDEF"
discriminator-value="A" >
@@ -32,8 +32,9 @@
<subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
</subclass>
+ -->
- <!-- ### TASK DEFINITION ################################################ -->
+ <!-- ### TASK DEFINITION ################################################
<subclass name="TaskDefinitionImpl" discriminator-value="T">
<property name="priority" column="PRIORITY_"/>
@@ -60,6 +61,7 @@
</list>
</subclass>
</class>
+ -->
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
@@ -116,11 +118,11 @@
column="SWIMLANE_"
foreign-key="FK_TASK_SWIML" />
- <many-to-one name="taskDefinition"
+ <!-- many-to-one name="taskDefinition"
column="TASKDEF_"
class="org.jbpm.pvm.internal.task.TaskDefinitionImpl"
foreign-key="FK_TSK_TASKDEF"
- index="IDX_TSK_TASKDEF" />
+ index="IDX_TSK_TASKDEF" / -->
<list name="comments" cascade="all-delete-orphan">
<key column="TASK_" />
@@ -169,10 +171,10 @@
<property name="name" column="NAME_"/>
<property name="assignee" column="ASSIGNEE_"/>
- <many-to-one name="swimlaneDefinition"
+ <!-- many-to-one name="swimlaneDefinition"
class="SwimlaneDefinitionImpl"
column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
+ foreign-key="FK_SWIMLANE_DEF" / -->
<many-to-one name="execution"
class="org.jbpm.pvm.internal.model.ExecutionImpl"
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -50,6 +50,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
@@ -65,13 +67,11 @@
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.AssignFileTypesBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProcessBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.SaveBinding" />
<!-- interceptors -->
<binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" />
@@ -88,6 +88,6 @@
<binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
- <binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
+ <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" />
</wire-bindings>
Modified: jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -162,12 +162,10 @@
public void deploy(String fileName, String contentType, InputStream deployment)
{
- List<ProcessDefinition> definitions =
this.processEngine.getProcessService()
.createDeployment()
- .addInputStream(fileName, deployment)
- .deploy()
- .getProcessDefinitions();
+ .addResourceFromInputStream(fileName, deployment)
+ .deploy();
}
}
Modified: jbpm4/branches/tbaeyens/modules/integration/jboss4/src/main/java/org/jbpm/integration/jboss4/JBPMDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/integration/jboss4/src/main/java/org/jbpm/integration/jboss4/JBPMDeployer.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/integration/jboss4/src/main/java/org/jbpm/integration/jboss4/JBPMDeployer.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -27,7 +27,7 @@
import org.jboss.deployment.SubDeployerSupport;
import org.jbpm.integration.spi.DeploymentAdaptor;
import org.jbpm.integration.spi.JBPMDeploymentMetaData;
-import org.jbpm.integration.spi.ProcessDeploymentRef;
+import org.jbpm.integration.spi.DeploymentRef;
import org.jbpm.internal.log.Log;
import java.util.List;
@@ -37,7 +37,7 @@
/**
* An AS 4.2.x deployer for jBPM4 process archives.
* Delegates to {@link org.jbpm.integration.spi.DeploymentAdaptor}.
- * The deployer retains a {@link org.jbpm.integration.spi.ProcessDeploymentRef}
+ * The deployer retains a {@link org.jbpm.integration.spi.DeploymentRef}
* for subsequent undeployment calls.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -105,7 +105,7 @@
{
log.info("Deploy " + rootDeployment.url);
- List<ProcessDeploymentRef> allProcessRefs = new ArrayList<ProcessDeploymentRef>();
+ List<DeploymentRef> deploymentRefs = new ArrayList<DeploymentRef>();
Iterator iterator = rootDeployment.subDeployments.iterator();
while(iterator.hasNext())
@@ -116,12 +116,12 @@
md.setWatch(rootDeployment.watch);
md.setProcessDescriptor(subDeployment.url);
- List<ProcessDeploymentRef> subDeploymentRefs = null;
+ DeploymentRef deploymentRef;
try
{
- subDeploymentRefs = adaptor.deploy(md);
- allProcessRefs.addAll(subDeploymentRefs);
+ deploymentRef = adaptor.deploy(md);
+ deploymentRefs.add(deploymentRef);
}
catch (Throwable t)
{
@@ -129,7 +129,7 @@
}
}
- rootDeployment.context.put(CONTEXT_REFERENCE, allProcessRefs);
+ rootDeployment.context.put(CONTEXT_REFERENCE, deploymentRefs);
}
}
@@ -151,17 +151,17 @@
{
log.info("Undeploy " + rootDeployment.url);
- List<ProcessDeploymentRef> processRefs = (List<ProcessDeploymentRef>)
+ List<DeploymentRef> deploymentRefs = (List<DeploymentRef>)
rootDeployment.context.get(CONTEXT_REFERENCE);
- if(null==processRefs)
+ if(null==deploymentRefs)
{
log.info("Failed to retrieve process reference information. " +
"Ignore undepoyment call: "+ rootDeployment.url);
return;
}
- adaptor.undeploy(processRefs);
+ adaptor.undeploy(deploymentRefs);
}
}
}
Modified: jbpm4/branches/tbaeyens/modules/integration/jboss5/src/main/java/org/jbpm/integration/jboss5/JBPMDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/integration/jboss5/src/main/java/org/jbpm/integration/jboss5/JBPMDeployer.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/integration/jboss5/src/main/java/org/jbpm/integration/jboss5/JBPMDeployer.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -27,15 +27,16 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jbpm.integration.spi.DeploymentAdaptor;
import org.jbpm.integration.spi.JBPMDeploymentMetaData;
-import org.jbpm.integration.spi.ProcessDeploymentRef;
+import org.jbpm.integration.spi.DeploymentRef;
import org.jbpm.internal.log.Log;
+import java.util.ArrayList;
import java.util.List;
/**
* An AS 5.0.x deployer for jBPM4 process archives.
* Delegates to {@link org.jbpm.integration.spi.DeploymentAdaptor}.
- * The deployer retains a {@link org.jbpm.integration.spi.ProcessDeploymentRef}
+ * The deployer retains a {@link org.jbpm.integration.spi.DeploymentRef}
* for subsequent undeployment calls.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -63,9 +64,9 @@
try
{
- List<ProcessDeploymentRef> processRefs = adaptor.deploy(deployment);
+ DeploymentRef deploymentRef = adaptor.deploy(deployment);
// TODO: mark the process 'ready', classloader assoc
- unit.addAttachment("jbpm.deployer.reference", processRefs);
+ unit.addAttachment("jbpm.deployment.ref", deploymentRef);
}
catch (Throwable t)
{
@@ -78,15 +79,18 @@
{
log.info("Undeploy "+deployment);
- List<ProcessDeploymentRef> processRefs =
- (List<ProcessDeploymentRef>)unit.getAttachment("jbpm.deployer.reference");
+ DeploymentRef deploymentRef =
+ (DeploymentRef)unit.getAttachment("jbpm.deployment.ref");
- if(null==processRefs)
+ if(null==deploymentRef)
{
log.info("Failed to retrieve process reference information. Ignore undepoyment call: "+ deployment);
return;
}
+
+ List<DeploymentRef> deploymentRefs = new ArrayList<DeploymentRef>();
+ deploymentRefs.add(deploymentRef);
- adaptor.undeploy(processRefs);
+ adaptor.undeploy(deploymentRefs);
}
}
Modified: jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,18 +21,17 @@
*/
package org.jbpm.integration.spi;
-import org.jbpm.Deployment;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessService;
-import org.jbpm.internal.log.Log;
+import java.io.File;
+import java.util.List;
import javax.naming.InitialContext;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import org.jbpm.ProcessService;
+import org.jbpm.RepositoryService;
+import org.jbpm.internal.log.Log;
+
/**
* Adopts AS 4 and AS 5 deployer invocations to jBPM invocations.
*
@@ -42,7 +41,7 @@
{
private static final Log log = Log.getLog(DeploymentAdaptor.class.getName());
- public List<ProcessDeploymentRef> deploy(JBPMDeploymentMetaData deploymentMetData)
+ public DeploymentRef deploy(JBPMDeploymentMetaData deploymentMetData)
{
JBPMService jbpmService = JBPMServiceLocator.locateService();
@@ -57,35 +56,20 @@
// deploy to process engine
ProcessService processService = jbpmService.getProcessEngine().getProcessService();
- String pathToDeployment = deploymentMetData.getWatch().getPath();
- File deploymentFile = new File(pathToDeployment);
+ String deploymentName = deploymentMetData.getWatch().getPath();
+ File deploymentFile = new File(deploymentName);
- Deployment dpl = processService.createDeployment()
- .addUrl(deploymentMetData.getProcessDescriptor())
+ long deploymentDbid = processService.createDeployment()
+ .addResourceFromUrl(deploymentMetData.getProcessDescriptor())
.setTimestamp(deploymentFile.lastModified())
- .setName(deploymentMetData.getWatch().getPath());
+ .setName(deploymentName)
+ .deploy();
+
+ DeploymentRef deploymentRef = new DeploymentRef(deploymentDbid, deploymentName);
- List<ProcessDefinition> processesInScope =
- dpl
- .deploy()
- .getProcessDefinitions();
-
- // pass reference to the deployment unit for undeployment
- List<ProcessDeploymentRef> processRefs = new ArrayList<ProcessDeploymentRef>();
- for(ProcessDefinition pd : processesInScope)
- {
- ProcessDeploymentRef ref = new ProcessDeploymentRef(
- pd.getId(),
- pd.getVersion(),
- deploymentMetData.getWatch().getPath()
- );
- processRefs.add(ref);
- }
-
tx.commit();
- return processRefs;
-
+ return deploymentRef;
}
catch(Throwable e)
{
@@ -103,7 +87,7 @@
}
- public void undeploy(List<ProcessDeploymentRef> processRefs)
+ public void undeploy(List<DeploymentRef> deploymentRefs)
{
UserTransaction tx = null;
@@ -111,28 +95,27 @@
{
JBPMService jbpmService = JBPMServiceLocator.locateService();
- ProcessService processService = jbpmService.getProcessEngine().getProcessService();
+ RepositoryService repositoryService = jbpmService.getProcessEngine().getRepositoryService();
InitialContext ctx = new InitialContext();
tx = (UserTransaction)ctx.lookup("UserTransaction");
tx.begin();
-
- for(ProcessDeploymentRef ref : processRefs)
- {
+
+ for (DeploymentRef deploymentRef: deploymentRefs) {
// if the physical artifact has been removed the process can be deleted
- File deploymentArtifact = new File(ref.getLocation());
+ File deploymentArtifact = new File(deploymentRef.getLocation());
if(!deploymentArtifact.exists())
{
- log.info("The deployment artifact for process '"+ref+" has been deleted."+
+ log.info("The deployment artifact for process '"+deploymentRef+" has been deleted."+
" The process definition will be removed.");
- processService.deleteProcessDefinition(ref.getProcessId());
+ repositoryService.deleteDeployment(deploymentRef.getDeploymentDbid());
}
else
{
// TODO: if the file remains, mark the process as 'shutdown'
- log.info("The deployment artifact for process '"+ref+"' retains. " +
+ log.info("The deployment artifact for process '"+deploymentRef+"' retains. " +
"Keep process definition.");
}
}
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -31,8 +31,8 @@
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.repository.Deployer;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
-import org.jbpm.pvm.internal.repository.api.RepositorySession;
import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.session.RepositorySession;
/**
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,6 +4,8 @@
<process-engine-context>
+ <repository-service />
+ <repository-cache />
<process-service />
<execution-service />
<history-service />
@@ -18,20 +20,12 @@
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
</hibernate-configuration>
<hibernate-session-factory />
<deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
- <check-process />
- <check-problems />
- <save />
+ <jpdl-deployer />
</deployer-manager>
<script-manager default-expression-language="juel"
@@ -61,6 +55,7 @@
<transaction-context>
<transaction />
+ <repository-session />
<pvm-db-session />
<job-db-session />
<task-db-session />
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,12 +28,8 @@
<discriminator><column name="CLASS_" /></discriminator>
<version name="dbversion" column="DBVERSION_" />
- <many-to-one name="activity"
- class="org.jbpm.pvm.internal.model.ActivityImpl"
- column="ACT_"
- lazy="false"
- foreign-key="FK_EXEC_ACT"
- index="IDX_EXEC_ACT" />
+ <property name="activityName" column="ACTIVITYNAME_" />
+ <property name="processDefinitionId" column="PROCDEFID_" />
<property name="hasVariables" column="HASVARS_" />
<map name="variables"
@@ -63,19 +59,13 @@
<property name="priority" column="PRIORITY_" />
<property name="historyActivityInstanceDbid" column="HISACTINST_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCESS_"
- foreign-key="FK_EXEC_PROCESS"
- index="IDX_EXEC_PROCESS" />
+ <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / -->
- <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" />
-
- <many-to-one name="transitionOrigin"
+ <!-- many-to-one name="transitionOrigin"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="TRANSORIG_"
foreign-key="FK_EXEC_TRANSORIG"
- index="IDX_EXEC_TRANSORIG" />
+ index="IDX_EXEC_TRANSORIG" / -->
<list name="executions"
cascade="all-delete-orphan"
@@ -212,7 +202,7 @@
<property name="text" type="text" column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -240,21 +230,22 @@
cascade="none"
foreign-key="FK_JOB_EXE"
index="IDX_JOB_EXE"/>
- <many-to-one name="commandDescriptor"
+
+ <!-- many-to-one name="commandDescriptor"
column="CMDDESCR_"
class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
cascade="all"
foreign-key="FK_JOB_CMDDESCR"
- index="IDX_JOB_CMDDESCR"/>
+ index="IDX_JOB_CMDDESCR"/ -->
<subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg">
<subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg">
<property name="signalName" column="SIGNAL_" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
column="NODE_"
cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"/ -->
</subclass>
<subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" />
@@ -357,20 +348,20 @@
]]>
</query>
- <query name="findExecutionByKey">
+ <!-- query name="findExecutionByKey">
<![CDATA[
select execution
from org.jbpm.pvm.internal.model.ExecutionImpl as execution
where execution.key = :executionKey
and execution.processDefinition.name = :processDefinitionName
]]>
- </query>
+ </query -->
<query name="findProcessInstanceIds">
<![CDATA[
select processInstance.id
from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance
- where processInstance.processDefinition.id = :processDefinitionId
+ where processInstance.processDefinitionId = :processDefinitionId
and processInstance.parent is null
]]>
</query>
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -15,7 +15,7 @@
<property name="hibernate.format_sql">true</property>
<property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <mapping resource="jbpm.definition.hbm.xml" />
+ <mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -18,11 +18,11 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
+ <!-- many-to-one name="processDefinition"
class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
column="PROCDEF_"
foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
+ index="IDX_HISTPI_PROCDEF" / -->
<set name="historyActivityInstances"
cascade="all">
@@ -48,11 +48,11 @@
foreign-key="FK_HAI_HPI"
index="IDX_HAI_HPI" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="ACTIVITY_"
foreign-key="FK_HISTAI_ACT"
- index="IDX_HISTAI_ACT" />
+ index="IDX_HISTAI_ACT" / -->
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -3,7 +3,7 @@
<hibernate-mapping default-access="field">
- <subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
+ <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
discriminator-value="jpdl">
<map name="swimlaneDefinitions"
@@ -22,7 +22,7 @@
<map-key type="string" column="NAME_" />
<one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" />
</map>
- </subclass>
+ </subclass -->
<subclass name="org.jbpm.jpdl.internal.model.JpdlExecution"
extends="org.jbpm.pvm.internal.model.ExecutionImpl"
@@ -38,7 +38,7 @@
</map>
</subclass>
- <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
+ <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -118,5 +118,6 @@
index="IDX_ACT_TASKDEF" />
</subclass>
</class>
+ -->
</hibernate-mapping>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
- <!-- ### ASSIGNABLE DEFINITIONS ######################################### -->
+ <!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
table="JBPM_ASSIGNDEF"
discriminator-value="A" >
@@ -32,8 +32,9 @@
<subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
</subclass>
+ -->
- <!-- ### TASK DEFINITION ################################################ -->
+ <!-- ### TASK DEFINITION ################################################
<subclass name="TaskDefinitionImpl" discriminator-value="T">
<property name="priority" column="PRIORITY_"/>
@@ -60,6 +61,7 @@
</list>
</subclass>
</class>
+ -->
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
@@ -116,11 +118,11 @@
column="SWIMLANE_"
foreign-key="FK_TASK_SWIML" />
- <many-to-one name="taskDefinition"
+ <!-- many-to-one name="taskDefinition"
column="TASKDEF_"
class="org.jbpm.pvm.internal.task.TaskDefinitionImpl"
foreign-key="FK_TSK_TASKDEF"
- index="IDX_TSK_TASKDEF" />
+ index="IDX_TSK_TASKDEF" / -->
<list name="comments" cascade="all-delete-orphan">
<key column="TASK_" />
@@ -169,10 +171,10 @@
<property name="name" column="NAME_"/>
<property name="assignee" column="ASSIGNEE_"/>
- <many-to-one name="swimlaneDefinition"
+ <!-- many-to-one name="swimlaneDefinition"
class="SwimlaneDefinitionImpl"
column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
+ foreign-key="FK_SWIMLANE_DEF" / -->
<many-to-one name="execution"
class="org.jbpm.pvm.internal.model.ExecutionImpl"
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -50,6 +50,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
@@ -65,13 +67,11 @@
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.AssignFileTypesBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProcessBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.SaveBinding" />
<!-- interceptors -->
<binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" />
@@ -88,6 +88,6 @@
<binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
- <binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
+ <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" />
</wire-bindings>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -25,7 +25,6 @@
import java.io.InputStream;
import java.net.URL;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.jbpm.Configuration;
@@ -35,6 +34,7 @@
import org.jbpm.ManagementService;
import org.jbpm.ProcessEngine;
import org.jbpm.ProcessService;
+import org.jbpm.RepositoryService;
import org.jbpm.TaskService;
import org.jbpm.env.Context;
import org.jbpm.env.Environment;
@@ -163,6 +163,9 @@
public IdentityService getIdentityService() {
return environmentFactoryCtxWireContext.get(IdentityService.class);
}
+ public RepositoryService getRepositoryService() {
+ return environmentFactoryCtxWireContext.get(RepositoryService.class);
+ }
public static EnvironmentFactory parseXmlString(String xmlString) {
JbpmConfiguration jbpmConfiguration = new JbpmConfiguration();
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,38 +21,42 @@
*/
package org.jbpm.pvm.internal.cmd;
-import java.util.List;
-
import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.deploy.DeployerManager;
-import org.jbpm.pvm.internal.svc.DeploymentImpl;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
+import org.jbpm.session.RepositorySession;
+
/**
* @author Tom Baeyens
*/
-public class DeployCmd extends AbstractCommand<List<ProcessDefinition>> {
+public class DeployCmd implements Command<Long> {
private static final long serialVersionUID = 1L;
-
- protected DeploymentImpl deployment;
+ private static Log log = Log.getLog(DeployCmd.class.getName());
+
+ DeploymentImpl deployment;
+
public DeployCmd(DeploymentImpl deployment) {
this.deployment = deployment;
}
- public List<ProcessDefinition> execute(Environment environment) throws Exception {
- DeployerManager deployerManager = environment.get(DeployerManager.class);
- if (deployerManager==null) {
- throw new JbpmException("no "+DeployerManager.class.getName()+" configured");
+ public Long execute(Environment environment) throws Exception {
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
+ long deploymentDbid = repositorySession.deploy(deployment);
+
+ if (deployment.hasProblems()) {
+ String problemsText = deployment.getProblemsText();
+ if (problemsText!=null) {
+ String errorMsg = "problems during deployment of "+deployment+": "+problemsText;
+ log.info(errorMsg);
+ throw new JbpmException(errorMsg);
+ }
}
-
- // let the process parser managemer determine the process language
- // and handle the deployment
- deployerManager.deploy(deployment);
- return deployment.getProcessDefinitions();
+ return deploymentDbid;
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -1,78 +1,80 @@
-/*
- * 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.internal.cmd;
-
-import java.util.Map;
-
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
-
-
-/**
- * @author Tom Baeyens
- */
-public class StartExecutionInLatestCmd extends VariablesCmd<Execution> {
-
- private static final long serialVersionUID = 1L;
-
- protected String processDefinitionKey;
- protected String executionKey;
-
- public StartExecutionInLatestCmd(String processDefinitionKey, Map<String, Object> variables, String executionKey) {
- if (processDefinitionKey==null) {
- throw new JbpmException("processDefinitionKey is null");
- }
- this.processDefinitionKey = processDefinitionKey;
- this.variables = variables;
- this.executionKey = executionKey;
- }
-
- public Execution execute(Environment environment) throws Exception {
- PvmDbSession pvmDbSession = environment.get(PvmDbSession.class);
-
- ClientProcessDefinition processDefinition = null;
-
- processDefinition = pvmDbSession.findLatestProcessDefinitionByKey(processDefinitionKey);
-
- if (processDefinition==null) {
- throw new JbpmException("no process definition with key '"+processDefinitionKey+"'");
- }
-
- ClientProcessInstance processInstance = processDefinition.createProcessInstance(executionKey);
- processInstance.setVariables(variables);
- processInstance.start();
-
- pvmDbSession.save(processInstance);
- return processInstance;
- }
-
- public String getExecutionKey() {
- return executionKey;
- }
- public void setExecutionKey(String executionKey) {
- this.executionKey = executionKey;
- }
-}
+/*
+ * 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.internal.cmd;
+
+import java.util.Map;
+
+import org.hibernate.Session;
+import org.jbpm.Execution;
+import org.jbpm.JbpmException;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.env.Environment;
+import org.jbpm.session.RepositorySession;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class StartExecutionInLatestCmd extends VariablesCmd<Execution> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String processDefinitionKey;
+ protected String executionKey;
+
+ public StartExecutionInLatestCmd(String processDefinitionKey, Map<String, Object> variables, String executionKey) {
+ if (processDefinitionKey==null) {
+ throw new JbpmException("processDefinitionKey is null");
+ }
+ this.processDefinitionKey = processDefinitionKey;
+ this.variables = variables;
+ this.executionKey = executionKey;
+ }
+
+ public Execution execute(Environment environment) throws Exception {
+ ClientProcessDefinition processDefinition = null;
+
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
+ processDefinition = (ClientProcessDefinition) repositorySession
+ .findObjectByPropertyValue("jpdl.key", processDefinitionKey);
+
+ if (processDefinition==null) {
+ throw new JbpmException("no process definition with key '"+processDefinitionKey+"'");
+ }
+
+ ClientProcessInstance processInstance = processDefinition.createProcessInstance(executionKey);
+ processInstance.setVariables(variables);
+ processInstance.start();
+
+ Session session = Environment.getFromCurrent(Session.class);
+ session.save(processInstance);
+ return processInstance;
+ }
+
+ public String getExecutionKey() {
+ return executionKey;
+ }
+ public void setExecutionKey(String executionKey) {
+ this.executionKey = executionKey;
+ }
+}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -68,10 +68,10 @@
import org.jbpm.pvm.internal.model.op.ProceedToDestination;
import org.jbpm.pvm.internal.model.op.Signal;
import org.jbpm.pvm.internal.model.op.TakeTransition;
-import org.jbpm.pvm.internal.repository.api.RepositorySession;
import org.jbpm.pvm.internal.util.EqualsUtil;
import org.jbpm.pvm.internal.util.Priority;
import org.jbpm.session.MessageSession;
+import org.jbpm.session.RepositorySession;
/**
* @author Tom Baeyens
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployCmd.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployCmd.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -25,7 +25,8 @@
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.repository.api.RepositorySession;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
+import org.jbpm.session.RepositorySession;
/**
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -24,6 +24,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.ObjectStreamException;
+import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,12 +33,18 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.jbpm.Deployment;
import org.jbpm.JbpmException;
+import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.DeployCmd;
import org.jbpm.pvm.internal.lob.Lob;
-import org.jbpm.pvm.internal.repository.api.Deployment;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
+import org.jbpm.pvm.internal.stream.InputStreamInput;
+import org.jbpm.pvm.internal.stream.ResourceStreamInput;
import org.jbpm.pvm.internal.stream.StreamInput;
+import org.jbpm.pvm.internal.stream.StringStreamInput;
+import org.jbpm.pvm.internal.stream.UrlStreamInput;
import org.jbpm.pvm.internal.util.IoUtil;
import org.jbpm.pvm.internal.xml.ProblemList;
@@ -50,11 +57,9 @@
protected long dbid;
protected String name;
protected long timestamp;
-
protected Map<String, Lob> resources;
protected CommandService commandService;
-
protected Map<String, Object> objects;
protected Set<DeploymentProperty> objectProperties;
@@ -68,32 +73,25 @@
public long deploy() {
return commandService.execute(new DeployCmd(this));
}
- public void setName(String name) {
- this.name = name;
- }
- public void setTimestamp(long timestamp) {
- this.timestamp = timestamp;
+ public Deployment addResourceFromClasspath(String resourceName) {
+ addResourceFromStreamInput(resourceName, new ResourceStreamInput(resourceName));
+ return this;
}
- public Deployment addStreamInput(String name, StreamInput streamInput) {
- if (resources==null) {
- resources = new HashMap<String, Lob>();
- }
- byte[] bytes = IoUtil.readBytes(streamInput.openStream());
- Lob lob = new Lob(bytes);
- resources.put(name, lob);
+ public Deployment addResourceFromString(String resourceName, String text) {
+ addResourceFromStreamInput(resourceName, new StringStreamInput(text));
return this;
}
-
- public Deployment addZipInputStream(ZipInputStream zipInputStream) {
+
+ public Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream) {
try {
ZipEntry zipEntry = zipInputStream.getNextEntry();
while(zipEntry!=null) {
String entryName = zipEntry.getName();
byte[] bytes = IoUtil.readBytes(zipInputStream);
if (bytes!=null) {
- addStreamInput(entryName, new ByteArrayStreamInput(bytes));
+ addResourceFromStreamInput(entryName, new ByteArrayStreamInput(bytes));
}
zipEntry = zipInputStream.getNextEntry();
}
@@ -102,7 +100,27 @@
}
return this;
}
-
+
+ public Deployment addResourceFromInputStream(String resourceName, InputStream inputStream) {
+ addResourceFromStreamInput(resourceName, new InputStreamInput(inputStream));
+ return this;
+ }
+
+ public Deployment addResourceFromUrl(URL url) {
+ addResourceFromStreamInput(url.toString(), new UrlStreamInput(url));
+ return this;
+ }
+
+ public Deployment addResourceFromStreamInput(String name, StreamInput streamInput) {
+ if (resources==null) {
+ resources = new HashMap<String, Lob>();
+ }
+ byte[] bytes = IoUtil.readBytes(streamInput.openStream());
+ Lob lob = new Lob(bytes);
+ resources.put(name, lob);
+ return this;
+ }
+
public Set<String> getResourceNames() {
if (resources==null) {
return Collections.EMPTY_SET;
@@ -156,16 +174,29 @@
public long getDbid() {
return dbid;
}
+ public Map<String, Object> getObjects() {
+ return objects;
+ }
+ public Set<DeploymentProperty> getObjectProperties() {
+ return objectProperties;
+ }
public String getName() {
return name;
}
+ public DeploymentImpl setName(String name) {
+ this.name = name;
+ return this;
+ }
public long getTimestamp() {
return timestamp;
}
- public Map<String, Object> getObjects() {
- return objects;
+ public DeploymentImpl setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ return this;
}
- public Set<DeploymentProperty> getObjectProperties() {
- return objectProperties;
+
+
+ public Deployment addProcessDefinition(ClientProcessDefinition processDefinition) {
+ throw new UnsupportedOperationException("implement me");
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,11 +21,9 @@
*/
package org.jbpm.pvm.internal.repository;
-import java.io.InputStream;
-
+import org.jbpm.Deployment;
+import org.jbpm.RepositoryService;
import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.internal.repository.api.Deployment;
-import org.jbpm.pvm.internal.repository.api.RepositoryService;
/**
* @author Tom Baeyens
@@ -38,10 +36,10 @@
return new DeploymentImpl(commandService);
}
- public void deleteDeployment(long deploymentdbid) {
+ public void deleteDeployment(long deploymentDbid) {
}
- public InputStream getResource(String deploymentId, String resource) {
+ public byte[] getResource(long deploymentDbid, String resource) {
return null;
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -25,10 +25,11 @@
import java.util.List;
import org.hibernate.Session;
+import org.jbpm.Deployment;
import org.jbpm.JbpmException;
import org.jbpm.Problem;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.repository.api.RepositorySession;
+import org.jbpm.session.RepositorySession;
/**
* @author Tom Baeyens
@@ -41,28 +42,28 @@
RepositoryCache repositoryCache;
DeployerManager deployerManager;
- public long deploy(DeploymentImpl deployment) {
- session.save(deployment);
+ public long deploy(Deployment deployment) {
+ DeploymentImpl deploymentImpl = (DeploymentImpl) deployment;
+ session.save(deploymentImpl);
- deployment.setTimestamp(System.currentTimeMillis());
- deployment.setProblems(new ArrayList<Problem>());
+ deploymentImpl.setProblems(new ArrayList<Problem>());
- deployerManager.deploy(deployment);
+ deployerManager.deploy(deploymentImpl);
- if (deployment.hasProblems()) {
- for (Problem problem: deployment.getProblems()) {
+ if (deploymentImpl.hasProblems()) {
+ for (Problem problem: deploymentImpl.getProblems()) {
Throwable cause = problem.getCause();
if (cause!=null) {
log.debug("deployment exception", cause);
}
}
- throw new JbpmException("problems during deployment: "+deployment.getProblemsText());
+ throw new JbpmException("problems during deployment: "+deploymentImpl.getProblemsText());
} else {
- repositoryCache.set(deployment.getDbid(), deployment.getObjects());
+ repositoryCache.set(deploymentImpl.getDbid(), deploymentImpl.getObjects());
}
- return deployment.getDbid();
+ return deploymentImpl.getDbid();
}
public Object getObject(long deploymentDbid, String objectName) {
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -36,6 +36,7 @@
import org.jbpm.pvm.internal.cmd.FindProcessDefinitionsByKeyCmd;
import org.jbpm.pvm.internal.cmd.GetAttachment;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
/** {@link ProcessService} implementation that delegates execution of the
* methods to a {@link CommandService}.
@@ -45,7 +46,7 @@
public class ProcessServiceImpl extends AbstractServiceImpl implements ProcessService {
public Deployment createDeployment() {
- return new DeploymentImpl(this);
+ return new DeploymentImpl(commandService);
}
public List<String> findProcessDefinitionKeys() {
@@ -80,7 +81,7 @@
return new ProcessDefinitionQueryImpl(commandService);
}
- public List<ProcessDefinition> deploy(Deployment deployment) {
+ public Long deploy(Deployment deployment) {
return commandService.execute(new DeployCmd((DeploymentImpl)deployment));
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,14 +21,9 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jbpm.pvm.internal.deploy.DeployerManager;
-import org.jbpm.pvm.internal.util.XmlUtil;
-import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.internal.wire.descriptor.DeployerManagerDescriptor;
-import org.jbpm.pvm.internal.wire.xml.WireParser;
+import org.jbpm.pvm.internal.repository.DeployerManager;
+import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
import org.w3c.dom.Element;
@@ -49,24 +44,12 @@
}
public Object parse(Element element, Parse parse, Parser parser) {
- DeployerManagerDescriptor descriptor = new DeployerManagerDescriptor();
+ ObjectDescriptor objectDescriptor = new ObjectDescriptor(DeployerManager.class);
- List<Descriptor> deployerDescriptors = new ArrayList<Descriptor>();
- descriptor.setDeployerDescriptors(deployerDescriptors);
+ ListBinding listBinding = new ListBinding();
+ ListDescriptor listDescriptor = (ListDescriptor) listBinding.parse(element, parse, parser);
+ objectDescriptor.addInjection("deployers", listDescriptor);
- List<Element> deployerElements = XmlUtil.elements(element);
- for (Element deployerElement: deployerElements) {
- Descriptor deployerDescriptor = (Descriptor) parser
- .parseElement(deployerElement,
- parse,
- WireParser.CATEGORY_DESCRIPTOR);
- deployerDescriptors.add(deployerDescriptor);
- }
-
- if (deployerDescriptors.isEmpty()) {
- parse.addProblem("no deployers defined for "+DEPLOYER_MANAGER_TAG);
- }
-
- return descriptor;
+ return objectDescriptor;
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SavePolicy.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SavePolicy.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SavePolicy.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.pvm.internal.svc.DeploymentImpl;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -30,7 +30,7 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.env.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.svc.DeploymentImpl;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -52,6 +52,9 @@
log.debug("Apply " + this.getClass().getName());
PolicyEvaluation evaluation = new PolicyEvaluation();
+
+ /*
+ TODO
for (String fileName: deployment.getFileNamesForType("jpdl"))
{
@@ -137,7 +140,9 @@
}
}
+ */
+
return evaluation;
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,7 +28,7 @@
import org.jbpm.Problem;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.svc.DeploymentImpl;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
/** list of problems. Base class for {@link Parse}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -21,7 +21,6 @@
*/
package org.jbpm.pvm.internal.execution;
-import org.jbpm.Deployment;
import org.jbpm.Execution;
import org.jbpm.ExecutionService;
import org.jbpm.ProcessService;
@@ -30,8 +29,6 @@
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.svc.DeploymentImpl;
-import org.jbpm.pvm.internal.svc.ProcessServiceImpl;
import org.jbpm.pvm.test.EnvironmentFactoryTestCase;
/**
@@ -52,9 +49,10 @@
.endActivity()
.endProcess();
- Deployment deployment = new DeploymentImpl((ProcessServiceImpl) processService);
- deployment.addProcessDefinition(processDefinition);
- deployment.deploy();
+ processService
+ .createDeployment()
+ .addProcessDefinition(processDefinition)
+ .deploy();
}
public void testStartProcessInstance() {
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,6 +4,8 @@
<process-engine-context>
+ <repository-service />
+ <repository-cache />
<process-service />
<execution-service />
<history-service />
@@ -18,16 +20,11 @@
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
</hibernate-configuration>
<hibernate-session-factory />
<deployer-manager>
- <check-process />
- <check-problems />
- <save />
</deployer-manager>
<script-manager default-expression-language="juel"
@@ -57,6 +54,7 @@
<transaction-context>
<transaction />
+ <repository-session />
<pvm-db-session />
<job-db-session />
<task-db-session />
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,12 +28,8 @@
<discriminator><column name="CLASS_" /></discriminator>
<version name="dbversion" column="DBVERSION_" />
- <many-to-one name="activity"
- class="org.jbpm.pvm.internal.model.ActivityImpl"
- column="ACT_"
- lazy="false"
- foreign-key="FK_EXEC_ACT"
- index="IDX_EXEC_ACT" />
+ <property name="activityName" column="ACTIVITYNAME_" />
+ <property name="processDefinitionId" column="PROCDEFID_" />
<property name="hasVariables" column="HASVARS_" />
<map name="variables"
@@ -63,19 +59,13 @@
<property name="priority" column="PRIORITY_" />
<property name="historyActivityInstanceDbid" column="HISACTINST_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCESS_"
- foreign-key="FK_EXEC_PROCESS"
- index="IDX_EXEC_PROCESS" />
+ <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / -->
- <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" />
-
- <many-to-one name="transitionOrigin"
+ <!-- many-to-one name="transitionOrigin"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="TRANSORIG_"
foreign-key="FK_EXEC_TRANSORIG"
- index="IDX_EXEC_TRANSORIG" />
+ index="IDX_EXEC_TRANSORIG" / -->
<list name="executions"
cascade="all-delete-orphan"
@@ -212,7 +202,7 @@
<property name="text" type="text" column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -240,21 +230,22 @@
cascade="none"
foreign-key="FK_JOB_EXE"
index="IDX_JOB_EXE"/>
- <many-to-one name="commandDescriptor"
+
+ <!-- many-to-one name="commandDescriptor"
column="CMDDESCR_"
class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
cascade="all"
foreign-key="FK_JOB_CMDDESCR"
- index="IDX_JOB_CMDDESCR"/>
+ index="IDX_JOB_CMDDESCR"/ -->
<subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg">
<subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg">
<property name="signalName" column="SIGNAL_" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
column="NODE_"
cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"/ -->
</subclass>
<subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" />
@@ -357,20 +348,20 @@
]]>
</query>
- <query name="findExecutionByKey">
+ <!-- query name="findExecutionByKey">
<![CDATA[
select execution
from org.jbpm.pvm.internal.model.ExecutionImpl as execution
where execution.key = :executionKey
and execution.processDefinition.name = :processDefinitionName
]]>
- </query>
+ </query -->
<query name="findProcessInstanceIds">
<![CDATA[
select processInstance.id
from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance
- where processInstance.processDefinition.id = :processDefinitionId
+ where processInstance.processDefinitionId = :processDefinitionId
and processInstance.parent is null
]]>
</query>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -15,7 +15,7 @@
<property name="hibernate.format_sql">true</property>
<property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <mapping resource="jbpm.definition.hbm.xml" />
+ <mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -18,11 +18,11 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
+ <!-- many-to-one name="processDefinition"
class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
column="PROCDEF_"
foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
+ index="IDX_HISTPI_PROCDEF" / -->
<set name="historyActivityInstances"
cascade="all">
@@ -48,11 +48,11 @@
foreign-key="FK_HAI_HPI"
index="IDX_HAI_HPI" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="ACTIVITY_"
foreign-key="FK_HISTAI_ACT"
- index="IDX_HISTAI_ACT" />
+ index="IDX_HISTAI_ACT" / -->
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
- <!-- ### ASSIGNABLE DEFINITIONS ######################################### -->
+ <!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
table="JBPM_ASSIGNDEF"
discriminator-value="A" >
@@ -32,8 +32,9 @@
<subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
</subclass>
+ -->
- <!-- ### TASK DEFINITION ################################################ -->
+ <!-- ### TASK DEFINITION ################################################
<subclass name="TaskDefinitionImpl" discriminator-value="T">
<property name="priority" column="PRIORITY_"/>
@@ -60,6 +61,7 @@
</list>
</subclass>
</class>
+ -->
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
@@ -116,11 +118,11 @@
column="SWIMLANE_"
foreign-key="FK_TASK_SWIML" />
- <many-to-one name="taskDefinition"
+ <!-- many-to-one name="taskDefinition"
column="TASKDEF_"
class="org.jbpm.pvm.internal.task.TaskDefinitionImpl"
foreign-key="FK_TSK_TASKDEF"
- index="IDX_TSK_TASKDEF" />
+ index="IDX_TSK_TASKDEF" / -->
<list name="comments" cascade="all-delete-orphan">
<key column="TASK_" />
@@ -169,10 +171,10 @@
<property name="name" column="NAME_"/>
<property name="assignee" column="ASSIGNEE_"/>
- <many-to-one name="swimlaneDefinition"
+ <!-- many-to-one name="swimlaneDefinition"
class="SwimlaneDefinitionImpl"
column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
+ foreign-key="FK_SWIMLANE_DEF" / -->
<many-to-one name="execution"
class="org.jbpm.pvm.internal.model.ExecutionImpl"
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -50,6 +50,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
@@ -65,13 +67,11 @@
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.AssignFileTypesBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProcessBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.SaveBinding" />
<!-- interceptors -->
<binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" />
Modified: jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -31,9 +31,9 @@
import org.jbpm.HistoryService;
import org.jbpm.IdentityService;
import org.jbpm.ManagementService;
-import org.jbpm.ProcessDefinition;
import org.jbpm.ProcessEngine;
import org.jbpm.ProcessService;
+import org.jbpm.RepositoryService;
import org.jbpm.TaskService;
import org.jbpm.cmd.CommandService;
import org.jbpm.job.Job;
@@ -68,6 +68,7 @@
protected static ProcessEngine processEngine = null;
+ protected static RepositoryService repositoryService;
protected static ProcessService processService;
protected static ExecutionService executionService;
protected static ManagementService managementService;
@@ -77,9 +78,9 @@
protected static CommandService commandService;
- /** registered process definitions will be deleted automatically in the tearDown.
- * This is a convenience function as each test is expected to clean up the DB. */
- protected List<ProcessDefinition> registeredProcessDefinitions;
+ /** registered deployments. registered deployments will be deleted automatically
+ * in the tearDown. This is a convenience function as each test is expected to clean up the DB. */
+ protected List<Long> registeredDeployments;
/** registered tasks will be deleted automatically in the tearDown.
* This is a convenience function as each test is expected to clean up the DB. */
protected List<Long> registeredTaskIds;
@@ -102,6 +103,7 @@
processEngine = configuration.buildProcessEngine();
+ repositoryService = processEngine.get(RepositoryService.class);
processService = processEngine.getProcessService();
executionService = processEngine.getExecutionService();
historyService = processEngine.getHistoryService();
@@ -113,9 +115,9 @@
}
protected void tearDown() throws Exception {
- if (registeredProcessDefinitions!=null) {
- for (ProcessDefinition processDefinition : registeredProcessDefinitions) {
- processService.deleteProcessDefinitionCascade(processDefinition.getId());
+ if (registeredDeployments!=null) {
+ for (Long deploymentDbid : registeredDeployments) {
+ repositoryService.deleteDeployment(deploymentDbid);
}
}
@@ -130,50 +132,32 @@
super.tearDown();
}
- public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) {
- List<ProcessDefinition> deployedProcessDefinitions =
- processService.createDeployment()
- .addString("xmlstring.jpdl.xml", jpdlXmlString)
- .deploy()
- .getProcessDefinitions();
+ public void deployJpdlXmlString(String jpdlXmlString) {
+ long deploymentDbid =
+ repositoryService.createDeployment()
+ .addResourceFromString("xmlstring.jpdl.xml", jpdlXmlString)
+ .deploy();
- return registerDeployedProcessDefinitions(deployedProcessDefinitions);
+ registerDeployment(deploymentDbid);
}
+
+ public void deployJpdlResource(String resource) {
+ long deploymentDbid =
+ repositoryService.createDeployment()
+ .addResourceFromClasspath(resource)
+ .deploy();
- public ProcessDefinition deployJpdlResource(String resource) {
- List<ProcessDefinition> deployedProcessDefinitions =
- processService.createDeployment()
- .addResource(resource)
- .deploy()
- .getProcessDefinitions();
-
- return registerDeployedProcessDefinitions(deployedProcessDefinitions);
+ registerDeployment(deploymentDbid);
}
- protected ProcessDefinition addDeployedProcessDefinition(ProcessDefinition deployedProcessDefinition) {
- if (registeredProcessDefinitions==null) {
- registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
+ protected void registerDeployment(long deploymentDbid) {
+ if (registeredDeployments==null) {
+ registeredDeployments = new ArrayList<Long>();
}
- registeredProcessDefinitions.add(deployedProcessDefinition);
-
- return deployedProcessDefinition;
+ registeredDeployments.add(deploymentDbid);
}
- protected ProcessDefinition registerDeployedProcessDefinitions(List<ProcessDefinition> deployedProcessDefinitions) {
- if (registeredProcessDefinitions==null) {
- registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
- }
-
- registeredProcessDefinitions.addAll(deployedProcessDefinitions);
-
- if (deployedProcessDefinitions.size()>=1) {
- return deployedProcessDefinitions.get(0);
- }
-
- return null;
- }
-
public long saveAndRegisterTask(Task task) {
long taskDbid = taskService.saveTask(task);
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessAttachmentsTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -38,22 +38,22 @@
byte[] lotOfBytes = generateString("a lot of bytes ", 5000).getBytes();
byte[] otherBytes = generateString("other bytes ", 5000).getBytes();
- List<ProcessDefinition> deployedProcessDefinitions =
+ long deploymentDbid =
processService.createDeployment()
- .addString("xmlstring.jpdl.xml",
+ .addResourceFromString("xmlstring.jpdl.xml",
"<process name='Insurance claim'>" +
" <start />" +
"</process>")
- .addInputStream("a lot of attachment", new ByteArrayInputStream(lotOfBytes))
- .addInputStream("other attachment", new ByteArrayInputStream(otherBytes))
- .deploy()
- .getProcessDefinitions();
- ProcessDefinition processDefinition = registerDeployedProcessDefinitions(deployedProcessDefinitions);
+ .addResourceFromInputStream("a lot of attachment", new ByteArrayInputStream(lotOfBytes))
+ .addResourceFromInputStream("other attachment", new ByteArrayInputStream(otherBytes))
+ .deploy();
+
+ registerDeployment(deploymentDbid);
- byte[] retrievedLotOfBytes = processService.getAttachment(processDefinition.getId(), "a lot of attachment");
+ byte[] retrievedLotOfBytes = repositoryService.getResource(deploymentDbid, "a lot of attachment");
assertTrue(Arrays.equals(lotOfBytes, retrievedLotOfBytes));
- byte[] retrievedOtherBytes = processService.getAttachment(processDefinition.getId(), "other attachment");
+ byte[] retrievedOtherBytes = repositoryService.getResource(deploymentDbid, "other attachment");
assertTrue(Arrays.equals(otherBytes, retrievedOtherBytes));
}
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessServiceTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessServiceTest.java 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessServiceTest.java 2009-03-26 16:05:51 UTC (rev 4335)
@@ -36,11 +36,13 @@
public class ProcessServiceTest extends JbpmTestCase {
public void testProcessWithNameOnly() {
- ProcessDefinition processDefinition = deployJpdlXmlString(
+ deployJpdlXmlString(
"<process name='Insurance claim'>" +
" <start />" +
"</process>"
);
+
+ ProcessDefinition processDefinition = processService.findLatestProcessDefinitionByKey("Insurance_claim");
assertNotNull(processDefinition);
assertEquals("Insurance claim", processDefinition.getName());
@@ -140,7 +142,7 @@
public void testDeleteProcessDefinition() {
processService.createDeployment()
- .addString("xmlstring.jpdl.xml",
+ .addResourceFromString("xmlstring.jpdl.xml",
"<process name='deleteme' version='33'>" +
" <start />" +
"</process>")
@@ -155,7 +157,7 @@
public void testDeleteProcessDefinitionAndInstances() {
processService.createDeployment()
- .addString("xmlstring.jpdl.xml",
+ .addResourceFromString("xmlstring.jpdl.xml",
"<process name='deleteme' version='33'>" +
" <start>" +
" <transition to='w' />" +
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,6 +4,8 @@
<process-engine-context>
+ <repository-service />
+ <repository-cache />
<process-service />
<execution-service />
<history-service />
@@ -18,20 +20,12 @@
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
</hibernate-configuration>
<hibernate-session-factory />
<deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
- <check-process />
- <check-problems />
- <save />
+ <jpdl-deployer />
</deployer-manager>
<script-manager default-expression-language="juel"
@@ -61,6 +55,7 @@
<transaction-context>
<transaction />
+ <repository-session />
<pvm-db-session />
<job-db-session />
<task-db-session />
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -28,12 +28,8 @@
<discriminator><column name="CLASS_" /></discriminator>
<version name="dbversion" column="DBVERSION_" />
- <many-to-one name="activity"
- class="org.jbpm.pvm.internal.model.ActivityImpl"
- column="ACT_"
- lazy="false"
- foreign-key="FK_EXEC_ACT"
- index="IDX_EXEC_ACT" />
+ <property name="activityName" column="ACTIVITYNAME_" />
+ <property name="processDefinitionId" column="PROCDEFID_" />
<property name="hasVariables" column="HASVARS_" />
<map name="variables"
@@ -63,19 +59,13 @@
<property name="priority" column="PRIORITY_" />
<property name="historyActivityInstanceDbid" column="HISACTINST_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCESS_"
- foreign-key="FK_EXEC_PROCESS"
- index="IDX_EXEC_PROCESS" />
+ <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / -->
- <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" />
-
- <many-to-one name="transitionOrigin"
+ <!-- many-to-one name="transitionOrigin"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="TRANSORIG_"
foreign-key="FK_EXEC_TRANSORIG"
- index="IDX_EXEC_TRANSORIG" />
+ index="IDX_EXEC_TRANSORIG" / -->
<list name="executions"
cascade="all-delete-orphan"
@@ -212,7 +202,7 @@
<property name="text" type="text" column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -240,21 +230,22 @@
cascade="none"
foreign-key="FK_JOB_EXE"
index="IDX_JOB_EXE"/>
- <many-to-one name="commandDescriptor"
+
+ <!-- many-to-one name="commandDescriptor"
column="CMDDESCR_"
class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
cascade="all"
foreign-key="FK_JOB_CMDDESCR"
- index="IDX_JOB_CMDDESCR"/>
+ index="IDX_JOB_CMDDESCR"/ -->
<subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg">
<subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg">
<property name="signalName" column="SIGNAL_" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
column="NODE_"
cascade="none"
- foreign-key="FK_JOB_NODE"/>
+ foreign-key="FK_JOB_NODE"/ -->
</subclass>
<subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" />
<subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" />
@@ -357,20 +348,20 @@
]]>
</query>
- <query name="findExecutionByKey">
+ <!-- query name="findExecutionByKey">
<![CDATA[
select execution
from org.jbpm.pvm.internal.model.ExecutionImpl as execution
where execution.key = :executionKey
and execution.processDefinition.name = :processDefinitionName
]]>
- </query>
+ </query -->
<query name="findProcessInstanceIds">
<![CDATA[
select processInstance.id
from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance
- where processInstance.processDefinition.id = :processDefinitionId
+ where processInstance.processDefinitionId = :processDefinitionId
and processInstance.parent is null
]]>
</query>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -15,7 +15,7 @@
<property name="hibernate.format_sql">true</property>
<property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <mapping resource="jbpm.definition.hbm.xml" />
+ <mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -18,11 +18,11 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
+ <!-- many-to-one name="processDefinition"
class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
column="PROCDEF_"
foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
+ index="IDX_HISTPI_PROCDEF" / -->
<set name="historyActivityInstances"
cascade="all">
@@ -48,11 +48,11 @@
foreign-key="FK_HAI_HPI"
index="IDX_HAI_HPI" />
- <many-to-one name="activity"
+ <!-- many-to-one name="activity"
class="org.jbpm.pvm.internal.model.ActivityImpl"
column="ACTIVITY_"
foreign-key="FK_HISTAI_ACT"
- index="IDX_HISTAI_ACT" />
+ index="IDX_HISTAI_ACT" / -->
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -3,7 +3,7 @@
<hibernate-mapping default-access="field">
- <subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
+ <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition"
extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
discriminator-value="jpdl">
<map name="swimlaneDefinitions"
@@ -22,7 +22,7 @@
<map-key type="string" column="NAME_" />
<one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" />
</map>
- </subclass>
+ </subclass -->
<subclass name="org.jbpm.jpdl.internal.model.JpdlExecution"
extends="org.jbpm.pvm.internal.model.ExecutionImpl"
@@ -38,7 +38,7 @@
</map>
</subclass>
- <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
+ <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -118,5 +118,6 @@
index="IDX_ACT_TASKDEF" />
</subclass>
</class>
+ -->
</hibernate-mapping>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
- <!-- ### ASSIGNABLE DEFINITIONS ######################################### -->
+ <!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
table="JBPM_ASSIGNDEF"
discriminator-value="A" >
@@ -32,8 +32,9 @@
<subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
</subclass>
+ -->
- <!-- ### TASK DEFINITION ################################################ -->
+ <!-- ### TASK DEFINITION ################################################
<subclass name="TaskDefinitionImpl" discriminator-value="T">
<property name="priority" column="PRIORITY_"/>
@@ -60,6 +61,7 @@
</list>
</subclass>
</class>
+ -->
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
@@ -116,11 +118,11 @@
column="SWIMLANE_"
foreign-key="FK_TASK_SWIML" />
- <many-to-one name="taskDefinition"
+ <!-- many-to-one name="taskDefinition"
column="TASKDEF_"
class="org.jbpm.pvm.internal.task.TaskDefinitionImpl"
foreign-key="FK_TSK_TASKDEF"
- index="IDX_TSK_TASKDEF" />
+ index="IDX_TSK_TASKDEF" / -->
<list name="comments" cascade="all-delete-orphan">
<key column="TASK_" />
@@ -169,10 +171,10 @@
<property name="name" column="NAME_"/>
<property name="assignee" column="ASSIGNEE_"/>
- <many-to-one name="swimlaneDefinition"
+ <!-- many-to-one name="swimlaneDefinition"
class="SwimlaneDefinitionImpl"
column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
+ foreign-key="FK_SWIMLANE_DEF" / -->
<many-to-one name="execution"
class="org.jbpm.pvm.internal.model.ExecutionImpl"
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 10:51:12 UTC (rev 4334)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-26 16:05:51 UTC (rev 4335)
@@ -50,6 +50,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" />
+
<!-- db sessions -->
<binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" />
@@ -65,13 +67,11 @@
<binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.AssignFileTypesBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProcessBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.SaveBinding" />
<!-- interceptors -->
<binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" />
@@ -88,6 +88,6 @@
<binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
- <binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
+ <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" />
</wire-bindings>
More information about the jbpm-commits
mailing list