[jbpm-commits] JBoss JBPM SVN: r5128 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api/job and 17 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Jun 26 07:51:08 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-06-26 07:51:07 -0400 (Fri, 26 Jun 2009)
New Revision: 5128

Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.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/task/reminder/TaskReminderTest.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/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.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/timer/GroupTimerTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/GroupTimersTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncBasicsTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEndCombinationTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEventListenerOnEndTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java
Log:
JBPM-2348 long jobDbid --> String jobId

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -37,7 +37,7 @@
    * of the job fails.  In case the async command executor is configured 
    * for this service, failing job execution will not result into an 
    * exception coming out of this method. */
-  void executeJob(long jobDbid);
+  void executeJob(String jobId);
 
   /** search for jobs */
   JobQuery createJobQuery();

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -31,7 +31,7 @@
  */
 public interface Job {
 
-  long getDbid();
+  String getId();
 
   String getLockOwner();
 

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -147,8 +147,8 @@
     }
     // messages can also contain a jobId property
     else if (message.getObjectProperty("jobId") != null) {
-      long jobId = message.getLongProperty("jobId");
-      log.debug("received message with jobImpl id " + jobId);
+      String jobId = message.getStringProperty("jobId");
+      log.debug("received message with job id " + jobId);
       // create a command with the given jobId
       command = new ExecuteJobCmd(jobId);
     }

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -31,6 +31,7 @@
 import org.jbpm.api.job.Timer;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.session.TimerSession;
 
