[jbpm-commits] JBoss JBPM SVN: r2680 - in jbpm4/trunk/modules/enterprise/src: test/java/org/jbpm/enterprise/test and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2008-10-30 11:03:04 -0400 (Thu, 30 Oct 2008)
New Revision: 2680

Modified:
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
Log:
unification api proposals

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java	2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java	2008-10-30 15:03:04 UTC (rev 2680)
@@ -26,7 +26,7 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jbpm.pvm.PvmException;
+import org.jbpm.PvmException;
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.CommandService;
 

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java	2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java	2008-10-30 15:03:04 UTC (rev 2680)
@@ -24,7 +24,7 @@
 import javax.ejb.FinderException;
 import javax.ejb.RemoveException;
 
-import org.jbpm.pvm.PvmException;
+import org.jbpm.PvmException;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.log.Log;
 import org.jbpm.pvm.job.Timer;

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java	2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java	2008-10-30 15:03:04 UTC (rev 2680)
@@ -28,12 +28,12 @@
 import javax.naming.InitialContext;
 
 import org.apache.cactus.ServletTestCase;
+import org.jbpm.Execution;
 import org.jbpm.enterprise.internal.ejb.EnterpriseTimerSession;
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
 import org.jbpm.enterprise.test.custom.HappyActivity;
-import org.jbpm.pvm.Execution;
-import org.jbpm.pvm.Deployment;
+import org.jbpm.pvm.DeploymentImpl;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
@@ -77,7 +77,7 @@
       .event("timeout")
         .listener(new ObjectDescriptor(HappyActivity.class))
       .done();
-    commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+    commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
   }
 
   protected void tearDown() throws Exception {

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java	2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java	2008-10-30 15:03:04 UTC (rev 2680)
@@ -36,7 +36,7 @@
 import org.jbpm.enterprise.internal.ejb.TimerEB;
 import org.jbpm.enterprise.test.custom.HappyActivity;
 import org.jbpm.enterprise.test.custom.NoisyActivity;
-import org.jbpm.pvm.Deployment;
+import org.jbpm.pvm.DeploymentImpl;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
@@ -110,7 +110,7 @@
    */
   public void testHappyTimer() throws CreateException {
     activityDescriptor.setClassName(HappyActivity.class.getName());
-    commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+    commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
 
     ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));
     
@@ -141,7 +141,7 @@
    */
   public void testNoisyTimer() throws CreateException {
     activityDescriptor.setClassName(NoisyActivity.class.getName());
-    commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+    commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
 
     ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));
     
@@ -179,7 +179,7 @@
    */
   public void testCyclicTimer() throws CreateException {
     activityDescriptor.setClassName(HappyActivity.class.getName());
-    commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+    commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
 
     ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));