[jbpm-commits] JBoss JBPM SVN: r5127 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/async/activity and 51 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jun 26 07:25:16 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-06-26 07:25:15 -0400 (Fri, 26 Jun 2009)
New Revision: 5127
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/fork/AsyncForkTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/custom/CustomTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/notification/TaskNotificationTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/businesstime/TimerBusinessTimeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/event/TimerEventTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/repeat/TimerRepeatTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentRef.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCache.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/DeploymentQueryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/ImageTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/SuspendDeploymentTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
Log:
JBPM-2348 long deploymentDbid --> String deploymentId
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -38,8 +38,6 @@
/** unique identification of this deployment */
String getId();
- long getDbid();
-
/** typically correspond to the file name or url or some other
* form of identifying the source archive file for this deployment. */
String getName();
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -65,5 +65,5 @@
/** after adding resources, this will perform the actual deployment.
* @return the generated deploymentId identification for this deployment
* in the {@link RepositoryService repository}. */
- long deploy();
+ String deploy();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -50,7 +50,7 @@
/** references the deployment in which this process definition is
* deployed. */
- long getDeploymentDbid();
+ String getDeploymentId();
/** the name of the resource in the deployment which contains the image
* file for this process */
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -38,7 +38,7 @@
ProcessDefinitionQuery processDefinitionKey(String key);
ProcessDefinitionQuery processDefinitionNameLike(String name);
ProcessDefinitionQuery processDefinitionName(String name);
- ProcessDefinitionQuery deploymentDbid(long deploymentDbid);
+ ProcessDefinitionQuery deploymentId(String deploymentId);
ProcessDefinitionQuery suspended();
ProcessDefinitionQuery orderAsc(String property);
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,19 +33,19 @@
NewDeployment createDeployment();
- void suspendDeployment(long deploymentDbid);
- void resumeDeployment(long deploymentDbid);
+ void suspendDeployment(String deploymentId);
+ void resumeDeployment(String deploymentId);
/** deletes a deployment if the process definitions don't have
* running executions. history information (if any) remains
* in the database. */
- void deleteDeployment(long deploymentDbid);
+ void deleteDeployment(String deploymentId);
/** deletes deployment, contained process definitions, related process instances
* and their history information */
- void deleteDeploymentCascade(long deploymentDbid);
+ void deleteDeploymentCascade(String deploymentId);
- InputStream getResourceAsStream(long deploymentDbid, String resourceName);
+ InputStream getResourceAsStream(String deploymentId, String resourceName);
ProcessDefinitionQuery createProcessDefinitionQuery();
DeploymentQuery createDeploymentQuery();
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -32,18 +32,18 @@
*/
public class AsyncActivityTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/async/activity/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/fork/AsyncForkTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/fork/AsyncForkTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/fork/AsyncForkTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -34,18 +34,18 @@
*/
public class AsyncForkTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/async/fork/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class ConcurrencyGraphBasedTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/concurrency/graphbased/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/custom/CustomTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/custom/CustomTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/custom/CustomTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -31,18 +31,18 @@
*/
public class CustomTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/custom/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -34,18 +34,18 @@
*/
public class DecisionConditionsTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/decision/conditions/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class DecisionExpressionTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/decision/expression/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -34,18 +34,18 @@
*/
public class DecisionHandlerTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/decision/handler/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class EndMultipleTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/end/multiple/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class EndProcessInstanceTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/end/processinstance/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class EndStateTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/end/state/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -10,18 +10,18 @@
public class EventListenerTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/eventlistener/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,7 +35,7 @@
*/
public class HqlTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
long taskLaundryDbid;
long taskDishesDbid;
@@ -44,7 +44,7 @@
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/hql/process.jpdl.xml")
.deploy();
@@ -65,7 +65,7 @@
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
taskService.deleteTask(taskLaundryDbid);
taskService.deleteTask(taskDishesDbid);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class JavaInstantiateTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/java/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -54,10 +54,10 @@
super.setUp();
// deploy process
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/mail/inline/process.jpdl.xml")
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentId);
// create actors
identityService.createUser("bb", "Big Brother", null, "bb at oceania");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -54,10 +54,10 @@
super.setUp();
// deploy process
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/mail/template/process.jpdl.xml")
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentId);
// create actors
identityService.createUser("bb", "Big Brother", null, "bb at oceania");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class ScriptExpressionTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/script/expression/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class ScriptTextTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/script/text/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -32,10 +32,10 @@
ManagementService managementService = processEngine.getManagementService();
// Deploying a process
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/services/Order.jpdl.xml")
.deploy();
- repositoryService.deleteDeployment(deploymentDbid);
+ repositoryService.deleteDeployment(deploymentId);
}
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,7 +35,7 @@
*/
public class SqlTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
long taskLaundryDbid;
long taskDishesDbid;
@@ -44,7 +44,7 @@
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/sql/process.jpdl.xml")
.deploy();
@@ -65,7 +65,7 @@
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
taskService.deleteTask(taskLaundryDbid);
taskService.deleteTask(taskDishesDbid);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class StateChoiceTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/state/choice/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -31,18 +31,18 @@
*/
public class StateSequenceTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/state/sequence/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomeactivity/SubProcessOutcomeActivityTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,24 +33,24 @@
*/
public class SubProcessOutcomeActivityTest extends JbpmTestCase {
- long subProcessReviewDeploymentDbid;
- long subProcessDocumentDeploymentDbid;
+ String subProcessReviewDeploymentId;
+ String subProcessDocumentDeploymentId;
protected void setUp() throws Exception {
super.setUp();
- subProcessReviewDeploymentDbid = repositoryService.createDeployment()
+ subProcessReviewDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/outcomeactivity/SubProcessReview.jpdl.xml")
.deploy();
- subProcessDocumentDeploymentDbid = repositoryService.createDeployment()
+ subProcessDocumentDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentDbid);
- repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentDbid);
+ repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentId);
+ repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/outcomevalue/SubProcessOutcomeValueTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,24 +33,24 @@
*/
public class SubProcessOutcomeValueTest extends JbpmTestCase {
- long subProcessReviewDeploymentDbid;
- long subProcessDocumentDeploymentDbid;
+ String subProcessReviewDeploymentId;
+ String subProcessDocumentDeploymentId;
protected void setUp() throws Exception {
super.setUp();
- subProcessReviewDeploymentDbid = repositoryService.createDeployment()
+ subProcessReviewDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/outcomevalue/SubProcessReview.jpdl.xml")
.deploy();
- subProcessDocumentDeploymentDbid = repositoryService.createDeployment()
+ subProcessDocumentDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentDbid);
- repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentDbid);
+ repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentId);
+ repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/subprocess/variables/SubProcessVariablesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,24 +35,24 @@
*/
public class SubProcessVariablesTest extends JbpmTestCase {
- long subProcessReviewDeploymentDbid;
- long subProcessDocumentDeploymentDbid;
+ String subProcessReviewDeploymentId;
+ String subProcessDocumentDeploymentId;
protected void setUp() throws Exception {
super.setUp();
- subProcessReviewDeploymentDbid = repositoryService.createDeployment()
+ subProcessReviewDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/variables/SubProcessReview.jpdl.xml")
.deploy();
- subProcessDocumentDeploymentDbid = repositoryService.createDeployment()
+ subProcessDocumentDeploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/subprocess/variables/SubProcessDocument.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentDbid);
- repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentDbid);
+ repositoryService.deleteDeploymentCascade(subProcessReviewDeploymentId);
+ repositoryService.deleteDeploymentCascade(subProcessDocumentDeploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,18 +35,18 @@
*/
public class TaskAssigneeTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/assignee/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -31,18 +31,18 @@
*/
public class TaskAssignmentHandlerTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/assignmenthandler/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,7 +33,7 @@
*/
public class TaskCandidatesTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
String dept;
protected void setUp() throws Exception {
@@ -49,14 +49,14 @@
identityService.createMembership("joesmoe", dept, "developer");
// deploy process
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/candidates/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
// delete process deployment
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
// delete identities
identityService.deleteGroup(dept);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/notification/TaskNotificationTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/notification/TaskNotificationTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/notification/TaskNotificationTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -50,10 +50,10 @@
super.setUp();
// deploy process
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/notification/process.jpdl.xml")
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentId);
// create actors
identityService.createUser("johndoe", "John", "Doe", "john at doe");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -53,10 +53,10 @@
super.setUp();
// deploy process
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/reminder/process.jpdl.xml")
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentId);
// create actors
identityService.createUser("johndoe", "John", "Doe", "john at doe");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -32,7 +32,7 @@
*/
public class TaskSwimlaneTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
String dept;
@@ -47,7 +47,7 @@
identityService.createMembership("johndoe", dept, "developer");
// deploy process
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/swimlane/process.jpdl.xml")
.deploy();
@@ -55,7 +55,7 @@
protected void tearDown() throws Exception {
// delete process deployment
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
// delete identities
identityService.deleteGroup(dept);
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -38,18 +38,18 @@
*/
public class TaskVariablesTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/task/variables/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/businesstime/TimerBusinessTimeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/businesstime/TimerBusinessTimeTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/businesstime/TimerBusinessTimeTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
static long HOUR_IN_MILLIS = 60*60*100;
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/timer/businesstime/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/event/TimerEventTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/event/TimerEventTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/event/TimerEventTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -36,18 +36,18 @@
*/
public class TimerEventTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/timer/event/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/repeat/TimerRepeatTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/repeat/TimerRepeatTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/repeat/TimerRepeatTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -31,18 +31,18 @@
*/
public class TimerRepeatTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/timer/repeat/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class TimerTransitionTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/timer/transition/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -61,7 +61,7 @@
// active processes
ProcessDefinitionQuery pdQuery = repositoryService.createProcessDefinitionQuery();
- pdQuery.deploymentDbid(dpl.getDbid());
+ pdQuery.deploymentId(dpl.getId());
List<ProcessDefinition> activePds = pdQuery.list();
for(ProcessDefinition p : activePds)
@@ -71,7 +71,7 @@
// suspended processes
ProcessDefinitionQuery pdQuery2 = repositoryService.createProcessDefinitionQuery();
- pdQuery2.deploymentDbid(dpl.getDbid());
+ pdQuery2.deploymentId(dpl.getId());
pdQuery2.suspended();
List<ProcessDefinition> suspendedPds = pdQuery2.list();
@@ -98,7 +98,7 @@
try
{
RepositoryService repositoryService = this.processEngine.getRepositoryService();
- repositoryService.deleteDeploymentCascade(Long.valueOf(id));
+ repositoryService.deleteDeploymentCascade(id);
}
finally
{
@@ -115,9 +115,9 @@
{
RepositoryService repositoryService = this.processEngine.getRepositoryService();
if(isSuspended)
- repositoryService.suspendDeployment(Long.valueOf(id));
+ repositoryService.suspendDeployment(id);
else
- repositoryService.resumeDeployment(Long.valueOf(id));
+ repositoryService.resumeDeployment(id);
}
finally
{
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -55,7 +55,7 @@
//def.setDescription(processDefinition.getDescription());
def.setPackageName(cast.getPackageName());
- def.setDeploymentId(String.valueOf(cast.getDeploymentDbid()));
+ def.setDeploymentId(String.valueOf(cast.getDeploymentId()));
return def;
}
@@ -171,7 +171,7 @@
{
DeploymentImpl d0 = (DeploymentImpl)dpl;
DeploymentRef dRef = new DeploymentRef(
- String.valueOf(dpl.getDbid()), d0.isSuspended()
+ dpl.getId(), d0.isSuspended()
);
String name = d0.getName();
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -121,7 +121,7 @@
.processDefinitionId(procDefId)
.uniqueResult();
if (processDefinition!=null) {
- repositoryService.deleteDeploymentCascade(processDefinition.getDeploymentDbid());
+ repositoryService.deleteDeploymentCascade(processDefinition.getDeploymentId());
}
return getProcessDefinitions();
}
Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -128,7 +128,7 @@
// check if a template exists
String name = task.getName() + ".ftl";
InputStream template = repoService.getResourceAsStream(
- procDef.getDeploymentDbid(), name
+ procDef.getDeploymentId(), name
);
// merge template with process variables
Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -68,7 +68,7 @@
String imgRes = processDefinition.getImageResourceName();
InputStream in = repositoryService.getResourceAsStream(
- processDefinition.getDeploymentDbid(), imgRes
+ processDefinition.getDeploymentId(), imgRes
);
if(null==in)
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -60,14 +60,14 @@
String deploymentName = deploymentMetData.getWatch().getPath();
File deploymentFile = new File(deploymentName);
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentId = repositoryService.createDeployment()
.addResourcesFromZipInputStream(new ZipInputStream(deploymentMetData.getWatch().openStream()))
//.addResourceFromUrl(deploymentMetData.getProcessDescriptor())
.setTimestamp(deploymentFile.lastModified())
.setName(deploymentName)
.deploy();
- DeploymentRef deploymentRef = new DeploymentRef(deploymentDbid, deploymentName);
+ DeploymentRef deploymentRef = new DeploymentRef(deploymentId, deploymentName);
tx.commit();
@@ -116,7 +116,7 @@
// just suspend the process instance (not delete it), see
// http://www.jboss.org/index.html?module=bb&op=viewtopic&p=4238250
// see https://jira.jboss.org/jira/browse/JBPM-2242 as well
- repositoryService.suspendDeployment(deploymentRef.getDeploymentDbid());
+ repositoryService.suspendDeployment(deploymentRef.getDeploymentId());
}
else
{
Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentRef.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentRef.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentRef.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -28,23 +28,23 @@
*/
public final class DeploymentRef
{
- private long deploymentDbid;
+ private String deploymentId;
private String location;
- public DeploymentRef(long deploymentDbid, String location)
+ public DeploymentRef(String deploymentId, String location)
{
- this.deploymentDbid = deploymentDbid;
+ this.deploymentId = deploymentId;
this.location = location;
}
public String toString()
{
- return "DeploymentRef {dbid="+deploymentDbid+", location="+location+"}";
+ return "DeploymentRef {id="+deploymentId+", location="+location+"}";
}
- public long getDeploymentDbid()
+ public String getDeploymentId()
{
- return deploymentDbid;
+ return deploymentId;
}
public String getLocation()
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -45,22 +45,22 @@
private static final long serialVersionUID = 1L;
- long deploymentDbid;
+ String deploymentId;
boolean cascade;
- public DeleteDeploymentCmd(long deploymentDbid) {
- this.deploymentDbid = deploymentDbid;
+ public DeleteDeploymentCmd(String deploymentId) {
+ this.deploymentId = deploymentId;
}
- public DeleteDeploymentCmd(long deploymentDbid, boolean cascade) {
- this.deploymentDbid = deploymentDbid;
+ public DeleteDeploymentCmd(String deploymentId, boolean cascade) {
+ this.deploymentId = deploymentId;
this.cascade = cascade;
}
public Object execute(Environment environment) throws Exception {
RepositorySession repositorySession = environment.get(RepositorySession.class);
List<ProcessDefinition> processDefinitions = repositorySession.createProcessDefinitionQuery()
- .deploymentDbid(deploymentDbid)
+ .deploymentId(deploymentId)
.list();
DbSession dbSession = environment.get(DbSession.class);
@@ -80,18 +80,18 @@
} else {
if (!processInstances.isEmpty()) {
- throw new JbpmException("cannot delete deployment "+deploymentDbid+": still executions for "+processDefinition+": "+processInstances);
+ throw new JbpmException("cannot delete deployment "+deploymentId+": still executions for "+processDefinition+": "+processInstances);
}
}
}
Session session = environment.get(Session.class);
- DeploymentImpl deployment = (DeploymentImpl) session.load(DeploymentImpl.class, deploymentDbid);
- log.debug("deleting deployment "+deploymentDbid);
+ DeploymentImpl deployment = (DeploymentImpl) session.load(DeploymentImpl.class, Long.parseLong(deploymentId));
+ log.debug("deleting deployment "+deploymentId);
session.delete(deployment);
RepositoryCache repositoryCache = environment.get(RepositoryCache.class);
- repositoryCache.set(deploymentDbid, null);
+ repositoryCache.set(deploymentId, null);
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -29,7 +29,7 @@
/**
* @author Tom Baeyens
*/
-public class DeployCmd implements Command<Long> {
+public class DeployCmd implements Command<String> {
private static final long serialVersionUID = 1L;
@@ -41,7 +41,7 @@
this.deployment = deployment;
}
- public Long execute(Environment environment) throws Exception {
+ public String execute(Environment environment) throws Exception {
RepositorySession repositorySession = environment.get(RepositorySession.class);
return repositorySession.deploy(deployment);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -21,8 +21,6 @@
*/
package org.jbpm.pvm.internal.cmd;
-import java.io.InputStream;
-
import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.RepositorySession;
@@ -34,16 +32,16 @@
private static final long serialVersionUID = 1L;
- protected long deploymentDbid;
+ protected String deploymentId;
protected String resourceName;
- public GetResourceAsStreamCmd(long deploymentDbid, String resourceName) {
- this.deploymentDbid = deploymentDbid;
+ public GetResourceAsStreamCmd(String deploymentId, String resourceName) {
+ this.deploymentId = deploymentId;
this.resourceName = resourceName;
}
public byte[] execute(Environment environment) {
RepositorySession repositorySession = environment.get(RepositorySession.class);
- return repositorySession.getBytes(deploymentDbid, resourceName);
+ return repositorySession.getBytes(deploymentId, resourceName);
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.hibernate.Session;
import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
+import org.jbpm.pvm.internal.session.RepositorySession;
/**
@@ -33,15 +33,15 @@
private static final long serialVersionUID = 1L;
- long deploymentDbid;
+ String deploymentId;
- public ResumeDeploymentCmd(long deploymentDbid) {
- this.deploymentDbid = deploymentDbid;
+ public ResumeDeploymentCmd(String deploymentId) {
+ this.deploymentId = deploymentId;
}
public Object execute(Environment environment) throws Exception {
- Session session = environment.get(Session.class);
- DeploymentImpl deployment = (DeploymentImpl) session.load(DeploymentImpl.class, deploymentDbid);
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
+ DeploymentImpl deployment = (DeploymentImpl) repositorySession.getDeployment(deploymentId);
deployment.resume();
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -26,6 +26,7 @@
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.RepositoryCache;
import org.jbpm.pvm.internal.session.DbSession;
+import org.jbpm.pvm.internal.session.RepositorySession;
/**
@@ -35,18 +36,20 @@
private static final long serialVersionUID = 1L;
- long deploymentDbid;
+ String deploymentId;
- public SuspendDeploymentCmd(long deploymentDbid) {
- this.deploymentDbid = deploymentDbid;
+ public SuspendDeploymentCmd(String deploymentId) {
+ this.deploymentId = deploymentId;
}
public Object execute(Environment environment) throws Exception {
- DbSession dbSession = environment.get(DbSession.class);
- DeploymentImpl deployment = (DeploymentImpl) dbSession.get(DeploymentImpl.class, deploymentDbid);
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
+
+ DeploymentImpl deployment = (DeploymentImpl) repositorySession.getDeployment(deploymentId);
if (deployment==null) {
- throw new JbpmException("deployment "+deploymentDbid+" doesn't exist");
+ throw new JbpmException("deployment "+deploymentId+" doesn't exist");
}
+
deployment.suspend();
// removing deployment from the cache
@@ -54,7 +57,7 @@
// at that time, the suspended property will be propagated to the
// process definitions
RepositoryCache repositoryCache = environment.get(RepositoryCache.class);
- repositoryCache.remove(deploymentDbid);
+ repositoryCache.remove(deploymentId);
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -154,7 +154,13 @@
public String toString() {
return (name!=null ? "process("+name+")" : "process");
}
+
+ // customized getters and setters ///////////////////////////////////////////
+ public String getDeploymentId() {
+ return Long.toString(deploymentDbid);
+ }
+
// getters and setters //////////////////////////////////////////////////////
public ActivityImpl getInitial() {
@@ -193,9 +199,6 @@
public void setId(String id) {
this.id = id;
}
- public long getDeploymentDbid() {
- return deploymentDbid;
- }
public void setDeploymentDbid(long deploymentDbid) {
this.deploymentDbid = deploymentDbid;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -59,17 +59,17 @@
protected String nameLike;
protected String name;
protected boolean suspended;
- protected Long deploymentDbid;
+ protected String deploymentId;
public Object execute(Session session) {
List<Map<String, Object>> propertyMaps = (List<Map<String, Object>>) super.execute(session);
List<ProcessDefinition> processDefinitions = new ArrayList<ProcessDefinition>();
for (Map<String, Object> properties: propertyMaps) {
- Long deploymentDbid = (Long)properties.get("deploymentDbid");
+ String deploymentId = properties.get("deploymentDbid").toString();
String objectName = (String)properties.get("objectName");
RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
- ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) repositorySession.getObject(deploymentDbid, objectName);
+ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) repositorySession.getObject(deploymentId, objectName);
processDefinitions.add(processDefinition);
}
@@ -123,8 +123,8 @@
appendWhereClause("keyProperty.stringValue = '"+key+"' ", hql);
}
- if (deploymentDbid!=null) {
- appendWhereClause("idProperty.deployment.dbid = "+deploymentDbid+" ", hql);
+ if (deploymentId!=null) {
+ appendWhereClause("idProperty.deployment.dbid = "+deploymentId+" ", hql);
}
appendOrderByClause(hql);
@@ -168,8 +168,8 @@
return this;
}
- public ProcessDefinitionQuery deploymentDbid(long deploymentDbid) {
- this.deploymentDbid = deploymentDbid;
+ public ProcessDefinitionQuery deploymentId(String deploymentId) {
+ this.deploymentId = deploymentId;
return this;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -53,6 +53,6 @@
}
RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
- repositoryCache.set(deployment.getDbid(), deployment.getObjects());
+ repositoryCache.set(deployment.getId(), deployment.getObjects());
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -85,7 +85,7 @@
return "deployment("+dbid+")";
}
- public long deploy() {
+ public String deploy() {
return commandService.execute(new DeployCmd(this));
}
@@ -255,7 +255,7 @@
repositorySession.cascadeDeploymentSuspend(this);
RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
- repositoryCache.remove(dbid);
+ repositoryCache.remove(Long.toString(dbid));
}
public void resume() {
@@ -269,7 +269,7 @@
repositorySession.cascadeDeploymentResume(this);
RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
- repositoryCache.remove(dbid);
+ repositoryCache.remove(Long.toString(dbid));
}
public boolean isSuspended() {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCache.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCache.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCache.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -29,8 +29,8 @@
*/
public interface RepositoryCache {
- void set(long deploymentdbid, Map<String, Object> deployedObjects);
- Object get(long deploymentDbid, String objectName);
- void remove(long deploymentDbid);
+ void set(String deploymentId, Map<String, Object> deployedObjects);
+ Object get(String deploymentId, String objectName);
+ void remove(String deploymentId);
void clear();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryCacheImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,24 +30,24 @@
*/
public class RepositoryCacheImpl implements RepositoryCache {
- Map<Long, Map<String, Object>> deployments = new HashMap<Long, Map<String,Object>>();
+ Map<String, Map<String, Object>> deployments = new HashMap<String, Map<String,Object>>();
- public Object get(long deploymentDbid, String objectName) {
- Map<String, Object> deploymentObjects = deployments.get(deploymentDbid);
+ public Object get(String deploymentId, String objectName) {
+ Map<String, Object> deploymentObjects = deployments.get(deploymentId);
if (deploymentObjects==null) {
return null;
}
return deploymentObjects.get(objectName);
}
- public void set(long deploymentDbid, Map<String, Object> objects) {
+ public void set(String deploymentId, Map<String, Object> objects) {
if (objects==null) {
- deployments.put(deploymentDbid, null);
+ deployments.put(deploymentId, null);
} else {
- Map<String, Object> deploymentObjects = deployments.get(deploymentDbid);
+ Map<String, Object> deploymentObjects = deployments.get(deploymentId);
if (deploymentObjects==null) {
deploymentObjects = new HashMap<String, Object>();
- deployments.put(deploymentDbid, deploymentObjects);
+ deployments.put(deploymentId, deploymentObjects);
}
for (String objectName: objects.keySet()) {
Object object = objects.get(objectName);
@@ -56,13 +56,13 @@
}
}
- public void remove(long deploymentDbid) {
+ public void remove(String deploymentDbid) {
if (deployments!=null) {
deployments.remove(deploymentDbid);
}
}
public void clear() {
- deployments = new HashMap<Long, Map<String,Object>>();
+ deployments = new HashMap<String, Map<String,Object>>();
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -51,24 +51,24 @@
return new DeploymentImpl(commandService);
}
- public void suspendDeployment(long deploymentDbid) {
- commandService.execute(new SuspendDeploymentCmd(deploymentDbid));
+ public void suspendDeployment(String deploymentId) {
+ commandService.execute(new SuspendDeploymentCmd(deploymentId));
}
- public void resumeDeployment(long deploymentDbid) {
- commandService.execute(new ResumeDeploymentCmd(deploymentDbid));
+ public void resumeDeployment(String deploymentId) {
+ commandService.execute(new ResumeDeploymentCmd(deploymentId));
}
- public void deleteDeployment(long deploymentDbid) {
- commandService.execute(new DeleteDeploymentCmd(deploymentDbid));
+ public void deleteDeployment(String deploymentId) {
+ commandService.execute(new DeleteDeploymentCmd(deploymentId));
}
- public void deleteDeploymentCascade(long deploymentDbid) {
- commandService.execute(new DeleteDeploymentCmd(deploymentDbid, true));
+ public void deleteDeploymentCascade(String deploymentId) {
+ commandService.execute(new DeleteDeploymentCmd(deploymentId, true));
}
- public InputStream getResourceAsStream(long deploymentDbid, String resource) {
- byte[] bytes = commandService.execute(new GetResourceAsStreamCmd(deploymentDbid, resource));
+ public InputStream getResourceAsStream(String deploymentId, String resource) {
+ byte[] bytes = commandService.execute(new GetResourceAsStreamCmd(deploymentId, resource));
if (bytes!=null) {
return new ByteArrayInputStream(bytes);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -21,7 +21,6 @@
*/
package org.jbpm.pvm.internal.repository;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -29,7 +28,6 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
import org.jbpm.api.NewDeployment;
-import org.jbpm.api.Problem;
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.internal.log.Log;
@@ -49,14 +47,14 @@
protected RepositoryCache repositoryCache;
protected DeployerManager deployerManager;
- public long deploy(NewDeployment deployment) {
+ public String deploy(NewDeployment deployment) {
DeploymentImpl deploymentImpl = (DeploymentImpl) deployment;
session.save(deploymentImpl);
deployerManager.deploy(deploymentImpl);
- return deploymentImpl.getDbid();
+ return deploymentImpl.getId();
}
@@ -82,7 +80,7 @@
// starts between clearing the cache and committing the transaction, then
// that transaction could potentially re-initialize the process definition
// in the cache.
- repositoryCache.remove(deployment.getDbid());
+ repositoryCache.remove(deployment.getId());
}
public void cascadeDeploymentResume(DeploymentImpl deployment) {
@@ -103,29 +101,32 @@
}
}
- public DeploymentImpl getDeployment(long deploymentDbid) {
- return (DeploymentImpl) session.get(DeploymentImpl.class, deploymentDbid);
+ public DeploymentImpl getDeployment(String deploymentId) {
+ return (DeploymentImpl) session.get(DeploymentImpl.class, Long.parseLong(deploymentId));
}
- public Object getObject(long deploymentDbid, String objectName) {
- Object object = repositoryCache.get(deploymentDbid, objectName);
+ public Object getObject(String deploymentId, String objectName) {
+ Object object = repositoryCache.get(deploymentId, objectName);
if (object!=null) {
log.trace("repository cache hit");
+ } else if (deploymentId==null) {
+ throw new JbpmException("deploymentId is null");
+
} else {
- log.trace("loading deployment "+deploymentDbid+" from db");
- DeploymentImpl deployment = (DeploymentImpl) session.load(DeploymentImpl.class, deploymentDbid);
+ log.trace("loading deployment "+deploymentId+" from db");
+ DeploymentImpl deployment = (DeploymentImpl) session.load(DeploymentImpl.class, Long.parseLong(deploymentId));
deployerManager.deploy(deployment);
- object = repositoryCache.get(deploymentDbid, objectName);
+ object = repositoryCache.get(deploymentId, objectName);
if (object==null) {
- throw new JbpmException("deployment "+deploymentDbid+" doesn't contain object "+objectName);
+ throw new JbpmException("deployment "+deploymentId+" doesn't contain object "+objectName);
}
}
return object;
}
- public byte[] getBytes(long deploymentDbid, String resourceName) {
- DeploymentImpl deployment = getDeployment(deploymentDbid);
+ public byte[] getBytes(String deploymentId, String resourceName) {
+ DeploymentImpl deployment = getDeployment(deploymentId);
if (deployment==null) {
return null;
}
@@ -156,10 +157,10 @@
DeploymentProperty deploymentProperty = findDeploymentPropertyByProcessDefinitionId(processDefinitionId);
if (deploymentProperty!=null) {
- long deploymentDbid = deploymentProperty.getDeployment().getDbid();
+ String deploymentId = deploymentProperty.getDeployment().getId();
String objectName = deploymentProperty.getObjectName();
- return (ProcessDefinitionImpl) getObject(deploymentDbid, objectName);
+ return (ProcessDefinitionImpl) getObject(deploymentId, objectName);
}
return null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -24,6 +24,7 @@
import org.jbpm.api.NewDeployment;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
+import org.jbpm.pvm.internal.repository.DeploymentImpl;
/**
@@ -31,11 +32,13 @@
*/
public interface RepositorySession {
- long deploy(NewDeployment deployment);
+ String deploy(NewDeployment deployment);
+
+ DeploymentImpl getDeployment(String deploymentId);
- Object getObject(long deploymentDbid, String objectName);
+ Object getObject(String deploymentId, String objectName);
- byte[] getBytes(long deploymentDbid, String resourceName);
+ byte[] getBytes(String deploymentId, String resourceName);
/** create a process definition query */
ProcessDefinitionQueryImpl createProcessDefinitionQuery();
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -69,7 +69,7 @@
/** 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 = new ArrayList<Long>();
+ protected List<String> registeredDeployments = new ArrayList<String>();
protected void setUp() throws Exception {
super.setUp();
@@ -101,8 +101,8 @@
}
protected void tearDown() throws Exception {
- for (Long deploymentDbid : registeredDeployments) {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ for (String deploymentId : registeredDeployments) {
+ repositoryService.deleteDeploymentCascade(deploymentId);
}
String errorMsg = null;
@@ -128,8 +128,8 @@
/** deploys the process, keeps a reference to the deployment and
* automatically deletes the deployment in the tearDown */
- public long deployJpdlXmlString(String jpdlXmlString) {
- long deploymentDbid =
+ public String deployJpdlXmlString(String jpdlXmlString) {
+ String deploymentDbid =
repositoryService.createDeployment()
.addResourceFromString("xmlstring.jpdl.xml", jpdlXmlString)
.deploy();
@@ -140,8 +140,8 @@
}
/** registered deployments will be deleted in the tearDown */
- protected void registerDeployment(long deploymentDbid) {
- registeredDeployments.add(deploymentDbid);
+ protected void registerDeployment(String deploymentId) {
+ registeredDeployments.add(deploymentId);
}
// task helper methods //////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class AsyncEventListenerTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/async/eventlistener/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -30,18 +30,18 @@
*/
public class GroupConcurrencyTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/group/concurrency/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -34,18 +34,18 @@
public class MultipleEntriesTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/group/multipleentries/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -33,18 +33,18 @@
*/
public class GroupSimpleTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/group/simple/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,18 +35,18 @@
*/
public class GroupTimerTest extends JbpmTestCase {
- long deploymentDbid;
+ String deploymentId;
protected void setUp() throws Exception {
super.setUp();
- deploymentDbid = repositoryService.createDeployment()
+ deploymentId = repositoryService.createDeployment()
.addResourceFromClasspath("org/jbpm/examples/group/timer/process.jpdl.xml")
.deploy();
}
protected void tearDown() throws Exception {
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
super.tearDown();
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/DeploymentQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/DeploymentQueryTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/DeploymentQueryTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -37,7 +37,7 @@
public class DeploymentQueryTest extends JbpmTestCase {
public void testSuspendDeployment() {
- long deploymentClaimDbid = repositoryService
+ String deploymentClaimId = repositoryService
.createDeployment()
.setName("Claim")
.addResourceFromString("process.jpdl.xml",
@@ -50,7 +50,7 @@
)
.deploy();
- long deploymentHireDbid = repositoryService
+ String deploymentHireId = repositoryService
.createDeployment()
.setName("Hire")
.addResourceFromString("process.jpdl.xml",
@@ -63,7 +63,7 @@
)
.deploy();
- long deploymentFireDbid = repositoryService
+ String deploymentFireId = repositoryService
.createDeployment()
.setName("Fire")
.addResourceFromString("process.jpdl.xml",
@@ -76,7 +76,7 @@
)
.deploy();
- repositoryService.suspendDeployment(deploymentHireDbid);
+ repositoryService.suspendDeployment(deploymentHireId);
// find all deployments
@@ -117,9 +117,9 @@
assertEquals(expectedDeploymentNames, getDeploymentNames(deployments));
- repositoryService.deleteDeploymentCascade(deploymentClaimDbid);
- repositoryService.deleteDeploymentCascade(deploymentHireDbid);
- repositoryService.deleteDeploymentCascade(deploymentFireDbid);
+ repositoryService.deleteDeploymentCascade(deploymentClaimId);
+ repositoryService.deleteDeploymentCascade(deploymentHireId);
+ repositoryService.deleteDeploymentCascade(deploymentFireId);
}
Set<String> getDeploymentNames(List<Deployment> deployments) {
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/ImageTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/ImageTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/ImageTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -35,7 +35,7 @@
public class ImageTest extends JbpmTestCase {
public void testImage() {
- long deploymentDbid = repositoryService
+ String deploymentId = repositoryService
.createDeployment()
.addResourceFromClasspath("org/jbpm/test/deploy/ImageTest.jpdl.xml")
.addResourceFromClasspath("org/jbpm/test/deploy/ImageTest.png")
@@ -49,7 +49,7 @@
String imageResourceName = processDefinition.getImageResourceName();
assertEquals("org/jbpm/test/deploy/ImageTest.png", imageResourceName);
- InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentDbid(), imageResourceName);
+ InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), imageResourceName);
byte[] imageBytes = IoUtil.readBytes(inputStream);
inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("org/jbpm/test/deploy/ImageTest.png");
@@ -57,6 +57,6 @@
assertTrue(Arrays.equals(expectedImageBytes, imageBytes));
- repositoryService.deleteDeploymentCascade(deploymentDbid);
+ repositoryService.deleteDeploymentCascade(deploymentId);
}
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/SuspendDeploymentTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/SuspendDeploymentTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/deploy/SuspendDeploymentTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -46,7 +46,7 @@
"</process>"
);
- long deploymentHireDbid = deployJpdlXmlString(
+ String deploymentHireId = deployJpdlXmlString(
"<process name='hire'>" +
" <start>" +
" <transition to='h' />" +
@@ -94,7 +94,7 @@
assertEquals(6, processInstances.size());
- repositoryService.suspendDeployment(deploymentHireDbid);
+ repositoryService.suspendDeployment(deploymentHireId);
expectedProcessNames.remove("hire");
@@ -114,7 +114,7 @@
assertEquals(2, countProcessInstancesFor(processInstances, "fire"));
assertEquals(4, processInstances.size());
- repositoryService.resumeDeployment(deploymentHireDbid);
+ repositoryService.resumeDeployment(deploymentHireId);
expectedProcessNames.add("hire");
@@ -144,7 +144,7 @@
"</process>"
);
- long deploymentHireDbid = deployJpdlXmlString(
+ String deploymentHireId = deployJpdlXmlString(
"<process name='hire'>" +
" <start>" +
" <transition to='h' />" +
@@ -153,7 +153,7 @@
"</process>"
);
- long deploymentFireDbid = deployJpdlXmlString(
+ String deploymentFireId = deployJpdlXmlString(
"<process name='fire'>" +
" <start>" +
" <transition to='f' />" +
@@ -162,8 +162,8 @@
"</process>"
);
- repositoryService.suspendDeployment(deploymentHireDbid);
- repositoryService.suspendDeployment(deploymentFireDbid);
+ repositoryService.suspendDeployment(deploymentHireId);
+ repositoryService.suspendDeployment(deploymentFireId);
List<ProcessDefinition> processDefinitions = repositoryService
.createProcessDefinitionQuery()
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -42,7 +42,7 @@
byte[] lotOfBytes = generateString("a lot of bytes ", 5000).getBytes();
byte[] otherBytes = generateString("other bytes ", 5000).getBytes();
- long deploymentDbid =
+ String deploymentDbiId =
repositoryService.createDeployment()
.addResourceFromString("xmlstring.jpdl.xml",
"<process name='Insurance claim'>" +
@@ -52,14 +52,14 @@
.addResourceFromInputStream("other attachment", new ByteArrayInputStream(otherBytes))
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentDbiId);
- InputStream stream = repositoryService.getResourceAsStream(deploymentDbid, "a lot of attachment");
+ InputStream stream = repositoryService.getResourceAsStream(deploymentDbiId, "a lot of attachment");
byte[] retrievedLotOfBytes = readBytes(stream);
assertNotNull(retrievedLotOfBytes);
assertTrue(Arrays.equals(lotOfBytes, retrievedLotOfBytes));
- stream = repositoryService.getResourceAsStream(deploymentDbid, "other attachment");
+ stream = repositoryService.getResourceAsStream(deploymentDbiId, "other attachment");
byte[] retrievedOtherBytes = readBytes(stream);
assertNotNull(retrievedOtherBytes);
assertTrue(Arrays.equals(otherBytes, retrievedOtherBytes));
@@ -70,12 +70,12 @@
InputStream inputStream = classLoader.getResourceAsStream("org/jbpm/test/process/process.jpdl.xml");
assertNotNull(inputStream);
- long deploymentDbid =
+ String deploymentId =
repositoryService.createDeployment()
.addResourceFromInputStream("process.jpdl.xml", inputStream)
.deploy();
- registerDeployment(deploymentDbid);
+ registerDeployment(deploymentId);
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionKey("Resource")
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-06-26 10:11:54 UTC (rev 5126)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-06-26 11:25:15 UTC (rev 5127)
@@ -151,7 +151,7 @@
}
public void testDeleteDeployment() {
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentDbid = repositoryService.createDeployment()
.addResourceFromString("xmlstring.jpdl.xml",
"<process name='deleteme' version='33'>" +
" <start />" +
@@ -166,7 +166,7 @@
}
public void testDeleteProcessDefinitionAndInstances() {
- long deploymentDbid = repositoryService.createDeployment()
+ String deploymentDbid = repositoryService.createDeployment()
.addResourceFromString("xmlstring.jpdl.xml",
"<process name='deleteme' version='33'>" +
" <start>" +
@@ -190,7 +190,7 @@
}
public void testDeleteProcessDefinitionButNotInstances() {
- long deploymentDbid = deployJpdlXmlString(
+ String deploymentDbid = deployJpdlXmlString(
"<process name='deleteme' version='33'>" +
" <start>" +
" <transition to='w' />" +
More information about the jbpm-commits
mailing list