@@ -56,7 +57,7 @@
 
     // retrieve timer as entity bean, contact timer service
     try {
-      LocalTimer timerBean = timerHome.findByPrimaryKey(timer.getDbid());
+      LocalTimer timerBean = timerHome.findByPrimaryKey(((TimerImpl)timer).getDbid());
       timerBean.schedule();
     }
     catch (FinderException e) {
@@ -66,7 +67,7 @@
 
   public void cancel(Timer timer) {
     try {
-      LocalTimer timerBean = timerHome.findByPrimaryKey(timer.getDbid());
+      LocalTimer timerBean = timerHome.findByPrimaryKey(((TimerImpl)timer).getDbid());
       log.debug("canceling " + timer);
       /*
        * EJB 2.1 section 22.4.4 If an entity bean is removed, the container must remove

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -57,7 +57,7 @@
     Job job = managementService.createJobQuery()
       .processInstanceId(processInstanceId)
       .uniqueResult();
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     processInstance = executionService.findProcessInstanceById(processInstanceId);
 
@@ -66,7 +66,7 @@
     job = managementService.createJobQuery()
       .processInstanceId(processInstanceId)
       .uniqueResult();
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     assertNull(executionService.findProcessInstanceById(processInstanceId));
   }

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/fork/AsyncForkTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -62,11 +62,11 @@
     
     Job job = jobs.get(0);
 
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     job = jobs.get(1);
 
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     Date endTime = historyService
       .createHistoryProcessInstanceQuery()

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -88,7 +88,7 @@
     assertNotNull("expected job to be non-null", job);
     assertEquals(0, wiser.getMessages().size());
 
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     // examine produced messages
     List<WiserMessage> wiserMessages = wiser.getMessages();

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/event/TimerEventTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -59,7 +59,7 @@
       .processInstanceId(processInstance.getId())
       .uniqueResult();
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     processInstance = executionService.findProcessInstanceById(processInstance.getId());
 

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/repeat/TimerRepeatTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -56,7 +56,7 @@
     
     assertNull(executionService.getVariable(processInstance.getId(), "escalations"));
 
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     assertEquals(1, executionService.getVariable(processInstance.getId(), "escalations"));
 
@@ -66,7 +66,7 @@
     
     assertNotNull(job);
 
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     assertEquals(2, executionService.getVariable(processInstance.getId(), "escalations"));
 

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -57,7 +57,7 @@
       .processInstanceId(processInstance.getId())
       .uniqueResult();
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     processInstance = executionService.findProcessInstanceById(processInstance.getId());
     

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -44,9 +44,16 @@
 
   private static final Log log = Log.getLog(ExecuteJobCmd.class.getName());
   
-  protected long jobDbid;
+  protected Long jobDbid;
 
-  public ExecuteJobCmd(long jobDbid) {
+  public ExecuteJobCmd(String jobId) {
+    if (jobId==null) {
+      throw new JbpmException("jobId is null");
+    }
+    jobDbid = Long.parseLong(jobId);
+  }
+
+  public ExecuteJobCmd(Long jobDbid) {
     this.jobDbid = jobDbid;
   }
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -71,7 +71,7 @@
         messageProducer.close();
       }
 
-      jmsMessage.setLongProperty("jobId", message.getDbid());
+      jmsMessage.setStringProperty("jobId", message.getId());
 
       /*
       if (jobImpl.getToken()!=null) {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -130,7 +130,13 @@
       throw new JbpmException("couldn't serialize configuration object for "+this, e);
     }
   }
+
+  // customized getters and setters ///////////////////////////////////////////
   
+  public String getId() {
+    return Long.toString(dbid);
+  }
+  
   // getters and setters //////////////////////////////////////////////////////
   
   public long getDbid() {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -33,8 +33,8 @@
  */
 public class ManagementServiceImpl extends AbstractServiceImpl implements ManagementService {
 
-  public void executeJob(long jobDbid) {
-    commandService.execute(new ExecuteJobCmd(jobDbid));
+  public void executeJob(String jobId) {
+    commandService.execute(new ExecuteJobCmd(jobId));
   }
 
   public JobQuery createJobQuery() {

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -53,7 +53,7 @@
     Job job = managementService.createJobQuery()
       .processInstanceId(processInstanceId)
       .uniqueResult();
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     job = managementService.createJobQuery()
       .processInstanceId(processInstanceId)

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 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -65,7 +65,7 @@
     
     Timer timer = (Timer) jobs.get(0);
     
-    managementService.executeJob(timer.getDbid());
+    managementService.executeJob(timer.getId());
     
     processInstance = executionService.findProcessInstanceById(processInstance.getId());
     assertNotNull(processInstance.findActiveExecutionIn("escalate") );

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/GroupTimersTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/GroupTimersTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/GroupTimersTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -85,7 +85,7 @@
     Timer timer = (Timer) jobs.get(0);
     assertEquals("timeout", timer.getSignalName());
     
-    managementService.executeJob(timer.getDbid());
+    managementService.executeJob(timer.getId());
     
     processInstance = executionService.findProcessInstanceById(processInstance.getId());
     

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncBasicsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncBasicsTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncBasicsTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -84,7 +84,7 @@
     
     Job job = jobs.get(0);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     assertEquals("a bit", executionService.getVariable(processInstanceId, "done"));
 
@@ -100,7 +100,7 @@
     
     job = jobs.get(0);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     assertEquals("a lot", executionService.getVariable(processInstanceId, "done"));
 
@@ -142,7 +142,7 @@
     
     Job job = jobs.get(0);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     assertEquals("a lot", executionService.getVariable(processInstanceId, "done"));
 
@@ -158,7 +158,7 @@
     
     job = jobs.get(0);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
 
     processInstance = executionService.findProcessInstanceById(processInstanceId);
     assertTrue(processInstance.isActive("end"));

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEndCombinationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEndCombinationTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEndCombinationTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -112,7 +112,7 @@
     
     assertEquals(1, jobs.size());
     
-    managementService.executeJob(jobs.get(0).getDbid());
+    managementService.executeJob(jobs.get(0).getId());
     
     jobs = managementService
         .createJobQuery()

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEventListenerOnEndTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEventListenerOnEndTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/async/AsyncEventListenerOnEndTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -67,7 +67,7 @@
     
     assertNotNull(job);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     assertEquals(Execution.STATE_ENDED, 
       historyService.createHistoryProcessInstanceQuery()
@@ -97,7 +97,7 @@
     
     assertNotNull(job);
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     
     assertEquals(Execution.STATE_ENDED, 
       historyService.createHistoryProcessInstanceQuery()

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -87,9 +87,9 @@
 
     assertEquals(3, messages.size());
 
-    managementService.executeJob(messages.get(0).getDbid());
-    managementService.executeJob(messages.get(0).getDbid());
-    managementService.executeJob(messages.get(0).getDbid());
+    managementService.executeJob(messages.get(0).getId());
+    managementService.executeJob(messages.get(0).getId());
+    managementService.executeJob(messages.get(0).getId());
 
     List<Job> errorJobs = managementService.createJobQuery()
       .exception(true)

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java	2009-06-26 11:25:15 UTC (rev 5127)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TimerTest.java	2009-06-26 11:51:07 UTC (rev 5128)
@@ -54,7 +54,7 @@
       .processInstanceId(processInstance.getId())
       .uniqueResult();
     
-    managementService.executeJob(job.getDbid());
+    managementService.executeJob(job.getId());
     assertProcessInstanceEnded(processInstance);
   }
 




More information about the jbpm-commits mailing list