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

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 23 11:17:21 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-06-23 11:17:20 -0400 (Tue, 23 Jun 2009)
New Revision: 5096

Added:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientExecution.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessDefinition.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessInstance.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskHandler.java
Removed:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/package.html
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.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/EjbLocalCommandService.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.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/internal/custom/InsertCommentCmd.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.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/ExecuteJobCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.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/SendMessageCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.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/cmd/VariablesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.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/jobexecutor/AcquireJobsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.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/AbstractQuery.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.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/RepositoryServiceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
   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/spring/CommandTransactionCallback.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
Log:
JBPM-2307 moved client and env packages from api to internal

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -40,10 +40,14 @@
 
   Configuration impl;
  
+  /** default constructor */
   public Configuration() {
     this((String)null);
   }
 
+  /** creates a configuration of a specific implementation type.
+   * no values are supported for type yet.  only <code>null</code>.
+   */
   public Configuration(String type) {
     String implementationClassName = getImplementationClassName(type);
     if (implementationClassName==null) {
@@ -52,6 +56,7 @@
     impl = instantiate(implementationClassName);
   }
   
+  /** empty constructor to be used by concrete implementations of Configuration */ 
   protected Configuration(Configuration base){
   }
   
@@ -90,36 +95,44 @@
     return Thread.currentThread().getContextClassLoader();
   }
 
+  /** provide an xml string as the configuration resource */
   public Configuration setXmlString(String xmlString) {
     impl.setXmlString(xmlString);
     return impl;
   }
 
+  /** provide an classpath resource as the configuration file */
   public Configuration setResource(String resource) {
     impl.setResource(resource);
     return impl;
   }
 
+  /** provide an input stream as the configuration resource */
   public Configuration setInputStream(InputStream inputStream) {
     impl.setInputStream(inputStream);
     return impl;
   }
 
+  /** provide a sax input source as the configuration resource */
   public Configuration setInputSource(InputSource inputSource) {
     impl.setInputSource(inputSource);
     return impl;
   }
 
+  /** point with a url to the configuration file */
   public Configuration setUrl(URL url) {
     impl.setUrl(url);
     return impl;
   }
 
+  /** provide a File as the configuration file */
   public Configuration setFile(File file) {
     impl.setFile(file);
     return impl;
   }
 
+  /** after specifying the configuration resources with the other methods, a 
+   * process engine can be created. */
   public ProcessEngine buildProcessEngine() {
     return impl.buildProcessEngine();
   }

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,19 +21,31 @@
  */
 package org.jbpm.api;
 
-/**
+/** represents a deployment in the repository.
+ * 
  * @author Tom Baeyens
  */
 public interface Deployment {
 
+  /** normal deployments for which contained process definitions 
+   * can be executed. */
   String STATE_ACTIVE = "active";
+  
+  /** invisible for all operations except delete or resume.  This is 
+   * to have a kind of undoable delete operation. */
   String STATE_SUSPENDED = "suspended";
 
   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();
   
+  /** the timestamp can optionally be given and represents the last updated timestamp 
+   * of the archive file that is being deployed. 
+   * JBoss deployer makes use of this to remember if a file is already deployed or not.*/
   long getTimestamp();
-  
+
+  /** {@link #STATE_ACTIVE} or {@link #STATE_SUSPENDED} */
   String getState();
 }

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,7 +23,8 @@
 
 import java.util.List;
 
