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

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Oct 31 12:16:33 EDT 2008


Author: tom.baeyens at jboss.com
Date: 2008-10-31 12:16:33 -0400 (Fri, 31 Oct 2008)
New Revision: 2709

Added:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java
Removed:
   jbpm4/trunk/modules/cts/
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ResourceManager.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.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/EnterpriseLocalCommandService.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandReceiverTest.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
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java
Log:
unification api proposals

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -1,7 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jbpm;
 
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
-public abstract class Configuration {
+import org.xml.sax.InputSource;
 
-  public abstract ProcessEngine buildProcessEngine();
+/**
+ * process engine configuration.
+ *         
+ * @author Tom Baeyens
+ */
+public class Configuration {
+  
+  static Map<String, String> implementationClassNames = null;
+
+  Configuration impl;
+ 
+  public Configuration() {
+    this(null);
+  }
+
+  public Configuration(String type) {
+    if (type==null) {
+      throw new PvmException("type is null");
+    }
+    String implementationClass = getImplementationClassName(type);
+    if (implementationClass==null) {
+      throw new PvmException("type is null");
+    }
+     if ("jbpm".equals(type)) {
+      impl = instantiate("org.jbpm.cfg.JbpmConfiguration");
+    }
+  }
+  
+  private synchronized String getImplementationClassName(String type) {
+    if (implementationClassNames==null) {
+      implementationClassNames = new HashMap<String, String>();
+      // null represents the default configuration (== the JbpmConfiguration)
+      implementationClassNames.put(null, "org.jbpm.cfg.JbpmConfiguration");
+      // TODO 
+      // implementationClasses.put("spring", "org.jbpm.cfg.SpringConfiguration");
+      // implementationClasses.put("mc", "org.jbpm.cfg.McConfiguration");
+      // implementationClasses.put("programatic", "org.jbpm.cfg.ProgramaticConfiguration");
+    }
+    String implementationClassName = implementationClassNames.get(type);
+    if (implementationClassName==null) {
+      implementationClassName = type;
+    }
+    return implementationClassName;
+  }
+
+  private Configuration instantiate(String className) {
+    ClassLoader classLoader = getClassLoader();
+    Configuration implementation;
+    try {
+      Class<?> implementationClass = classLoader.loadClass(className);
+      implementation = (Configuration) implementationClass.newInstance();
+    } catch (Exception e) {
+      throw new PvmException("couldn't instantiate configuration of type "+className, e);
+    }
+    return implementation;
+  }
+
+  protected ClassLoader getClassLoader() {
+    return Thread.currentThread().getContextClassLoader();
+  }
+
+  public void setXmlString(String xmlString) {
+    impl.setXmlString(xmlString);
+  }
+
+  public void setResource(String resource) {
+    impl.setResource(resource);
+  }
+
+  public void setInputStream(InputStream inputStream) {
+    impl.setInputStream(inputStream);
+  }
+
+  public void setInputSource(InputSource inputSource) {
+    impl.setInputSource(inputSource);
+  }
+
+  public void setUrl(URL url) {
+    impl.setUrl(url);
+  }
+
+  public void setFile(File file) {
+    impl.setFile(file);
+  }
+
+  public ProcessEngine buildProcessEngine() {
+    return impl.buildProcessEngine();
+  }
 }

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jbpm;
 
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ResourceManager.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ResourceManager.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ResourceManager.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jbpm;
 
 /** can be used to provide transactional reasources 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jbpm;
 
 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java (from rev 2701, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -0,0 +1,10 @@
+package org.jbpm.cmd;
+
+import java.io.Serializable;
+
+import org.jbpm.pvm.env.Environment;
+
+public interface Command<T> extends Serializable {
+  
+  T execute(Environment environment) throws Exception;
+}


Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java (from rev 2701, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -0,0 +1,22 @@
+package org.jbpm.cmd;
+
+import org.jbpm.PvmException;
+
+/**
+ * abstract extensible session facade.  Developers can use this directly or 
+ * extend one of the implementations with custom methods.
+ * Developers should be encouraged to use this interface as it will 
+ * be kept more stable then direct usage of the API (which is still 
+ * allowed).
+ * All the method implementations should be based on commands.
+ * Each of the method implementations will have a environment block.
+ * Then the command is executed and the environment is passed into the 
+ * command.
+ */
+public interface CommandService {
+
+  /**
+   * @throws PvmException if command throws an exception.
+   */
+  <T> T execute(Command<T> command);
+}


Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -47,18 +47,18 @@
  * 
  * @author Tom Baeyens
  */
-public abstract class EnvironmentFactory implements Context, Serializable {
+public interface EnvironmentFactory extends Context, Serializable {
   
   /**
    * open a new Environment.  The client is responsible for 
    * closing the environment with {@link Environment#close()}.
    */
-  public abstract Environment openEnvironment();
+  Environment openEnvironment();
   
   /**
    * closes this environment factory and cleans any allocated 
    * resources.
    */
-  public abstract void close();
+  void close();
 
 }

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -30,11 +30,11 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
+import org.jbpm.cfg.JbpmConfiguration;
+import org.jbpm.cmd.Command;
 import org.jbpm.log.Log;
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.env.EnvironmentFactory;
-import org.jbpm.pvm.env.PvmEnvironmentFactory;
-import org.jbpm.pvm.internal.cmd.Command;
 
 /**
  * Stateless session command executor.
@@ -176,7 +176,7 @@
 
   private static EnvironmentFactory parseConfig(String resource) {
     log.debug("parsing configuration from " + resource);
-    return new PvmEnvironmentFactory(resource);
+    return new JbpmConfiguration(resource);
   }
 
   private static void bind(Context context, EnvironmentFactory environmentFactory, String name) {

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	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -40,8 +40,8 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
+import org.jbpm.cmd.Command;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd;
 
 /**

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-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -27,8 +27,8 @@
 import javax.naming.NamingException;
 
 import org.jbpm.PvmException;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.cmd.Command;
+import org.jbpm.cmd.CommandService;
 
 /**
  * Local, stateless session bean implementation of the command service.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -23,9 +23,9 @@
 
 import java.util.Date;
 
+import org.jbpm.cmd.Command;
 import org.jbpm.log.Log;
 import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.session.DbSession;
 

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.enterprise.internal.ejb;
 
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.cmd.Command;
 
 /**
  * EJB2 local interface for the command executor.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -23,7 +23,7 @@
 
 import java.rmi.RemoteException;
 
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.cmd.Command;
 
 /**
  * EJB2 remote interface for the command executor.

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandReceiverTest.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandReceiverTest.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -35,10 +35,10 @@
 
 import org.apache.cactus.ServletTestCase;
 
+import org.jbpm.cmd.Command;
 import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
 import org.jbpm.enterprise.test.custom.InsertPhraseCmd;
 import org.jbpm.enterprise.test.custom.RemovePhraseCmd;
-import org.jbpm.pvm.internal.cmd.Command;
 
 /**
  * Server-side test for the {@linkplain CommandReceiverMDB command receiver}.

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-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -29,13 +29,13 @@
 
 import org.apache.cactus.ServletTestCase;
 import org.jbpm.Execution;
+import org.jbpm.cmd.Command;
 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.DeploymentImpl;
 import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
 import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
 import org.jbpm.pvm.internal.job.TimerImpl;

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-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -29,6 +29,7 @@
 import javax.naming.InitialContext;
 
 import org.apache.cactus.ServletTestCase;
+import org.jbpm.cmd.Command;
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
 import org.jbpm.enterprise.internal.ejb.LocalTimer;
@@ -39,7 +40,6 @@
 import org.jbpm.log.Log;
 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;
 import org.jbpm.pvm.internal.cmd.GetVariablesCmd;
 import org.jbpm.pvm.internal.cmd.StartExecutionCmd;

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -23,8 +23,8 @@
 
 import java.sql.SQLException;
 
+import org.jbpm.cmd.Command;
 import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.session.DbSession;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java	2008-10-31 16:14:37 UTC (rev 2708)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java	2008-10-31 16:16:33 UTC (rev 2709)
@@ -26,8 +26,8 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 
+import org.jbpm.cmd.Command;
 import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.internal.cmd.Command;
 
 /**
  * @author Alejandro Guizar




More information about the jbpm-commits mailing list