[jbpm-commits] JBoss JBPM SVN: r2685 - in jbpm4/trunk/modules/pvm/src: main/java/org/jbpm/pvm/model and 3 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2008-10-30 11:15:36 -0400 (Thu, 30 Oct 2008)
New Revision: 2685

Removed:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/
Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/TimerSession.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
Log:
unification api proposals

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -27,7 +27,7 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.job.Timer;
+import org.jbpm.job.Timer;
 
 
 /** execution that opens up access to the related 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -24,11 +24,11 @@
 import java.util.List;
 
 import org.jbpm.Execution;
+import org.jbpm.job.Job;
+import org.jbpm.job.Message;
+import org.jbpm.job.Timer;
 import org.jbpm.pvm.client.ClientExecution;
 import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.job.Job;
-import org.jbpm.pvm.job.Message;
-import org.jbpm.pvm.job.Timer;
 
 /**
  * @author Tom Baeyens, Pascal Verdage

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/TimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/TimerSession.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/TimerSession.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.session;
 
-import org.jbpm.pvm.job.Timer;
+import org.jbpm.job.Timer;
 
 /**
  * @author Tom Baeyens, Pascal Verdage

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -25,9 +25,9 @@
 import java.util.Date;
 import java.util.List;
 
+import org.jbpm.job.Timer;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.pvm.job.Timer;
 import org.jbpm.pvm.session.TimerSession;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -21,6 +21,8 @@
 import org.jbpm.Execution;
 import org.jbpm.ExecutionService;
 import org.jbpm.ProcessService;
+import org.jbpm.job.JobTestHelper;
+import org.jbpm.job.Timer;
 import org.jbpm.pvm.DeploymentImpl;
 import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.activity.ExternalActivity;
@@ -28,8 +30,6 @@
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.job.JobTestHelper;
-import org.jbpm.pvm.job.Timer;
 import org.jbpm.pvm.model.OpenExecution;
 import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -16,12 +16,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jbpm.job.Message;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.log.Log;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.job.Message;
 import org.jbpm.pvm.session.MessageSession;
 import org.jbpm.pvm.session.PvmDbSession;
 import org.jbpm.pvm.test.base.DbTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java	2008-10-30 15:15:11 UTC (rev 2684)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java	2008-10-30 15:15:36 UTC (rev 2685)
@@ -33,6 +33,7 @@
 
 import org.hibernate.Session;
 import org.jbpm.ProcessService;
+import org.jbpm.job.Job;
 import org.jbpm.pvm.DeploymentImpl;
 import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.activity.ExternalActivity;
@@ -45,7 +46,6 @@
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.log.Log;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.job.Job;
 import org.jbpm.pvm.model.Comment;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.session.MessageSession;