-/**
+/** find deployments in the repository.
+ * 
  * @author Tom Baeyens
  */
 public interface DeploymentQuery {

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,8 +26,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.ObservableElement;
 
 /** a runtime path of execution.

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,20 +26,44 @@
 import java.net.URL;
 import java.util.zip.ZipInputStream;
 
-/** 
+/** extends a {@link Deployment} with method to create a new 
+ * deployment.
+ * 
+ * @see RepositoryService#createDeployment()
+ * 
  * @author Tom Baeyens
  */
 public interface NewDeployment extends Deployment {
+
+  /** typically correspond to the file name or url or some other 
+   * form of identifying the source archive file for this deployment. */
+  NewDeployment setName(String name);
   
-  NewDeployment setName(String name);
+  /** the timestamp can optionally be given and represents the last updated timestamp 
+   * of the archive file that is being deployed. 
+   * JBoss deployer makes use of this to remember if a file is already deployed or not.*/
   NewDeployment setTimestamp(long timestamp);
+  
+  /** adds a resource as a string */
   NewDeployment addResourceFromString(String resourceName, String string);
+
+  /** adds a resource as a string */
   NewDeployment addResourceFromInputStream(String resourceName, InputStream inputStream);
+  
+  /** adds a resource as a resource from the classpath */
   NewDeployment addResourceFromClasspath(String resourceName);
+  
+  /** adds a resource as a url */
   NewDeployment addResourceFromUrl(URL url);
+  
+  /** adds a resource as a zip stream */
   NewDeployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
+
+  /** adds a resource from a file */
   NewDeployment addResourceFromFile(File file);
   
-  /** @return deploymentId */
+  /** after adding resources, this will perform the actual deployment.
+   * @return the generated deploymentId identification for this deployment
+   * in the {@link RepositoryService repository}. */
   long deploy();
 }

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,186 +0,0 @@
-/*
- * 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.api.client;
-
-import java.util.Map;
-
-import org.jbpm.api.Execution;
-import org.jbpm.api.JbpmException;
-import org.jbpm.api.activity.ActivityBehaviour;
-import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.model.OpenExecution;
-
-/** view upon an {@link Execution path of execution} exposed to 
- * external clients.
- * 
- * @author Tom Baeyens
- */
-public interface ClientExecution extends OpenExecution {
-  
-  // ending an execution //////////////////////////////////////////////////////
-  
-  /** ends this execution and all of its child executions.
-   * 
-   * <p>All child executions will be ended and removed.  This execution
-   * will not be removed from its parent.</p>
-   * 
-   * <p>This method should not be called in {@link ActivityBehaviour}s.  It can be called from 
-   * outside the process execution and in {@link ExternalActivityBehaviour}s. </p> */
-  void end();
-
-  /** ends this execution and all it's child executions with a user defined 
-   * status. */
-  void end(String state);
-
-  // signal ///////////////////////////////////////////////////////////////////
-
-  /** feeds a external trigger into this execution.
-   * 
-   * <p>Typically a signal causes the execution to proceed, but that doesn't necessarily 
-   * has to be the case .  The {@link ExternalActivityBehaviour} is responsible for interpreting 
-   * the signal and acting upon it.
-   * </p>
-   * 
-   * <p>A signal can optionally be given {@link #signal(String) a signal name}, 
-   * {@link #signal(Map) a map of parameters} or {@link #signal(String, Map) both}.
-   * </p>
-   * 
-   * <p>Since it's an external trigger, this method requires that this execution is 
-   * waiting for an external trigger.  So this method must be called as an external client
-   * and can not be called while this execution is executing.  In an {@link ActivityBehaviour} for 
-   * example you're not allowed to call the signal on the execution cause it is executing.  
-   * But you are allowed to invoke this method on any other execution (at least, if that 
-   * one is waiting for an external trigger).</p>
-   * 
-   * <p>Typically a signal will cause the execution to start executing, but that is 
-   * not a must.  What happens with this signal is defined in the 
-   * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of 
-   * the current activity. </p>
-   *  
-   * @see #signal(String) */
-  void signal();
-  
-  /** feeds a named {@link #signal() external trigger} into the execution.
-   * 
-   * <p>In each state, a number of things can happen.  The signal parameter specifies 
-   * which of these things is happening.  It's somewhat similar to a method name in 
-   * the invocation of an object.
-   * </p>
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(String signalName);
-
-  /** feeds {@link #signal() an external trigger} into the execution with parameters.
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(Map<String, ?> parameters);
-
-  /** feeds a named {@link #signal() external trigger} into the execution with parameters.
-   *
-   * <p>In each state, a number of things can happen.  The signal parameter specifies 
-   * which of these things is happening.  It's somewhat similar to a method name in 
-   * the invocation of an object.
-   * </p>
-   * 
-   * <p>The parameters parameter provide extra information to the signal.
-   * Typically, the parameters are set as variables but 
-   * the process language can overwrite that behaviour in the current activity.  
-   * See {@link ExternalActivityBehaviour#signal(Execution, String, Map)} for more information. 
-   * </p>
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(String signalName, Map<String, ?> parameters);
-
-  /** feeds a external trigger into the given execution.
-   * 
-   * <p>Typically a signal causes the execution to proceed, but that doesn't necessarily 
-   * has to be the case .  The {@link ExternalActivityBehaviour} is responsible for interpreting 
-   * the signal and acting upon it.
-   * </p>
-   * 
-   * <p>A signal can optionally be given {@link #signal(String) a signal name}, 
-   * {@link #signal(Map) a map of parameters} or {@link #signal(String, Map) both}.
-   * </p>
-   * 
-   * <p>Since it's an external trigger, this method requires that this execution is 
-   * waiting for an external trigger.  So this method must be called as an external client
-   * and can not be called while this execution is executing.  In an {@link ActivityBehaviour} for 
-   * example you're not allowed to call the signal on the execution cause it is executing.  
-   * But you are allowed to invoke this method on any other execution (at least, if that 
-   * one is waiting for an external trigger).</p>
-   * 
-   * <p>Typically a signal will cause the execution to start executing, but that is 
-   * not a must.  What happens with this signal is defined in the 
-   * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of 
-   * the current activity. </p>
-   *  
-   * @see #signal(String) */
-  void signal(Execution execution);
-  
-  /** feeds a named {@link #signal() external trigger} into a given execution.
-   * 
-   * <p>In each state, a number of things can happen.  The signal parameter specifies 
-   * which of these things is happening.  It's somewhat similar to a method name in 
-   * the invocation of an object.
-   * </p>
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(String signalName, Execution execution);
-
-  /** feeds {@link #signal() an external trigger} into a given execution with parameters.
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(Map<String, ?> parameters, Execution execution);
-
-  /** feeds a named {@link #signal() external trigger} into a given execution with parameters.
-   *
-   * <p>In each state, a number of things can happen.  The signal parameter specifies 
-   * which of these things is happening.  It's somewhat similar to a method name in 
-   * the invocation of an object.
-   * </p>
-   * 
-   * <p>The parameters parameter provide extra information to the signal.
-   * Typically, the parameters are set as variables but 
-   * the process language can overwrite that behaviour in the current activity.  
-   * See {@link ExternalActivityBehaviour#signal(Execution, String, Map)} for more information. 
-   * </p>
-   * 
-   * @see #signal() See the unnamed signal for more information
-   */
-  void signal(String signalName, Map<String, ?> parameters, Execution execution);
-
-  
-  /** suspends this execution and all it's child executions.  Human tasks 
-   * of a suspended execution shouldn't show up in people's task list and 
-   * timers of suspended executions shouldn't fire. 
-   * @throws JbpmException if this execution is already suspended. */   
-  void suspend();
-
-  /** resumes an execution.  Inverse of {@link #suspend()}. 
-   * @throws JbpmException if this execution is not suspended. */ 
-  void resume();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,68 +0,0 @@
-/*
- * 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.api.client;
-
-import org.jbpm.api.Execution;
-import org.jbpm.api.model.OpenExecution;
-import org.jbpm.api.model.OpenProcessDefinition;
-
-
-/** adds factory methods for creating and beginning new process instances.
- * 
- * @author Tom Baeyens
- */
-public interface ClientProcessDefinition extends OpenProcessDefinition {
-
-  /** creates a new process instances. The returned process instance 
-   * is not started yet.  This way, 
-   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
-   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
-   * to start execution of the process. */
-  ClientProcessInstance createProcessInstance();
-  
-  /** creates a new process instances with a given key. The returned process instance 
-   * is not started yet.  This way, 
-   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
-   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
-   * to start execution of the process. 
-   * @param key is a user provided reference that uniquely identifies this 
-   * process instance in the scope of the process name. */
-  ClientProcessInstance createProcessInstance(String key);
-  
-  /** creates a new process instances with a given key. The returned process instance 
-   * is not started yet.  This way, 
-   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
-   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
-   * to start execution of the process. 
-   * @param key is a user provided reference that uniquely identifies this 
-   * process instance in the scope of the process name. key is allowed to be null.*/
-  ClientProcessInstance createProcessInstance(String key, Execution superProcessExecution);
-
-  /** creates the process instance and immediately start its execution. */
-  ClientProcessInstance startProcessInstance();
-  
-  /** creates the process instance with the given key and immediately start its 
-   * execution.
-   * @param key is a user provided reference that uniquely identifies this 
-   * process instance in the scope of the process name. */
-  ClientExecution startProcessInstance(String key);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,37 +0,0 @@
-/*
- * 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.api.client;
-
-import org.jbpm.api.model.OpenProcessInstance;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface ClientProcessInstance extends ClientExecution, OpenProcessInstance {
-
-  // start ////////////////////////////////////////////////////////////////////
-
-  /** starts this process instance */
-  void start();
-
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/package.html
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/package.html	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/package.html	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,3 +0,0 @@
-<body>for clients that want direct programmatic access to the execution 
-object like e.g. in unit tests.
-</body>
\ No newline at end of file

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,10 +0,0 @@
-package org.jbpm.api.cmd;
-
-import java.io.Serializable;
-
-import org.jbpm.api.env.Environment;
-
-public interface Command<T> extends Serializable {
-  
-  T execute(Environment environment) throws Exception;
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,22 +0,0 @@
-package org.jbpm.api.cmd;
-
-import org.jbpm.api.JbpmException;
-
-/**
- * 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 JbpmException if command throws an exception.
-   */
-  <T> T execute(Command<T> command);
-}

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.api.task;
 
-import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.model.OpenExecution;
 
 
 /**
@@ -29,7 +29,7 @@
  */
 public interface OpenTask extends Task, Assignable {
   
-  ClientExecution getExecution();
+  OpenExecution getExecution();
 
   OpenTask createSubTask();
   OpenTask createSubTask(String name);

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,78 +0,0 @@
-/*
- * 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.api.task;
-
-/** for advanced task customization.
- * 
- * The default implementation can be found in {@link DefaultTaskHandler}.
- * 
- * @author Tom Baeyens
- */
-public class TaskHandler {
-
-  /** called after the task is created according 
-   * to the task definition.  This method allows to 
-   * create subtasks.
-   * @return indicates if the process execution should wait. */
-  public boolean executionCreateTask(OpenTask task) {
-    task.historyTaskStart();
-    return true;
-  }
-  
-  /** called when the related execution gets a 
-   * signal.  this method must either 
-   * {@link OpenTask#setSignalling(boolean) remove signalling} from this task
-   * or {@link OpenTask#cancel(String) cancel} it. */
-  public void executionSignal(OpenTask task) {
-    task.setSignalling(false);
-  }
-  
-  /** called when the given task is assigned to an actor. */
-  public void taskAssign(OpenTask task, String userId) {
-    task.historyTaskAssign(userId);
-  }
-
-  /** called when the given task is cancelled. */ 
-  public void taskCancel(OpenTask task, String reason) {
-    task.historyTaskCancel(reason);
-  }
-  
-  /** called when the given task completes.  The default behaviour 
-   * will send a signal to the execution if this task is still signalling. */
-  public void taskComplete(OpenTask task, String outcome) {
-    task.historyTaskComplete(outcome);
-    
-    if (task.isSignalling()) {
-      task.getExecution().signal(outcome);
-    }
-  }
-
-  /** is called when a subtask completes.  this can be used to 
-   * prematurely signal the execution. e.g. for "5 out of 7" scenarios.*/
-  public void taskSubTaskComplete(OpenTask task, OpenTask subTask, String outcome) {
-  }
-  
-  /** is called when a variable is updated.  This can be used to 
-   * propagate the execution based on availability of variables. */
-  public void taskVariableUpdate(OpenTask task, String key, Object value) {
-  }
-}

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	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -34,11 +34,11 @@
 
 import org.jbpm.api.Configuration;
 import org.jbpm.api.ProcessEngine;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 /**
  * Stateless session command executor.

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -40,9 +40,9 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.job.Job;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,8 +24,8 @@
 import javax.ejb.CreateException;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 /**
  * Local, stateless session bean implementation of the command service.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,10 +28,10 @@
 import javax.naming.InitialContext;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding;
 import org.jbpm.internal.log.Log;
+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/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,9 +23,9 @@
 
 import java.util.Date;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.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	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.enterprise.internal.ejb;
 
-import org.jbpm.api.cmd.Command;
+import org.jbpm.pvm.internal.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	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,7 +23,7 @@
 
 import java.rmi.RemoteException;
 
-import org.jbpm.api.cmd.Command;
+import org.jbpm.pvm.internal.cmd.Command;
 
 /**
  * EJB2 remote interface for the command executor.

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,8 +23,8 @@
 
 import java.sql.SQLException;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,8 +26,8 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.model.CommentImpl;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -37,11 +37,11 @@
 
 import org.apache.cactus.ServletTestCase;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.enterprise.internal.custom.InsertCommentCmd;
 import org.jbpm.enterprise.internal.custom.RemoveCommentCmd;
 import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.test.enterprise.IntegrationTestSetup;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -29,13 +29,13 @@
 
 import org.jbpm.api.ExecutionService;
 import org.jbpm.api.RepositoryService;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.enterprise.internal.custom.HappyListener;
 import org.jbpm.enterprise.internal.custom.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -31,15 +31,15 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.ExecutionService;
 import org.jbpm.api.RepositoryService;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.enterprise.internal.custom.HappyListener;
 import org.jbpm.enterprise.internal.custom.NoisyListener;
 import org.jbpm.enterprise.internal.custom.WaitState;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,11 +25,11 @@
 import java.util.Map;
 
 import org.jbpm.api.activity.ActivityExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.env.Context;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Activity;
 import org.jbpm.jpdl.internal.model.JpdlExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.env.ExecutionContext;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -29,12 +29,12 @@
 import org.jbpm.api.model.Activity;
 import org.jbpm.api.model.Transition;
 import org.jbpm.api.task.Task;
-import org.jbpm.api.task.TaskHandler;
 import org.jbpm.internal.log.Log;
 import org.jbpm.jpdl.internal.model.JpdlExecution;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
+import org.jbpm.pvm.internal.task.TaskHandler;
 import org.jbpm.pvm.internal.task.TaskImpl;
 
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.jpdl;
 
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.internal.log.Log;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,8 +24,8 @@
 import java.util.List;
 
 import org.jbpm.api.Problem;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.test.BaseJbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import org.jbpm.api.Problem;
-import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.jbpm.api.Problem;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.Activity;
 import org.jbpm.api.model.Transition;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 
 
 /**

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientExecution.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientExecution.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientExecution.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,186 @@
+/*
+ * 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.pvm.internal.client;
+
+import java.util.Map;
+
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.model.OpenExecution;
+
+/** view upon an {@link Execution path of execution} exposed to 
+ * external clients.
+ * 
+ * @author Tom Baeyens
+ */
+public interface ClientExecution extends OpenExecution {
+  
+  // ending an execution //////////////////////////////////////////////////////
+  
+  /** ends this execution and all of its child executions.
+   * 
+   * <p>All child executions will be ended and removed.  This execution
+   * will not be removed from its parent.</p>
+   * 
+   * <p>This method should not be called in {@link ActivityBehaviour}s.  It can be called from 
+   * outside the process execution and in {@link ExternalActivityBehaviour}s. </p> */
+  void end();
+
+  /** ends this execution and all it's child executions with a user defined 
+   * status. */
+  void end(String state);
+
+  // signal ///////////////////////////////////////////////////////////////////
+
+  /** feeds a external trigger into this execution.
+   * 
+   * <p>Typically a signal causes the execution to proceed, but that doesn't necessarily 
+   * has to be the case .  The {@link ExternalActivityBehaviour} is responsible for interpreting 
+   * the signal and acting upon it.
+   * </p>
+   * 
+   * <p>A signal can optionally be given {@link #signal(String) a signal name}, 
+   * {@link #signal(Map) a map of parameters} or {@link #signal(String, Map) both}.
+   * </p>
+   * 
+   * <p>Since it's an external trigger, this method requires that this execution is 
+   * waiting for an external trigger.  So this method must be called as an external client
+   * and can not be called while this execution is executing.  In an {@link ActivityBehaviour} for 
+   * example you're not allowed to call the signal on the execution cause it is executing.  
+   * But you are allowed to invoke this method on any other execution (at least, if that 
+   * one is waiting for an external trigger).</p>
+   * 
+   * <p>Typically a signal will cause the execution to start executing, but that is 
+   * not a must.  What happens with this signal is defined in the 
+   * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of 
+   * the current activity. </p>
+   *  
+   * @see #signal(String) */
+  void signal();
+  
+  /** feeds a named {@link #signal() external trigger} into the execution.
+   * 
+   * <p>In each state, a number of things can happen.  The signal parameter specifies 
+   * which of these things is happening.  It's somewhat similar to a method name in 
+   * the invocation of an object.
+   * </p>
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(String signalName);
+
+  /** feeds {@link #signal() an external trigger} into the execution with parameters.
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(Map<String, ?> parameters);
+
+  /** feeds a named {@link #signal() external trigger} into the execution with parameters.
+   *
+   * <p>In each state, a number of things can happen.  The signal parameter specifies 
+   * which of these things is happening.  It's somewhat similar to a method name in 
+   * the invocation of an object.
+   * </p>
+   * 
+   * <p>The parameters parameter provide extra information to the signal.
+   * Typically, the parameters are set as variables but 
+   * the process language can overwrite that behaviour in the current activity.  
+   * See {@link ExternalActivityBehaviour#signal(Execution, String, Map)} for more information. 
+   * </p>
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(String signalName, Map<String, ?> parameters);
+
+  /** feeds a external trigger into the given execution.
+   * 
+   * <p>Typically a signal causes the execution to proceed, but that doesn't necessarily 
+   * has to be the case .  The {@link ExternalActivityBehaviour} is responsible for interpreting 
+   * the signal and acting upon it.
+   * </p>
+   * 
+   * <p>A signal can optionally be given {@link #signal(String) a signal name}, 
+   * {@link #signal(Map) a map of parameters} or {@link #signal(String, Map) both}.
+   * </p>
+   * 
+   * <p>Since it's an external trigger, this method requires that this execution is 
+   * waiting for an external trigger.  So this method must be called as an external client
+   * and can not be called while this execution is executing.  In an {@link ActivityBehaviour} for 
+   * example you're not allowed to call the signal on the execution cause it is executing.  
+   * But you are allowed to invoke this method on any other execution (at least, if that 
+   * one is waiting for an external trigger).</p>
+   * 
+   * <p>Typically a signal will cause the execution to start executing, but that is 
+   * not a must.  What happens with this signal is defined in the 
+   * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of 
+   * the current activity. </p>
+   *  
+   * @see #signal(String) */
+  void signal(Execution execution);
+  
+  /** feeds a named {@link #signal() external trigger} into a given execution.
+   * 
+   * <p>In each state, a number of things can happen.  The signal parameter specifies 
+   * which of these things is happening.  It's somewhat similar to a method name in 
+   * the invocation of an object.
+   * </p>
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(String signalName, Execution execution);
+
+  /** feeds {@link #signal() an external trigger} into a given execution with parameters.
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(Map<String, ?> parameters, Execution execution);
+
+  /** feeds a named {@link #signal() external trigger} into a given execution with parameters.
+   *
+   * <p>In each state, a number of things can happen.  The signal parameter specifies 
+   * which of these things is happening.  It's somewhat similar to a method name in 
+   * the invocation of an object.
+   * </p>
+   * 
+   * <p>The parameters parameter provide extra information to the signal.
+   * Typically, the parameters are set as variables but 
+   * the process language can overwrite that behaviour in the current activity.  
+   * See {@link ExternalActivityBehaviour#signal(Execution, String, Map)} for more information. 
+   * </p>
+   * 
+   * @see #signal() See the unnamed signal for more information
+   */
+  void signal(String signalName, Map<String, ?> parameters, Execution execution);
+
+  
+  /** suspends this execution and all it's child executions.  Human tasks 
+   * of a suspended execution shouldn't show up in people's task list and 
+   * timers of suspended executions shouldn't fire. 
+   * @throws JbpmException if this execution is already suspended. */   
+  void suspend();
+
+  /** resumes an execution.  Inverse of {@link #suspend()}. 
+   * @throws JbpmException if this execution is not suspended. */ 
+  void resume();
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientExecution.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessDefinition.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessDefinition.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessDefinition.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,68 @@
+/*
+ * 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.pvm.internal.client;
+
+import org.jbpm.api.Execution;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.OpenProcessDefinition;
+
+
+/** adds factory methods for creating and beginning new process instances.
+ * 
+ * @author Tom Baeyens
+ */
+public interface ClientProcessDefinition extends OpenProcessDefinition {
+
+  /** creates a new process instances. The returned process instance 
+   * is not started yet.  This way, 
+   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
+   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
+   * to start execution of the process. */
+  ClientProcessInstance createProcessInstance();
+  
+  /** creates a new process instances with a given key. The returned process instance 
+   * is not started yet.  This way, 
+   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
+   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
+   * to start execution of the process. 
+   * @param key is a user provided reference that uniquely identifies this 
+   * process instance in the scope of the process name. */
+  ClientProcessInstance createProcessInstance(String key);
+  
+  /** creates a new process instances with a given key. The returned process instance 
+   * is not started yet.  This way, 
+   * {@link OpenExecution#setVariable(String, Object) variables can be set} 
+   * before execution is started.  Invoke {@link ClientProcessInstance#start()} 
+   * to start execution of the process. 
+   * @param key is a user provided reference that uniquely identifies this 
+   * process instance in the scope of the process name. key is allowed to be null.*/
+  ClientProcessInstance createProcessInstance(String key, Execution superProcessExecution);
+
+  /** creates the process instance and immediately start its execution. */
+  ClientProcessInstance startProcessInstance();
+  
+  /** creates the process instance with the given key and immediately start its 
+   * execution.
+   * @param key is a user provided reference that uniquely identifies this 
+   * process instance in the scope of the process name. */
+  ClientExecution startProcessInstance(String key);
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessDefinition.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessInstance.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessInstance.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessInstance.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,37 @@
+/*
+ * 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.pvm.internal.client;
+
+import org.jbpm.api.model.OpenProcessInstance;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ClientProcessInstance extends ClientExecution, OpenProcessInstance {
+
+  // start ////////////////////////////////////////////////////////////////////
+
+  /** starts this process instance */
+  void start();
+
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/client/ClientProcessInstance.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,7 +23,6 @@
 
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.WireObject;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.pvm.internal.model.CommentImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.task.Assignable;
 import org.jbpm.pvm.internal.session.DbSession;

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,10 @@
+package org.jbpm.pvm.internal.cmd;
+
+import java.io.Serializable;
+
+import org.jbpm.api.env.Environment;
+
+public interface Command<T> extends Serializable {
+  
+  T execute(Environment environment) throws Exception;
+}


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

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,22 @@
+package org.jbpm.pvm.internal.cmd;
+
+import org.jbpm.api.JbpmException;
+
+/**
+ * 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 JbpmException if command throws an exception.
+   */
+  <T> T execute(Command<T> command);
+}


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

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.DeploymentQueryImpl;
 import org.jbpm.pvm.internal.query.JobQueryImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.JobQueryImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
 import org.jbpm.pvm.internal.session.RepositorySession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskQueryImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.session.DbSession;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,7 +27,6 @@
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ProcessDefinition;
 import org.jbpm.api.ProcessInstance;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 import org.jbpm.pvm.internal.session.RepositorySession;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,7 +24,6 @@
 import java.util.Date;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.Transaction;
 import org.jbpm.api.job.Job;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.session.DbSession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.ActivityCoordinates;
 import org.jbpm.pvm.internal.model.ActivityImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,7 +26,6 @@
 import java.util.Set;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Transition;
 import org.jbpm.api.task.Task;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,7 +25,6 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.task.Task;
 import org.jbpm.pvm.internal.task.TaskImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,8 +24,8 @@
 import java.util.Set;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,8 +26,8 @@
 import java.util.Set;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 
 /** base class for commands that execute scalable queries.
  * 

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,6 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.job.Message;
 import org.jbpm.pvm.internal.session.MessageSession;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,8 +25,8 @@
 
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ProcessInstance;
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.session.DbSession;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,9 +26,9 @@
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ProcessInstance;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.session.RepositorySession;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,9 +26,9 @@
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ProcessInstance;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.session.RepositorySession;
 
 /**

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,6 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,8 +25,8 @@
 import java.util.Map;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.session.DbSession;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -31,12 +31,12 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ProcessDefinition;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.api.task.Task;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 import org.jbpm.pvm.internal.job.JobImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.identity.Group;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.identity.Group;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.job;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.session.DbSession;
 import org.jbpm.pvm.internal.wire.Descriptor;
 

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -8,8 +8,8 @@
 import java.util.Date;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.job.Job;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.lob.Lob;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,9 +28,9 @@
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 /** this thread is responsible for acquiring jobs in the job that need to be 
  * executed and then let the JobExecutor dispatch the acquired ids to one of the

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,9 +23,9 @@
 
 import java.util.Date;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,11 +27,11 @@
 import javax.transaction.Synchronization;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.Transaction;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.session.DbSession;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -31,9 +31,9 @@
 import java.util.concurrent.BlockingQueue;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 
 /** manager for job execution threads and their configuration.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,8 +24,8 @@
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,12 +27,12 @@
 
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.Transaction;
 import org.jbpm.api.listener.EventListener;
 import org.jbpm.api.model.OpenProcessDefinition;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.model.op.AtomicOperation;
 import org.jbpm.pvm.internal.model.op.MoveToChildActivity;
 import org.jbpm.pvm.internal.wire.Descriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,11 +25,11 @@
 import javax.transaction.Synchronization;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.api.env.Transaction;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.session.DbSession;
 
 public class ExceptionHandlerSynchronization implements Synchronization, Command<Object> {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -38,8 +38,6 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.activity.ActivityExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.env.Context;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.job.Job;
@@ -52,6 +50,8 @@
 import org.jbpm.api.model.OpenExecution;
 import org.jbpm.api.model.Transition;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.env.ExecutionContext;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.HistorySession;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,11 +26,11 @@
 import java.util.Map;
 
 import org.jbpm.api.Execution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.OpenProcessDefinition;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,8 +27,8 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,8 +27,8 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.api.history.HistoryProcessInstanceQuery;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 
 /**

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -38,8 +38,8 @@
 import org.jbpm.api.Deployment;
 import org.jbpm.api.NewDeployment;
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
 import org.jbpm.pvm.internal.lob.Lob;
 import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,8 +28,8 @@
 import org.jbpm.api.NewDeployment;
 import org.jbpm.api.ProcessDefinitionQuery;
 import org.jbpm.api.RepositoryService;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.model.ActivityCoordinates;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.CreateDeploymentQueryCmd;
 import org.jbpm.pvm.internal.cmd.CreateProcessDefinitionQueryCmd;
 import org.jbpm.pvm.internal.cmd.DeleteDeploymentCmd;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.jbpm.api.Execution;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.task.Task;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.query.DeploymentQueryImpl;

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/RepositorySession.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.session;
 
 import org.jbpm.api.NewDeployment;
-import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.spring;
 
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
 import org.springframework.transaction.PlatformTransactionManager;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,9 +25,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.WireObject;
 import org.jbpm.pvm.internal.cmd.AbstractCommand;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.env.ProvidedAuthentication;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.api.Execution;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.job.MessageImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.session.MessageSession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 
 /** performs an authorization check before the command is executed.
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 
 public interface AuthorizationSession {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,10 +22,10 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,11 +23,11 @@
 
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.api.env.WireObject;
 import org.jbpm.pvm.internal.cmd.AbstractCommand;
+import org.jbpm.pvm.internal.cmd.Command;
 
 
 /** sets up an environment around the execution of the command.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.identity.Group;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.identity.cmd.FindGroupsCmd;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.jbpm.api.IdentityService;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.identity.Group;
 import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.identity.cmd.CreateGroupCmd;
 import org.jbpm.pvm.internal.identity.cmd.CreateMembershipCmd;
 import org.jbpm.pvm.internal.identity.cmd.CreateUserCmd;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.CommandService;
 
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 
 import org.hibernate.StaleStateException;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,8 +27,8 @@
 import java.io.ObjectOutputStream;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 
 
 /**

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskHandler.java (from rev 5092, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskHandler.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskHandler.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -0,0 +1,83 @@
+/*
+ * 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.pvm.internal.task;
+
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.task.OpenTask;
+import org.jbpm.pvm.internal.client.ClientExecution;
+
+/** for advanced task customization.
+ * 
+ * The default implementation can be found in {@link DefaultTaskHandler}.
+ * 
+ * @author Tom Baeyens
+ */
+public class TaskHandler {
+
+  /** called after the task is created according 
+   * to the task definition.  This method allows to 
+   * create subtasks.
+   * @return indicates if the process execution should wait. */
+  public boolean executionCreateTask(OpenTask task) {
+    task.historyTaskStart();
+    return true;
+  }
+  
+  /** called when the related execution gets a 
+   * signal.  this method must either 
+   * {@link OpenTask#setSignalling(boolean) remove signalling} from this task
+   * or {@link OpenTask#cancel(String) cancel} it. */
+  public void executionSignal(OpenTask task) {
+    task.setSignalling(false);
+  }
+  
+  /** called when the given task is assigned to an actor. */
+  public void taskAssign(OpenTask task, String userId) {
+    task.historyTaskAssign(userId);
+  }
+
+  /** called when the given task is cancelled. */ 
+  public void taskCancel(OpenTask task, String reason) {
+    task.historyTaskCancel(reason);
+  }
+  
+  /** called when the given task completes.  The default behaviour 
+   * will send a signal to the execution if this task is still signalling. */
+  public void taskComplete(OpenTask task, String outcome) {
+    task.historyTaskComplete(outcome);
+    
+    if (task.isSignalling()) {
+      ClientExecution execution = (ClientExecution) task.getExecution();
+      execution.signal(outcome);
+    }
+  }
+
+  /** is called when a subtask completes.  this can be used to 
+   * prematurely signal the execution. e.g. for "5 out of 7" scenarios.*/
+  public void taskSubTaskComplete(OpenTask task, OpenTask subTask, String outcome) {
+  }
+  
+  /** is called when a variable is updated.  This can be used to 
+   * propagate the execution based on availability of variables. */
+  public void taskVariableUpdate(OpenTask task, String key, Object value) {
+  }
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -39,7 +39,6 @@
 import org.jbpm.api.task.Participation;
 import org.jbpm.api.task.Swimlane;
 import org.jbpm.api.task.Task;
-import org.jbpm.api.task.TaskHandler;
 import org.jbpm.pvm.internal.history.events.TaskAssign;
 import org.jbpm.pvm.internal.history.events.TaskCancel;
 import org.jbpm.pvm.internal.history.events.TaskComplete;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,10 +24,10 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.jbpm.api.Execution;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.job.Job;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.job.TimerImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,9 +23,9 @@
 
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.spring.CommandTransactionCallback;
 import org.jbpm.pvm.internal.svc.Interceptor;
 import org.springframework.transaction.PlatformTransactionManager;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.tx;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.svc.Interceptor;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.svc.RetryInterceptor;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 import javax.transaction.UserTransaction;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.svc.Interceptor;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.AsyncCommandService;
 import org.jbpm.pvm.internal.svc.DefaultCommandService;
 import org.jbpm.pvm.internal.svc.SerializeInterceptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.ExecutionServiceImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.HistoryServiceImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.IdentityServiceImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.test.JobTestHelper;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.ManagementServiceImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.TaskServiceImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.svc.Interceptor;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,14 +21,14 @@
  */
 package org.jbpm.pvm.eventlistener;
 
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.Event;
 import org.jbpm.pvm.activities.AutomaticActivity;
 import org.jbpm.pvm.activities.PrintLn;
 import org.jbpm.pvm.activities.TestConsoleTestCase;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 
 public class EventListenerTest extends TestConsoleTestCase {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,13 +24,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.Event;
 import org.jbpm.pvm.activities.DisplaySource;
 import org.jbpm.pvm.activities.TestConsole;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.test.BaseJbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.executionmode.embedded;
 
 
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -23,12 +23,12 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.activities.AutomaticActivity;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 
 public class ObjectExecutionModeTest extends TestCase {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.expr;
 
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.test.BaseJbpmTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.expr;
 
-import org.jbpm.api.client.ClientExecution;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
+import org.jbpm.pvm.internal.client.ClientExecution;
 import org.jbpm.pvm.internal.env.ExecutionContext;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.println;
 
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.pvm.activities.PrintLnBuilder;
 import org.jbpm.pvm.activities.TestConsoleTestCase;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 
 public class PrintlnTest extends TestConsoleTestCase {
   

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,10 @@
 
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.env.Transaction;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.type.variable.StringVariable;
 import org.jbpm.test.JbpmTestCase;
@@ -39,6 +40,13 @@
  */
 public class BasicTransactionTest extends JbpmTestCase {
 
+  protected CommandService commandService;
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    commandService = processEngine.get(CommandService.class);
+  }
+
   public void testCommit() {
     commandService.execute(new Command<Object>() {
       public Object execute(Environment environment) {

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-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -36,7 +36,6 @@
 import org.jbpm.api.ProcessInstance;
 import org.jbpm.api.RepositoryService;
 import org.jbpm.api.TaskService;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.task.Task;
 
 /** base class for persistent jBPM tests.
@@ -68,8 +67,6 @@
   protected static HistoryService historyService;
   protected static IdentityService identityService;
 
-  protected static CommandService commandService;
-
   /** 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>();
@@ -100,7 +97,6 @@
       managementService = processEngine.getManagementService();
       taskService = processEngine.getTaskService();
       identityService = processEngine.getIdentityService();
-      commandService = processEngine.get(CommandService.class);
     }
   }
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,7 +24,7 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.task.OpenTask;
 import org.jbpm.api.task.Task;
-import org.jbpm.api.task.TaskHandler;
+import org.jbpm.pvm.internal.task.TaskHandler;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.util.ReflectUtil;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,10 +25,10 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.cmd.Command;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -29,9 +29,9 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Session;
 import org.jbpm.api.Execution;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,10 +26,10 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.session.MessageSession;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.model.CommentImpl;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,9 +25,9 @@
 
 import org.hibernate.Session;
 import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.job.Job;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.session.MessageSession;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.session.DbSession;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
-import org.jbpm.api.cmd.CommandService;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.cmd.CommandService;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.test.JbpmTestCase;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,8 +24,8 @@
 import java.util.Random;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,9 +25,9 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.model.CommentImpl;

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -22,8 +22,8 @@
 package org.jbpm.test.load.messages;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.model.CommentImpl;
 
 /**

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,10 +25,10 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.cmd.CompositeCmd;
 import org.jbpm.pvm.internal.cmd.SendMessageCmd;
 import org.jbpm.pvm.internal.job.CommandMessage;

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,9 +26,9 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,10 +28,10 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /** shows wait states and automatic activities in a simple 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,14 +27,14 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.listener.EventListener;
 import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.api.model.Activity;
 import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /** shows how actions are listeners to following processDefinition events:

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,13 +25,13 @@
 
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.listener.EventListener;
 import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,9 +28,9 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /** shows the basics of the state property on the execution.

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,10 +27,10 @@
 
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 
 
 /**

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,13 +28,13 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.listener.EventListener;
 import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.api.model.Activity;
 import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -7,9 +7,9 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 public class LoopingTest extends BaseJbpmTestCase {

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -27,9 +27,9 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,11 +26,11 @@
 
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.Activity;
 import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -25,10 +25,10 @@
 
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -26,10 +26,10 @@
 import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -24,13 +24,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.api.listener.EventListener;
 import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java	2009-06-23 13:30:13 UTC (rev 5095)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java	2009-06-23 15:17:20 UTC (rev 5096)
@@ -28,10 +28,10 @@
 
 import org.jbpm.api.activity.ActivityExecution;
 import org.jbpm.api.activity.ExternalActivityBehaviour;
-import org.jbpm.api.client.ClientExecution;
-import org.jbpm.api.client.ClientProcessDefinition;
-import org.jbpm.api.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
+import org.jbpm.pvm.internal.client.ClientExecution;
+import org.jbpm.pvm.internal.client.ClientProcessDefinition;
+import org.jbpm.pvm.internal.client.ClientProcessInstance;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**




More information about the jbpm-commits mailing list