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

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Apr 16 15:28:22 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-04-16 15:28:20 -0400 (Thu, 16 Apr 2009)
New Revision: 4570

Added:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/
   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/Execution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/
Removed:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/
   jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java
   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/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/env/Context.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.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/EjbTimerSession.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/HappyListener.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/NoisyListener.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/custom/WaitState.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/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java
   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/model/JpdlExecution.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.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/JpdlSchemaTest.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/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.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/AddParticipationCmd.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/AssignTaskCmd.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/CommandException.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.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/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/DeleteProcessDefinitionCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.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/EndProcessInstance.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/FindExecutionCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.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/GetParticipantsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.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/GetTaskCmd.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/NewTaskCmd.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/RemoveParticipantCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.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/VariablesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/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/job/MessageImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.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/JobDbSession.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/JobExecutorMessageSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.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/jobexecutor/JobExecutorTimerSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.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/ExecutionKeyGenerator.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.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/model/ProcessInstanceEndedSynchronization.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.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/HistoryActivityInstanceQueryImpl.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/query/JobQueryImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.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/DeploymentProperty.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/repository/RepositorySessionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.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/spring/SpringCommandService.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.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/ExecutionServiceImpl.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/HistoryServiceImpl.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/ManagementServiceImpl.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/svc/TaskServiceImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.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/task/TaskQueryImpl.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/JtaTransaction.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.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/TransactionException.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.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/ContextRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.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/MessageSessionBinding.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/binding/TimerSessionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
   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/ContextRefDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.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/AutomaticActivity.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/embedded/WaitState.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/db/model/CommentDbTest.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/internal/identity/IdentityTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.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/BaseJbpmTestCase.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.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/activities/DecisionTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
   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/TaskListTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.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/AutomaticActivity.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/async/WaitState.java
   jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.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/AutomaticActivity.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/EventPropagationTest.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/TransitionBasedConcurrencyTest.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
   jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java
Log:
JBPM-2173 add api to api packages

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,124 +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;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.xml.sax.InputSource;
-
-/**
- * process engine configuration.
- *         
- * @author Tom Baeyens
- */
-public class Configuration {
-  
-  static Map<String, String> implementationClassNames = null;
-
-  Configuration impl;
- 
-  public Configuration() {
-    this((String)null);
-  }
-
-  public Configuration(String type) {
-    String implementationClassName = getImplementationClassName(type);
-    if (implementationClassName==null) {
-      throw new JbpmException("type is null");
-    }
-    impl = instantiate(implementationClassName);
-  }
-  
-  protected Configuration(Configuration base){
-  }
-  
-  private synchronized String getImplementationClassName(String type) {
-    if (implementationClassNames==null) {
-      implementationClassNames = new HashMap<String, String>();
-      // null represents the default configuration (== the JbpmConfiguration)
-      implementationClassNames.put(null, "org.jbpm.pvm.internal.cfg.JbpmConfiguration");
-      // TODO 
-      // implementationClasses.put("spring", "org.jbpm.pvm.internal.cfg.SpringConfiguration");
-      // implementationClasses.put("mc", "org.jbpm.pvm.internal.cfg.McConfiguration");
-      // implementationClasses.put("programatic", "org.jbpm.pvm.internal.cfg.ProgramaticConfiguration");
-    }
-    String implementationClassName = implementationClassNames.get(type);
-    if (implementationClassName==null) {
-      implementationClassName = type;
-    }
-    return implementationClassName;
-  }
-
-  protected Configuration instantiate(String className) {
-    ClassLoader classLoader = getClassLoader();
-    Configuration implementation;
-    try {
-      Class<?> implementationClass = classLoader.loadClass(className);
-      implementation = (Configuration) implementationClass.newInstance();
-    } catch (Exception e) {
-      throw new JbpmException("couldn't instantiate configuration of type "+className, e);
-    }
-    return implementation;
-  }
-
-  protected ClassLoader getClassLoader() {
-    return Thread.currentThread().getContextClassLoader();
-  }
-
-  public Configuration setXmlString(String xmlString) {
-    impl.setXmlString(xmlString);
-    return impl;
-  }
-
-  public Configuration setResource(String resource) {
-    impl.setResource(resource);
-    return impl;
-  }
-
-  public Configuration setInputStream(InputStream inputStream) {
-    impl.setInputStream(inputStream);
-    return impl;
-  }
-
-  public Configuration setInputSource(InputSource inputSource) {
-    impl.setInputSource(inputSource);
-    return impl;
-  }
-
-  public Configuration setUrl(URL url) {
-    impl.setUrl(url);
-    return impl;
-  }
-
-  public Configuration setFile(File file) {
-    impl.setFile(file);
-    return impl;
-  }
-
-  public ProcessEngine buildProcessEngine() {
-    return impl.buildProcessEngine();
-  }
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,51 +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;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.zip.ZipInputStream;
-
-import org.jbpm.client.ClientProcessDefinition;
-
-/**
- * @author Tom Baeyens
- */
-public interface Deployment {
-  
-  String getName();
-  Deployment setName(String name);
-
-  long getTimestamp();
-  Deployment setTimestamp(long timestamp);
-
-  Deployment addResourceFromString(String resourceName, String string);
-  Deployment addResourceFromInputStream(String resourceName, InputStream inputStream);
-  Deployment addResourceFromClasspath(String resourceName);
-  Deployment addResourceFromUrl(URL url);
-  Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
-  
-  /** @return deploymentId */
-  long deploy();
-
-  Deployment addProcessDefinition(ClientProcessDefinition processDefinition);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,199 +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;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.ObservableElement;
-
-/** a runtime path of execution.
- * 
- * <h3 id="state">State of an execution</h3>
- * 
- * <p>The state of an execution is either active or locked.  An active execution is either 
- * executing or waiting for an external trigger.  If an execution is not in {@link #STATE_ACTIVE},
- * then it is locked.  A locked execution is read only.  
- * </p>
- * 
- * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}.  To change 
- * the state to a locked state, use {@link #lock(String)}.  
- * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the 
- * most commonly used locked states.  But the state '...' in the picture indicates 
- * that any string can be provided as the state in the lock method.
- * </p>
- * 
- * <p>If an execution is locked, methods that change the execution will throw
- * a {@link JbpmException} and the message will reference the actual locking state.
- * {@link #fire(String, ObservableElement) Firing events}, 
- * {@link #setVariable(String, Object) updating variables}, 
- * {@link #setPriority(int) updating priority} and 
- * {@link #createComment(String) adding comments} are not considered to change an 
- * execution.  Also {@link #createProcessInstance(String) creation} and 
- * {@link #removeExecution(Execution) removal} of child executions are unchecked, 
- * which means that those methods can be invoked by external API clients and 
- * activity behaviour methods, even while the execution is in a locked state. 
- * </p>    
- * 
- * <p>Make sure that comparisons between {@link #getState()} and the 
- * {@link #STATE_ACTIVE STATE_* constants} are  
- * done with .equals and not with '==' because if executions are 
- * loaded from persistent storage, a new string is created instead 
- * of the constants.
- * </p>
- * 
- * <h3>Comments</h3>
- * 
- * @author Tom Baeyens
- */
-public interface Execution extends Serializable {
-
-  /** between {@link ClientProcessDefinition#createProcessInstance() creation of 
-   * a new process instance} and the {@link ClientExecution#start() start} of that 
-   * process instance.  The motivation of this state is that variables can be 
-   * set programmatically on the process instance so that they can be used during 
-   * initializations of variables and timers */
-  String STATE_CREATED = "created";
-  
-  /** either executing or in a wait state waiting for a signal.
-   * This is the normal state of an execution and the initial state 
-   * when creating a new execution. Make sure that comparisons are 
-   * done with .equals and not with '==' because if executions are 
-   * loaded from persistent storage, a new string is created instead 
-   * of the constants. */
-  String STATE_ACTIVE = "active";
-  
-  /** parents with concurrent child executions are inactive.  
-   * When an execution has concurrent child executions, it implies that 
-   * this execution can't be active.  For example, at a fork, the parent
-   * execution can wait inactively in the fork being till all the
-   * child executions are joined.  Only leaves of the
-   * execution tree can be active. Make sure that comparisons are 
-   * done with .equals and not with '==' because if executions are 
-   * loaded from persistent storage, a new string is created instead 
-   * of the constants. */
-  String STATE_INACTIVE = "inactive";
-  
-  /** this execution has ended. Make sure that comparisons are 
-   * done with .equals and not with '==' because if executions are 
-   * loaded from persistent storage, a new string is created instead 
-   * of the constants. */
-  String STATE_ENDED = "ended";
-  
-  /** indicates that this execution is temporary suspended with the
-   * {@link #suspend()} method.  Human tasks of a suspended execution
-   * shouldn't show up in people's task list and timers of suspended
-   * executions shouldn't fire and the execution is locked. Make sure that comparisons are 
-   * done with .equals and not with '==' because if executions are 
-   * loaded from persistent storage, a new string is created instead 
-   * of the constants. */
-  String STATE_SUSPENDED = "suspended";
-  
-  /** indicates that this execution is doing an asynchronous continuation. */
-  String STATE_ASYNC = "async";
-
-  /** this execution has been cancelled before it came to completion.
-   * Only history executions might expose this state.  This state can be 
-   * passed in {@link ExecutionService#endProcessInstance(String, String)}.
-   * Make sure that comparisons are 
-   * done with .equals and not with '==' because if executions are 
-   * loaded from persistent storage, a new string is created instead 
-   * of the constants. */
-  String STATE_CANCELLED = "cancelled";
-
-  /** the externally given name or id of this execution. The id of a main 
-   * path of execution is null.   Can be used to differentiate concurrent 
-   * paths of execution e.g. the shipping and billing paths.  */
-  String getName();
-
-  /** the optional user provided business key that is unique within one 
-   * process definition.  This could be for instance the order number.  
-   * It's a user defined identifier for one execution within the scope of 
-   * a single process definition. */
-  String getKey();
-  
-  /** a globally unique identifier for this execution. */
-  String getId();
-  
-  /** represents the current position in the process by indicating the 
-   * name of the current activity. */
-  String getActivityName();
-
-  /** the <a href="#state">state</a> of this execution.  */
-  String getState();
-
-  /** is this a process instance */
-  boolean isProcessInstance();
-
-  /** is this execution active ? This is the inverse of {@link #isLocked()}. */
-  boolean isActive();
-
-  /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */
-  boolean isLocked();
-
-  /** is this execution ended */
-  boolean isEnded();
-
-  /** is this execution suspended ? */
-  boolean isSuspended();
-
-  /** indicates low priorities with negative values and high priorities 
-   * with positive values.  The default priority is 0, which means 
-   * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), 
-   * LOW (-1) and LOWEST (-2). For the rest, the user can set any other 
-   * priority integer value, but then, the UI will have to display it as 
-   * an integer and not the named value.*/
-  int getPriority();
-  
-  // execution hierarchy access ///////////////////////////////////////////////
-  
-  /** the main path of execution in the <a href="package-summary.html#basicexecutionstructure">execution 
-   * structure</a>.  Null will be returned in case this execution itself is the 
-   * main execution path.  */
-  Execution getProcessInstance();
-
-  /** the parent execution in the <a href="package-summary.html#basicexecutionstructure">execution 
-   * structure</a>.  Null will be returned in case this execution itself is the 
-   * main execution path. */ 
-  Execution getParent();
-
-  /** the child executions in the <a href="package-summary.html#basicexecutionstructure">execution 
-   * structure</a>.  Can be null and can be an empty collection. */ 
-  Collection<Execution> getExecutions();
-  
-  /** maps child execution names to execution objects.  In case multiple executions 
-   * have the same name, the first one is taken.  Can be null or can be an empty 
-   * map.  The first execution without a name is also included with null as the key.
-   */ 
-  Map<String, Execution> getExecutionsMap();
-  
-  /** the child execution for the given name or null in case such execution doesn't exist. */ 
-  Execution getExecution(String name);
-  
-  /** indicates if this execution has a child execution with the given executionName */
-  boolean hasExecution(String executionName);
-  
-  Execution findActiveExecutionIn(String activityName);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,124 +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;
-
-import java.util.Map;
-import java.util.Set;
-
-
-/** manages runtime process executions.
- *
- * @author Tom Baeyens
- */
-public interface ExecutionService {
-
-  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
-   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
-  ProcessInstance startProcessInstanceById(String processDefinitionId);
-
-  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. 
-   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
-   * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all 
-   *    process definition versions with the same name. */
-  ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey);
-
-  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. 
-   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
-   * @param variables are the initial values of the process variables that will be set before the execution starts. */
-  ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
-
-  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
-   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
-   * @param variables are the initial values of the process variables that will be set before the execution starts.
-   * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all 
-   *    process versions with the same name. */
-  ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
-
-  /** starts a new process instance in the latest version of the given process definition.
-   * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
-  ProcessInstance startProcessInstanceByKey(String processDefinitionKey);
-
-  /** starts a new process instance in the latest version of the given processDefinitionName.
-   * @param processDefinitionKey is the key of the process definition
-   *   for which the latest version will be taken.
-   * @param processInstanceKey is a user provided reference for the new process instance
-   *   that must be unique over all process versions with the same name. */
-  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
-
-  /** starts a new process instance in the latest version of the given processDefinitionName.
-   * @param processDefinitionKey is the key of the process definition
-   *   for which the latest version will be taken.
-   * @param variables are the initial values of the process variables that
-   *   will be set before the execution starts (read: before the initial
-   *   activity is executed). */
-  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
-
-  /** starts a new process instance in the latest version of the given processDefinitionName.
-   * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
-   * @param variables are the initial values of the process variables that will be set before the execution starts.
-   * @param processInstanceKey is a user provided reference for the new execution that must be unique over all
-   *    process versions with the same name. */
-  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
-
-  /** the path of execution that is uniquely defined by the execution id. */
-  Execution findExecutionById(String executionId);
-
-  /** the process instance that is uniquely defined by the process execution id. */
-  ProcessInstance findProcessInstanceById(String processInstanceId);
-
-  /** provides an external trigger to an execution. */
-  ProcessInstance signalExecutionById(String executionId);
-
-  /** provides a named external trigger to an execution. */
-  ProcessInstance signalExecutionById(String executionId, String signalName);
-
-  /** provides a named external trigger to an execution with parameters. */
-  ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
-
-  /** provides a external trigger to an execution with parameters. */
-  ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters);
-
-
-  /** search for process instances with criteria */
-  ProcessInstanceQuery createProcessInstanceQuery();
-
-  /** creates or overwrites a variable value on the referenced execution */
-  void setVariable(String executionId, String name, Object value);
-
-  /** creates or overwrites the variable values on the referenced execution */
-  void setVariables(String executionId, Map<String, Object> variables);
-
-  /** retrieves a variable */
-  Object getVariable(String executionId, String variableName);
-
-  /** all the variables visible in the given execution scope */
-  Set<String> getVariableNames(String executionId);
-
-  /** retrieves a map of variables */
-  Map<String, Object> getVariables(String executionId, Set<String> variableNames);
-  
-  /** end a process instance */
-  void endProcessInstance(String processInstanceId, String state);
-
-  /** delete a process instance */
-  void deleteProcessInstance(String processInstanceId);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,48 +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;
-
-import java.util.Map;
-
-import org.jbpm.history.HistoryActivityInstanceQuery;
-import org.jbpm.history.HistoryProcessInstanceQuery;
-
-
-/** exposes the history information for ongoing and past 
- * process instances.
- * 
- * @author Tom Baeyens
- */
-public interface HistoryService {
-
-  /** search for process instances in the history */
-  HistoryProcessInstanceQuery createHistoryProcessInstanceQuery();
-
-  /** search in history activity instance information */ 
-  HistoryActivityInstanceQuery createHistoryActivityInstanceQuery();
-
-  /** returns the average duration in milliseconds for each activity in the given process definition */
-  Map<String, Long> avgDurationPerActivity(String processDefinitionId);
-  
-  /** returns for each transitionName, the number of times that transition was taken */
-  Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,94 +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;
-
-import java.util.List;
-
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface IdentityService {
-
-  /** create a new user */
-  void createUser(String userId, String password, String givenName, String familyName);
-  
-  /** lookup a user 
-   * @return the user or null if no such user exists */
-  User findUserById(String userId);
-
-  /** get all the users in the system.
-   * Returns an empty list if no users exist. */
-  List<User> findUsers();
-
-  /** delete the given user.  
-   * No effect (no exception) if the user does not exist. */
-  void deleteUser(String userId);
-
-  /** create a group new group 
-   * @return the generated id for this group. */
-  String createGroup(String string);
-
-  /** create a group new group 
-   * @return the generated id for this group. */
-  String createGroup(String string, String groupType);
-
-  /** create a group new group 
-   * @return the generated id for this group. */
-  String createGroup(String groupName, String groupType, String parentGroupId);
-
-  /** lookup a group.
-  * @return the user or null if no such user exists */
-  Group findGroupById(String groupId);
-  
-  /** groups of the given groupType for which the given user is a member.
-   * Returns an empty list if no such groups exist. */
-  List<Group> findGroupsByUserAndGroupType(String userId, String groupType);
-  
-  /** all group ids (String) for which this user is a member.
-   * Returns an empty list if no such groups exist. */
-  List<Group> findGroupsByUser(String userId);
-  
-  /** all group ids (String) for which this user is a member.
-   * Returns an empty list if no such groups exist. */
-  List<String> findGroupIdsByUser(String userId);
-  
-  /** deletes the given group.
-   * No effect (no exception) if the group does not exist. */
-  void deleteGroup(String groupId);
-
-  /** makes the given user a member of the given group with the given role.
-   * Role can be null. */
-  void createMembership(String string, String groupId);
-  
-  /** makes the given user a member of the given group with the given role.
-   * Role can be null. */
-  void createMembership(String userId, String groupId, String role);
-
-  /** makes the given user a member of the given group with the given role.
-   * Role can be null.  If no such membership exists, this method will 
-   * not throw an exception and have no effect. */
-  void deleteMembership(String userId, String groupId, String role);
-}
\ No newline at end of file

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,42 +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;
-
-public class JbpmException extends RuntimeException {
-
-  private static final long serialVersionUID = 1L;
-
-  public JbpmException() {
-    super();
-  }
-  public JbpmException(String msg, Throwable cause) {
-    super(msg);
-    super.initCause(cause);
-  }
-  public JbpmException(String msg) {
-    super(msg);
-  }
-  public JbpmException(Throwable cause) {
-    super();
-    super.initCause(cause);
-  }
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,48 +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;
-
-import java.util.List;
-
-import org.jbpm.job.Job;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface JobQuery {
-
-  JobQuery messages();
-  JobQuery timers();
-  
-  JobQuery processInstanceId(String processInstanceId);
-  
-  JobQuery exception();
-
-  JobQuery orderAsc(String property);
-  JobQuery orderDesc(String property);
-
-  JobQuery page(int firstResult, int maxResults);
-
-  List<Job> list();
-  Job uniqueResult();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,44 +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;
-
-
-
-
-/** operations targeted to system operators that need to keep 
- * the process engine up and running.  This functionality is typically 
- * exposed through a management web console. 
- * 
- * @author Tom Baeyens
- */
-public interface ManagementService {
-
-  /** resets the retry count, clears the exception and executes the job. 
-   * An exception is thrown out of this method in case the execution 
-   * of the job fails.  In case the async command executor is configured 
-   * for this service, failing job execution will not result into an 
-   * exception coming out of this method. */
-  void executeJob(long jobDbid);
-
-  /** search for jobs */
-  JobQuery createJobQuery();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,41 +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;
-
-/**
- * @author Tom Baeyens
- */
-public interface Problem {
-
-  public abstract Throwable getCause();
-
-  public abstract int getColumn();
-
-  public abstract int getLine();
-
-  public abstract String getMsg();
-
-  public abstract String getResource();
-
-  public abstract String getSeverity();
-
-}
\ No newline at end of file

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,54 +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;
-
-import java.io.Serializable;
-
-
-/** a graphical process which is deployed in the {@ ProcessService}.
- * 
- * @author Tom Baeyens
- */
-public interface ProcessDefinition extends Serializable {
-
-  /** the short display name given to this process definition. 
-   * Multiple process definitions can have the same as long 
-   * as they are given a different {@link #version}.  */
-  String getName();
-
-  /** the user defined short representation of the name. Just 
-   * like the name, multiple versions of a process definition 
-   * can have the same key. */
-  String getKey();
-
-  /** the unique id for this process definition. */
-  String getId();
-
-  /** automatically assigned during deployment of a process that 
-   * represents the sequence number for process definitions with 
-   * the same {@link ObservableElement#getId() name}. */ 
-  int getVersion();
-  
-  /** references the deployment in which this process definition is
-   * deployed. */
-  long getDeploymentDbid();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,50 +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;
-
-import java.util.List;
-
-/**
- * @author Tom Baeyens
- */
-public interface ProcessDefinitionQuery {
-
-  String PROPERTY_ID = "idProperty.stringValue";
-  String PROPERTY_KEY = "keyProperty.stringValue";
-  String PROPERTY_NAME = "idProperty.objectName";
-  String PROPERTY_VERSION = "versionProperty.longValue";
-  String PROPERTY_DEPLOYMENT_TIMESTAMP = "deployment.timestamp";
-
-  ProcessDefinitionQuery id(String id);
-  ProcessDefinitionQuery key(String key);
-  ProcessDefinitionQuery nameLike(String name);
-  ProcessDefinitionQuery name(String name);
-  ProcessDefinitionQuery deploymentDbid(long deploymentDbid);
-
-  ProcessDefinitionQuery orderAsc(String property);
-  ProcessDefinitionQuery orderDesc(String property);
-
-  ProcessDefinitionQuery page(int firstResult, int maxResults);
-  
-  List<ProcessDefinition> list();
-  ProcessDefinition uniqueResult();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,65 +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;
-
-
-/** central starting point for all process engine API
- * interactions. 
- * 
- * @author Tom Baeyens
- */
-public interface ProcessEngine {
-
-  /** the {@link RepositoryService repository service} that provides access
-   * to the process repository. */ 
-  RepositoryService getRepositoryService();
-
-  /** the {@link ExecutionService execution service} that provides access
-   * to the runtime executions repository. */ 
-  ExecutionService getExecutionService();
-
-  /** the {@link HistoryService history service} that provides access
-   * to the history executions repository. */ 
-  HistoryService getHistoryService();
-
-  /** the {@link TaskService task service} that exposes the 
-   * runtime human task lists. */ 
-  TaskService getTaskService();
-
-  /** the {@link IdentityService identity service} that exposes the 
-   * user and group operations management operations. */ 
-  IdentityService getIdentityService();
-
-  /** the {@link ManagementService management service} that exposes the 
-   * management operations to operators that have to keep the jBPM system 
-   * up and running. */ 
-  ManagementService getManagementService();
-
-  /** retrieve and object defined in the process engine by type */
-  <T> T get(Class<T> type);
-
-  /** retrieve and object defined in the process engine by name */
-  Object get(String name);
-  
-  /** programmatically provide a hibernate session factory */
-  void setSessionFactory(Object sessionFactory);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,33 +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;
-
-
-/** a process instance is one execution of a process definition.
- * One process instance can have many concurrent executions.  
- * Executions are structured in a tree of which the ProcessInstance 
- * is the root.
- * 
- * @author Tom Baeyens
- */
-public interface ProcessInstance extends Execution {
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,45 +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;
-
-import java.util.List;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface ProcessInstanceQuery {
-  
-  String PROPERTY_KEY = "key";
-  
-  ProcessInstanceQuery processDefinitionId(String processDefinitionId);
-
-  ProcessInstanceQuery processInstanceId(String processInstanceId);
-
-  ProcessInstanceQuery orderAsc(String property);
-  ProcessInstanceQuery orderDesc(String property);
-
-  ProcessInstanceQuery page(int firstResult, int maxResults);
-
-  List<Execution> list();
-  Execution uniqueResult();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,59 +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;
-
-import java.util.List;
-
-
-/** a process definition repository.
- * 
- * @author Tom Baeyens
- */
-public interface ProcessService {
-  
-  /** start a deployment */
-  Deployment createDeployment();
-
-  /** all deployed process definition keys. */
-  List<String> findProcessDefinitionKeys();
-
-  /** all versions of the given process. 
-   * @return the process definitions in descending version order.  So you get the 
-   * highest version number as the first. */
-  List<ProcessDefinition> findProcessDefinitionsByKey(String processDefinitionKey);
-
-  /** latest version of the processDefinition with the given key. */
-  ProcessDefinition findLatestProcessDefinitionByKey(String processDefinitionKey);
-
-  /** specific version of a named processDefinition. */
-  ProcessDefinition findProcessDefinitionById(String processDefinitionId);
-  
-  /** search for process definitions */
-  ProcessDefinitionQuery createProcessDefinitionQuery();
-
-  /** deletes process definition if there are no existing executions. 
-   * @throws JbpmException if there are existing executions or history. */
-  void deleteProcessDefinition(String processDefinitionId);
-
-  /** deletes process definition, the existing executions and the history. */
-  void deleteProcessDefinitionCascade(String processDefinitionId);
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,41 +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;
-
-import java.io.InputStream;
-
-
-/**
- * @author Tom Baeyens
- */
-public interface RepositoryService {
-
-  Deployment createDeployment();
-
-  void deleteDeployment(long deploymentDbid);
-  void deleteDeploymentCascade(long deploymentDbid);
-
-  InputStream getResourceAsStream(long deploymentDbid, String resourceName);
-
-  ProcessDefinitionQuery createProcessDefinitionQuery();
-
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,58 +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;
-
-import java.util.List;
-
-import org.jbpm.task.Task;
-
-
-/**
- * @author Tom Baeyens
- * @author Heiko Braun <heiko.braun at jboss.com>
- */
-public interface TaskQuery {
-  
-  public static final String PROPERTY_NAME = "name";
-  public static final String PROPERTY_ASSIGNEE = "assignee";
-  public static final String PROPERTY_CREATEDATE = "create";
-  public static final String PROPERTY_DUEDATE = "dueDate";
-  public static final String PROPERTY_PRIORITY = "priority";
-  public static final String PROPERTY_PROGRESS = "progress";
-
-  /** only find tasks for which the given user is the assignee */
-  TaskQuery assignee(String userId);
-  
-  /** query for tasks that are unassigned.
-   * These tasks can still potentially have candidates. */
-  TaskQuery unassigned();
-
-  /** only query for tasks that are takable by the given user. */
-  TaskQuery takableBy(String userId);
-
-  TaskQuery page(int firstResult, int maxResults);
-  TaskQuery orderAsc(String property);
-  TaskQuery orderDesc(String property);
-  
-  List<Task> list();
-  Task uniqueResult();
-}

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,171 +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;
-
-import org.jbpm.model.Comment;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Human task management facility.
- * @author Alejandro Guizar
- * @author Heiko Braun <heiko.braun at jboss.com>
- */
-public interface TaskService {
-
-  /** Creates a task.
-   * The returned task will be transient.
-   * Use {@link #saveTask(Task)} to persist the task. Only 
-   * after the invocation of {@link #saveTask(Task)}, the 
-   * {@link Task#getDbid()} property will be initialized. */
-  Task newTask();
-
-  /** Creates a new subtask for the given task.
-   * Make sure that the parent task is saved before the 
-   * {@link Task#getDbid() dbid} is taken.
-   * The returned task will be transient.
-   * Use {@link #saveTask(Task)} to persist the task. */
-  Task newTask(long parentTaskDbid);
-
-  /** Saves the given task to persistent storage. 
-   * @return the taskDbid */
-  long saveTask(Task task);
-
-  /** Retrieves the task with the given identifier from persistent storage. 
-   * If no task with the given identifier exists, 
-   * the call returns <code>null</code>. */
-  Task getTask(long taskDbid);
-
-  /** assigns this task to the given assignee. */
-  void assignTask(long taskDbid, String userId);
-
-  /** taking this task will prevent all other candidates from 
-   * taking and working on this task. 
-   * @throws JbpmException if this task already has been taken. */
-  void takeTask(long taskDbid, String userId);
-
-  /** Deletes this task, marks the related history task as completed.
-   * If the task was created in the context 
-   * of a process execution, this operation may result in a process instance 
-   * being triggered. */
-  void completeTask(long taskDbid);
-  
-  /** Deletes this task, marks the related history task as completed 
-   * with the specified outcome.  If the task was created in the context 
-   * of a process execution, this operation may result in a process instance 
-   * being triggered. The outcome in that case corresponds to an outgoing 
-   * transition in the process. */
-  void completeTask(long taskDbid, String outcome);
-
-  /** Deletes the task.
-   * If this task was created in the context of a process execution, one 
-   * of three things might happen depending on configurations of the task 
-   * in the process definition: 
-   * a) process executions resumes 
-   * b) whole process execution is cancelled as well.
-   * c) exception is thrown */
-  void cancelTask(long taskDbid);
-
-  /** Deletes the task providing an indication of the reason.  Example reasons 
-   * could be: "failed", "error", "exited", "obsolete" or "deleted". 
-   * If this task was created in the context of a process execution, one 
-   * of three things might happen depending on configurations of the task 
-   * in the process definition: 
-   * a) process executions resumes 
-   * b) whole process execution is cancelled as well.
-   * c) exception is thrown */
-  void cancelTask(long taskDbid, String reason);
-
-  /** add a role to a given task.
-   * @param participation specifies the kind of involvement of the participatingUser
-   * in this task. see {@link Participation} for default constants. */
-  void addTaskParticipatingUser(long taskDbid, String userId, String participationType);
-    
-  /** add a role to a given task.
-   * @param participation specifies the kind of involvement of the participatingUser
-   * in this task. see {@link Participation} for default constants. */
-  void addTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
-    
-  /** get roles related to a given task. */
-  List<Participation> getTaskParticipations(long taskDbid);
-  
-  /** removes a role to a given task.  Nothing happens (no exception) if 
-   * the role does not exist.
-   * @param participation specifies the kind of involvement of the participatingUser
-   * in this task. see {@link Participation} for default constants. */
-  void removeTaskParticipatingUser(long taskDbid, String userId, String participationType);
-  
-  /** removes a role to a given task.  Nothing happens (no exception) if 
-   * the role does not exist.
-   * @param participation specifies the kind of involvement of the participatingUser
-   * in this task. see {@link Participation} for default constants. */
-  void removeTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
-
-  /** create a new query for tasks */
-  TaskQuery createTaskQuery();
-
-  /** list of tasks that are assigned to the given user. 
-   * Returns an empty list in case no such tasks exist. */
-  List<Task> findAssignedTasks(String userId);
-
-  /** list of tasks that can be taken by the given user.
-   * Returns an empty list in case no such tasks exist. */
-  List<Task> findTakableTasks(String userId);
-
-  /** get the subtasks for this task.  Only goes one level deep at a time. */
-  List<Task> getSubTasks(long taskDbid);
-
-  /** add a comment to a task */
-  Comment addTaskComment(long taskDbid, String message);
-
-  /** get the list of comments made to a task.  this will 
-   * fetch all the comments and recursively all replies to those 
-   * comments. */
-  List<Comment> getTaskComments(long taskDbid);
-
-  /** add a reply to another comment */
-  Comment addReplyComment(long commentDbid, String message);
-
-  /** delete a comment.
-   * this will recursively delete all replies to this comment. */
-  void deleteComment(long commentDbid);
-
-  /** creates or overwrites a variable value on the given task */
-  void setVariable(long taskDbid, String name, Object value);
-
-  /** creates or overwrites the variable values on the given task */
-  void setVariables(long taskDbid, Map<String, Object> variables);
-
-  /** retrieves a variable */
-  Object getVariable(long taskDbid, String variableName);
-
-  /** all the variables visible in the given task */
-  Set<String> getVariableNames(long taskDbid);
-
-  /** retrieves a map of variables */
-  Map<String, Object> getVariables(long taskDbid, Set<String> variableNames);
-
-}

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Configuration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,124 @@
+/*
+ * 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;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.xml.sax.InputSource;
+
+/**
+ * process engine configuration.
+ *         
+ * @author Tom Baeyens
+ */
+public class Configuration {
+  
+  static Map<String, String> implementationClassNames = null;
+
+  Configuration impl;
+ 
+  public Configuration() {
+    this((String)null);
+  }
+
+  public Configuration(String type) {
+    String implementationClassName = getImplementationClassName(type);
+    if (implementationClassName==null) {
+      throw new JbpmException("type is null");
+    }
+    impl = instantiate(implementationClassName);
+  }
+  
+  protected Configuration(Configuration base){
+  }
+  
+  private synchronized String getImplementationClassName(String type) {
+    if (implementationClassNames==null) {
+      implementationClassNames = new HashMap<String, String>();
+      // null represents the default configuration (== the JbpmConfiguration)
+      implementationClassNames.put(null, "org.jbpm.pvm.internal.cfg.JbpmConfiguration");
+      // TODO 
+      // implementationClasses.put("spring", "org.jbpm.pvm.internal.cfg.SpringConfiguration");
+      // implementationClasses.put("mc", "org.jbpm.pvm.internal.cfg.McConfiguration");
+      // implementationClasses.put("programatic", "org.jbpm.pvm.internal.cfg.ProgramaticConfiguration");
+    }
+    String implementationClassName = implementationClassNames.get(type);
+    if (implementationClassName==null) {
+      implementationClassName = type;
+    }
+    return implementationClassName;
+  }
+
+  protected Configuration instantiate(String className) {
+    ClassLoader classLoader = getClassLoader();
+    Configuration implementation;
+    try {
+      Class<?> implementationClass = classLoader.loadClass(className);
+      implementation = (Configuration) implementationClass.newInstance();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't instantiate configuration of type "+className, e);
+    }
+    return implementation;
+  }
+
+  protected ClassLoader getClassLoader() {
+    return Thread.currentThread().getContextClassLoader();
+  }
+
+  public Configuration setXmlString(String xmlString) {
+    impl.setXmlString(xmlString);
+    return impl;
+  }
+
+  public Configuration setResource(String resource) {
+    impl.setResource(resource);
+    return impl;
+  }
+
+  public Configuration setInputStream(InputStream inputStream) {
+    impl.setInputStream(inputStream);
+    return impl;
+  }
+
+  public Configuration setInputSource(InputSource inputSource) {
+    impl.setInputSource(inputSource);
+    return impl;
+  }
+
+  public Configuration setUrl(URL url) {
+    impl.setUrl(url);
+    return impl;
+  }
+
+  public Configuration setFile(File file) {
+    impl.setFile(file);
+    return impl;
+  }
+
+  public ProcessEngine buildProcessEngine() {
+    return impl.buildProcessEngine();
+  }
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Deployment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,51 @@
+/*
+ * 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;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.zip.ZipInputStream;
+
+import org.jbpm.api.client.ClientProcessDefinition;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface Deployment {
+  
+  String getName();
+  Deployment setName(String name);
+
+  long getTimestamp();
+  Deployment setTimestamp(long timestamp);
+
+  Deployment addResourceFromString(String resourceName, String string);
+  Deployment addResourceFromInputStream(String resourceName, InputStream inputStream);
+  Deployment addResourceFromClasspath(String resourceName);
+  Deployment addResourceFromUrl(URL url);
+  Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream);
+  
+  /** @return deploymentId */
+  long deploy();
+
+  Deployment addProcessDefinition(ClientProcessDefinition processDefinition);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,199 @@
+/*
+ * 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;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.ObservableElement;
+
+/** a runtime path of execution.
+ * 
+ * <h3 id="state">State of an execution</h3>
+ * 
+ * <p>The state of an execution is either active or locked.  An active execution is either 
+ * executing or waiting for an external trigger.  If an execution is not in {@link #STATE_ACTIVE},
+ * then it is locked.  A locked execution is read only.  
+ * </p>
+ * 
+ * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}.  To change 
+ * the state to a locked state, use {@link #lock(String)}.  
+ * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the 
+ * most commonly used locked states.  But the state '...' in the picture indicates 
+ * that any string can be provided as the state in the lock method.
+ * </p>
+ * 
+ * <p>If an execution is locked, methods that change the execution will throw
+ * a {@link JbpmException} and the message will reference the actual locking state.
+ * {@link #fire(String, ObservableElement) Firing events}, 
+ * {@link #setVariable(String, Object) updating variables}, 
+ * {@link #setPriority(int) updating priority} and 
+ * {@link #createComment(String) adding comments} are not considered to change an 
+ * execution.  Also {@link #createProcessInstance(String) creation} and 
+ * {@link #removeExecution(Execution) removal} of child executions are unchecked, 
+ * which means that those methods can be invoked by external API clients and 
+ * activity behaviour methods, even while the execution is in a locked state. 
+ * </p>    
+ * 
+ * <p>Make sure that comparisons between {@link #getState()} and the 
+ * {@link #STATE_ACTIVE STATE_* constants} are  
+ * done with .equals and not with '==' because if executions are 
+ * loaded from persistent storage, a new string is created instead 
+ * of the constants.
+ * </p>
+ * 
+ * <h3>Comments</h3>
+ * 
+ * @author Tom Baeyens
+ */
+public interface Execution extends Serializable {
+
+  /** between {@link ClientProcessDefinition#createProcessInstance() creation of 
+   * a new process instance} and the {@link ClientExecution#start() start} of that 
+   * process instance.  The motivation of this state is that variables can be 
+   * set programmatically on the process instance so that they can be used during 
+   * initializations of variables and timers */
+  String STATE_CREATED = "created";
+  
+  /** either executing or in a wait state waiting for a signal.
+   * This is the normal state of an execution and the initial state 
+   * when creating a new execution. Make sure that comparisons are 
+   * done with .equals and not with '==' because if executions are 
+   * loaded from persistent storage, a new string is created instead 
+   * of the constants. */
+  String STATE_ACTIVE = "active";
+  
+  /** parents with concurrent child executions are inactive.  
+   * When an execution has concurrent child executions, it implies that 
+   * this execution can't be active.  For example, at a fork, the parent
+   * execution can wait inactively in the fork being till all the
+   * child executions are joined.  Only leaves of the
+   * execution tree can be active. Make sure that comparisons are 
+   * done with .equals and not with '==' because if executions are 
+   * loaded from persistent storage, a new string is created instead 
+   * of the constants. */
+  String STATE_INACTIVE = "inactive";
+  
+  /** this execution has ended. Make sure that comparisons are 
+   * done with .equals and not with '==' because if executions are 
+   * loaded from persistent storage, a new string is created instead 
+   * of the constants. */
+  String STATE_ENDED = "ended";
+  
+  /** indicates that this execution is temporary suspended with the
+   * {@link #suspend()} method.  Human tasks of a suspended execution
+   * shouldn't show up in people's task list and timers of suspended
+   * executions shouldn't fire and the execution is locked. Make sure that comparisons are 
+   * done with .equals and not with '==' because if executions are 
+   * loaded from persistent storage, a new string is created instead 
+   * of the constants. */
+  String STATE_SUSPENDED = "suspended";
+  
+  /** indicates that this execution is doing an asynchronous continuation. */
+  String STATE_ASYNC = "async";
+
+  /** this execution has been cancelled before it came to completion.
+   * Only history executions might expose this state.  This state can be 
+   * passed in {@link ExecutionService#endProcessInstance(String, String)}.
+   * Make sure that comparisons are 
+   * done with .equals and not with '==' because if executions are 
+   * loaded from persistent storage, a new string is created instead 
+   * of the constants. */
+  String STATE_CANCELLED = "cancelled";
+
+  /** the externally given name or id of this execution. The id of a main 
+   * path of execution is null.   Can be used to differentiate concurrent 
+   * paths of execution e.g. the shipping and billing paths.  */
+  String getName();
+
+  /** the optional user provided business key that is unique within one 
+   * process definition.  This could be for instance the order number.  
+   * It's a user defined identifier for one execution within the scope of 
+   * a single process definition. */
+  String getKey();
+  
+  /** a globally unique identifier for this execution. */
+  String getId();
+  
+  /** represents the current position in the process by indicating the 
+   * name of the current activity. */
+  String getActivityName();
+
+  /** the <a href="#state">state</a> of this execution.  */
+  String getState();
+
+  /** is this a process instance */
+  boolean isProcessInstance();
+
+  /** is this execution active ? This is the inverse of {@link #isLocked()}. */
+  boolean isActive();
+
+  /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */
+  boolean isLocked();
+
+  /** is this execution ended */
+  boolean isEnded();
+
+  /** is this execution suspended ? */
+  boolean isSuspended();
+
+  /** indicates low priorities with negative values and high priorities 
+   * with positive values.  The default priority is 0, which means 
+   * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), 
+   * LOW (-1) and LOWEST (-2). For the rest, the user can set any other 
+   * priority integer value, but then, the UI will have to display it as 
+   * an integer and not the named value.*/
+  int getPriority();
+  
+  // execution hierarchy access ///////////////////////////////////////////////
+  
+  /** the main path of execution in the <a href="package-summary.html#basicexecutionstructure">execution 
+   * structure</a>.  Null will be returned in case this execution itself is the 
+   * main execution path.  */
+  Execution getProcessInstance();
+
+  /** the parent execution in the <a href="package-summary.html#basicexecutionstructure">execution 
+   * structure</a>.  Null will be returned in case this execution itself is the 
+   * main execution path. */ 
+  Execution getParent();
+
+  /** the child executions in the <a href="package-summary.html#basicexecutionstructure">execution 
+   * structure</a>.  Can be null and can be an empty collection. */ 
+  Collection<Execution> getExecutions();
+  
+  /** maps child execution names to execution objects.  In case multiple executions 
+   * have the same name, the first one is taken.  Can be null or can be an empty 
+   * map.  The first execution without a name is also included with null as the key.
+   */ 
+  Map<String, Execution> getExecutionsMap();
+  
+  /** the child execution for the given name or null in case such execution doesn't exist. */ 
+  Execution getExecution(String name);
+  
+  /** indicates if this execution has a child execution with the given executionName */
+  boolean hasExecution(String executionName);
+  
+  Execution findActiveExecutionIn(String activityName);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ExecutionService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,124 @@
+/*
+ * 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;
+
+import java.util.Map;
+import java.util.Set;
+
+
+/** manages runtime process executions.
+ *
+ * @author Tom Baeyens
+ */
+public interface ExecutionService {
+
+  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */
+  ProcessInstance startProcessInstanceById(String processDefinitionId);
+
+  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. 
+   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+   * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all 
+   *    process definition versions with the same name. */
+  ProcessInstance startProcessInstanceById(String processDefinitionId, String processInstanceKey);
+
+  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. 
+   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+   * @param variables are the initial values of the process variables that will be set before the execution starts. */
+  ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables);
+
+  /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid.
+   * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition.
+   * @param variables are the initial values of the process variables that will be set before the execution starts.
+   * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all 
+   *    process versions with the same name. */
+  ProcessInstance startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey);
+
+  /** starts a new process instance in the latest version of the given process definition.
+   * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */
+  ProcessInstance startProcessInstanceByKey(String processDefinitionKey);
+
+  /** starts a new process instance in the latest version of the given processDefinitionName.
+   * @param processDefinitionKey is the key of the process definition
+   *   for which the latest version will be taken.
+   * @param processInstanceKey is a user provided reference for the new process instance
+   *   that must be unique over all process versions with the same name. */
+  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey);
+
+  /** starts a new process instance in the latest version of the given processDefinitionName.
+   * @param processDefinitionKey is the key of the process definition
+   *   for which the latest version will be taken.
+   * @param variables are the initial values of the process variables that
+   *   will be set before the execution starts (read: before the initial
+   *   activity is executed). */
+  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables);
+
+  /** starts a new process instance in the latest version of the given processDefinitionName.
+   * @param processDefinitionKey is the key of the process definition for which the latest version will be taken.
+   * @param variables are the initial values of the process variables that will be set before the execution starts.
+   * @param processInstanceKey is a user provided reference for the new execution that must be unique over all
+   *    process versions with the same name. */
+  ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey);
+
+  /** the path of execution that is uniquely defined by the execution id. */
+  Execution findExecutionById(String executionId);
+
+  /** the process instance that is uniquely defined by the process execution id. */
+  ProcessInstance findProcessInstanceById(String processInstanceId);
+
+  /** provides an external trigger to an execution. */
+  ProcessInstance signalExecutionById(String executionId);
+
+  /** provides a named external trigger to an execution. */
+  ProcessInstance signalExecutionById(String executionId, String signalName);
+
+  /** provides a named external trigger to an execution with parameters. */
+  ProcessInstance signalExecutionById(String executionId, String signalName, Map<String, Object> parameters);
+
+  /** provides a external trigger to an execution with parameters. */
+  ProcessInstance signalExecutionById(String executionId, Map<String, Object> parameters);
+
+
+  /** search for process instances with criteria */
+  ProcessInstanceQuery createProcessInstanceQuery();
+
+  /** creates or overwrites a variable value on the referenced execution */
+  void setVariable(String executionId, String name, Object value);
+
+  /** creates or overwrites the variable values on the referenced execution */
+  void setVariables(String executionId, Map<String, Object> variables);
+
+  /** retrieves a variable */
+  Object getVariable(String executionId, String variableName);
+
+  /** all the variables visible in the given execution scope */
+  Set<String> getVariableNames(String executionId);
+
+  /** retrieves a map of variables */
+  Map<String, Object> getVariables(String executionId, Set<String> variableNames);
+  
+  /** end a process instance */
+  void endProcessInstance(String processInstanceId, String state);
+
+  /** delete a process instance */
+  void deleteProcessInstance(String processInstanceId);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/HistoryService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import java.util.Map;
+
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
+
+
+/** exposes the history information for ongoing and past 
+ * process instances.
+ * 
+ * @author Tom Baeyens
+ */
+public interface HistoryService {
+
+  /** search for process instances in the history */
+  HistoryProcessInstanceQuery createHistoryProcessInstanceQuery();
+
+  /** search in history activity instance information */ 
+  HistoryActivityInstanceQuery createHistoryActivityInstanceQuery();
+
+  /** returns the average duration in milliseconds for each activity in the given process definition */
+  Map<String, Long> avgDurationPerActivity(String processDefinitionId);
+  
+  /** returns for each transitionName, the number of times that transition was taken */
+  Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/IdentityService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/IdentityService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,94 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface IdentityService {
+
+  /** create a new user */
+  void createUser(String userId, String password, String givenName, String familyName);
+  
+  /** lookup a user 
+   * @return the user or null if no such user exists */
+  User findUserById(String userId);
+
+  /** get all the users in the system.
+   * Returns an empty list if no users exist. */
+  List<User> findUsers();
+
+  /** delete the given user.  
+   * No effect (no exception) if the user does not exist. */
+  void deleteUser(String userId);
+
+  /** create a group new group 
+   * @return the generated id for this group. */
+  String createGroup(String string);
+
+  /** create a group new group 
+   * @return the generated id for this group. */
+  String createGroup(String string, String groupType);
+
+  /** create a group new group 
+   * @return the generated id for this group. */
+  String createGroup(String groupName, String groupType, String parentGroupId);
+
+  /** lookup a group.
+  * @return the user or null if no such user exists */
+  Group findGroupById(String groupId);
+  
+  /** groups of the given groupType for which the given user is a member.
+   * Returns an empty list if no such groups exist. */
+  List<Group> findGroupsByUserAndGroupType(String userId, String groupType);
+  
+  /** all group ids (String) for which this user is a member.
+   * Returns an empty list if no such groups exist. */
+  List<Group> findGroupsByUser(String userId);
+  
+  /** all group ids (String) for which this user is a member.
+   * Returns an empty list if no such groups exist. */
+  List<String> findGroupIdsByUser(String userId);
+  
+  /** deletes the given group.
+   * No effect (no exception) if the group does not exist. */
+  void deleteGroup(String groupId);
+
+  /** makes the given user a member of the given group with the given role.
+   * Role can be null. */
+  void createMembership(String string, String groupId);
+  
+  /** makes the given user a member of the given group with the given role.
+   * Role can be null. */
+  void createMembership(String userId, String groupId, String role);
+
+  /** makes the given user a member of the given group with the given role.
+   * Role can be null.  If no such membership exists, this method will 
+   * not throw an exception and have no effect. */
+  void deleteMembership(String userId, String groupId, String role);
+}
\ No newline at end of file


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/JbpmException.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+public class JbpmException extends RuntimeException {
+
+  private static final long serialVersionUID = 1L;
+
+  public JbpmException() {
+    super();
+  }
+  public JbpmException(String msg, Throwable cause) {
+    super(msg);
+    super.initCause(cause);
+  }
+  public JbpmException(String msg) {
+    super(msg);
+  }
+  public JbpmException(Throwable cause) {
+    super();
+    super.initCause(cause);
+  }
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.jbpm.api.job.Job;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface JobQuery {
+
+  JobQuery messages();
+  JobQuery timers();
+  
+  JobQuery processInstanceId(String processInstanceId);
+  
+  JobQuery exception();
+
+  JobQuery orderAsc(String property);
+  JobQuery orderDesc(String property);
+
+  JobQuery page(int firstResult, int maxResults);
+
+  List<Job> list();
+  Job uniqueResult();
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ManagementService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ManagementService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,44 @@
+/*
+ * 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;
+
+
+
+
+/** operations targeted to system operators that need to keep 
+ * the process engine up and running.  This functionality is typically 
+ * exposed through a management web console. 
+ * 
+ * @author Tom Baeyens
+ */
+public interface ManagementService {
+
+  /** resets the retry count, clears the exception and executes the job. 
+   * An exception is thrown out of this method in case the execution 
+   * of the job fails.  In case the async command executor is configured 
+   * for this service, failing job execution will not result into an 
+   * exception coming out of this method. */
+  void executeJob(long jobDbid);
+
+  /** search for jobs */
+  JobQuery createJobQuery();
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Problem.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface Problem {
+
+  public abstract Throwable getCause();
+
+  public abstract int getColumn();
+
+  public abstract int getLine();
+
+  public abstract String getMsg();
+
+  public abstract String getResource();
+
+  public abstract String getSeverity();
+
+}
\ No newline at end of file

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinition.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,54 @@
+/*
+ * 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;
+
+import java.io.Serializable;
+
+
+/** a graphical process which is deployed in the {@ ProcessService}.
+ * 
+ * @author Tom Baeyens
+ */
+public interface ProcessDefinition extends Serializable {
+
+  /** the short display name given to this process definition. 
+   * Multiple process definitions can have the same as long 
+   * as they are given a different {@link #version}.  */
+  String getName();
+
+  /** the user defined short representation of the name. Just 
+   * like the name, multiple versions of a process definition 
+   * can have the same key. */
+  String getKey();
+
+  /** the unique id for this process definition. */
+  String getId();
+
+  /** automatically assigned during deployment of a process that 
+   * represents the sequence number for process definitions with 
+   * the same {@link ObservableElement#getId() name}. */ 
+  int getVersion();
+  
+  /** references the deployment in which this process definition is
+   * deployed. */
+  long getDeploymentDbid();
+}


Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinition.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+import java.util.List;
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ProcessDefinitionQuery {
+
+  String PROPERTY_ID = "idProperty.stringValue";
+  String PROPERTY_KEY = "keyProperty.stringValue";
+  String PROPERTY_NAME = "idProperty.objectName";
+  String PROPERTY_VERSION = "versionProperty.longValue";
+  String PROPERTY_DEPLOYMENT_TIMESTAMP = "deployment.timestamp";
+
+  ProcessDefinitionQuery id(String id);
+  ProcessDefinitionQuery key(String key);
+  ProcessDefinitionQuery nameLike(String name);
+  ProcessDefinitionQuery name(String name);
+  ProcessDefinitionQuery deploymentDbid(long deploymentDbid);
+
+  ProcessDefinitionQuery orderAsc(String property);
+  ProcessDefinitionQuery orderDesc(String property);
+
+  ProcessDefinitionQuery page(int firstResult, int maxResults);
+  
+  List<ProcessDefinition> list();
+  ProcessDefinition uniqueResult();
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,65 @@
+/*
+ * 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;
+
+
+/** central starting point for all process engine API
+ * interactions. 
+ * 
+ * @author Tom Baeyens
+ */
+public interface ProcessEngine {
+
+  /** the {@link RepositoryService repository service} that provides access
+   * to the process repository. */ 
+  RepositoryService getRepositoryService();
+
+  /** the {@link ExecutionService execution service} that provides access
+   * to the runtime executions repository. */ 
+  ExecutionService getExecutionService();
+
+  /** the {@link HistoryService history service} that provides access
+   * to the history executions repository. */ 
+  HistoryService getHistoryService();
+
+  /** the {@link TaskService task service} that exposes the 
+   * runtime human task lists. */ 
+  TaskService getTaskService();
+
+  /** the {@link IdentityService identity service} that exposes the 
+   * user and group operations management operations. */ 
+  IdentityService getIdentityService();
+
+  /** the {@link ManagementService management service} that exposes the 
+   * management operations to operators that have to keep the jBPM system 
+   * up and running. */ 
+  ManagementService getManagementService();
+
+  /** retrieve and object defined in the process engine by type */
+  <T> T get(Class<T> type);
+
+  /** retrieve and object defined in the process engine by name */
+  Object get(String name);
+  
+  /** programmatically provide a hibernate session factory */
+  void setSessionFactory(Object sessionFactory);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstance.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+
+/** a process instance is one execution of a process definition.
+ * One process instance can have many concurrent executions.  
+ * Executions are structured in a tree of which the ProcessInstance 
+ * is the root.
+ * 
+ * @author Tom Baeyens
+ */
+public interface ProcessInstance extends Execution {
+}


Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstance.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessInstanceQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,45 @@
+/*
+ * 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;
+
+import java.util.List;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface ProcessInstanceQuery {
+  
+  String PROPERTY_KEY = "key";
+  
+  ProcessInstanceQuery processDefinitionId(String processDefinitionId);
+
+  ProcessInstanceQuery processInstanceId(String processInstanceId);
+
+  ProcessInstanceQuery orderAsc(String property);
+  ProcessInstanceQuery orderDesc(String property);
+
+  ProcessInstanceQuery page(int firstResult, int maxResults);
+
+  List<Execution> list();
+  Execution uniqueResult();
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,59 @@
+/*
+ * 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;
+
+import java.util.List;
+
+
+/** a process definition repository.
+ * 
+ * @author Tom Baeyens
+ */
+public interface ProcessService {
+  
+  /** start a deployment */
+  Deployment createDeployment();
+
+  /** all deployed process definition keys. */
+  List<String> findProcessDefinitionKeys();
+
+  /** all versions of the given process. 
+   * @return the process definitions in descending version order.  So you get the 
+   * highest version number as the first. */
+  List<ProcessDefinition> findProcessDefinitionsByKey(String processDefinitionKey);
+
+  /** latest version of the processDefinition with the given key. */
+  ProcessDefinition findLatestProcessDefinitionByKey(String processDefinitionKey);
+
+  /** specific version of a named processDefinition. */
+  ProcessDefinition findProcessDefinitionById(String processDefinitionId);
+  
+  /** search for process definitions */
+  ProcessDefinitionQuery createProcessDefinitionQuery();
+
+  /** deletes process definition if there are no existing executions. 
+   * @throws JbpmException if there are existing executions or history. */
+  void deleteProcessDefinition(String processDefinitionId);
+
+  /** deletes process definition, the existing executions and the history. */
+  void deleteProcessDefinitionCascade(String processDefinitionId);
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/RepositoryService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/RepositoryService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+import java.io.InputStream;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public interface RepositoryService {
+
+  Deployment createDeployment();
+
+  void deleteDeployment(long deploymentDbid);
+  void deleteDeploymentCascade(long deploymentDbid);
+
+  InputStream getResourceAsStream(long deploymentDbid, String resourceName);
+
+  ProcessDefinitionQuery createProcessDefinitionQuery();
+
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,58 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.jbpm.api.task.Task;
+
+
+/**
+ * @author Tom Baeyens
+ * @author Heiko Braun <heiko.braun at jboss.com>
+ */
+public interface TaskQuery {
+  
+  public static final String PROPERTY_NAME = "name";
+  public static final String PROPERTY_ASSIGNEE = "assignee";
+  public static final String PROPERTY_CREATEDATE = "create";
+  public static final String PROPERTY_DUEDATE = "dueDate";
+  public static final String PROPERTY_PRIORITY = "priority";
+  public static final String PROPERTY_PROGRESS = "progress";
+
+  /** only find tasks for which the given user is the assignee */
+  TaskQuery assignee(String userId);
+  
+  /** query for tasks that are unassigned.
+   * These tasks can still potentially have candidates. */
+  TaskQuery unassigned();
+
+  /** only query for tasks that are takable by the given user. */
+  TaskQuery takableBy(String userId);
+
+  TaskQuery page(int firstResult, int maxResults);
+  TaskQuery orderAsc(String property);
+  TaskQuery orderDesc(String property);
+  
+  List<Task> list();
+  Task uniqueResult();
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,171 @@
+/*
+ * 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;
+
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Human task management facility.
+ * @author Alejandro Guizar
+ * @author Heiko Braun <heiko.braun at jboss.com>
+ */
+public interface TaskService {
+
+  /** Creates a task.
+   * The returned task will be transient.
+   * Use {@link #saveTask(Task)} to persist the task. Only 
+   * after the invocation of {@link #saveTask(Task)}, the 
+   * {@link Task#getDbid()} property will be initialized. */
+  Task newTask();
+
+  /** Creates a new subtask for the given task.
+   * Make sure that the parent task is saved before the 
+   * {@link Task#getDbid() dbid} is taken.
+   * The returned task will be transient.
+   * Use {@link #saveTask(Task)} to persist the task. */
+  Task newTask(long parentTaskDbid);
+
+  /** Saves the given task to persistent storage. 
+   * @return the taskDbid */
+  long saveTask(Task task);
+
+  /** Retrieves the task with the given identifier from persistent storage. 
+   * If no task with the given identifier exists, 
+   * the call returns <code>null</code>. */
+  Task getTask(long taskDbid);
+
+  /** assigns this task to the given assignee. */
+  void assignTask(long taskDbid, String userId);
+
+  /** taking this task will prevent all other candidates from 
+   * taking and working on this task. 
+   * @throws JbpmException if this task already has been taken. */
+  void takeTask(long taskDbid, String userId);
+
+  /** Deletes this task, marks the related history task as completed.
+   * If the task was created in the context 
+   * of a process execution, this operation may result in a process instance 
+   * being triggered. */
+  void completeTask(long taskDbid);
+  
+  /** Deletes this task, marks the related history task as completed 
+   * with the specified outcome.  If the task was created in the context 
+   * of a process execution, this operation may result in a process instance 
+   * being triggered. The outcome in that case corresponds to an outgoing 
+   * transition in the process. */
+  void completeTask(long taskDbid, String outcome);
+
+  /** Deletes the task.
+   * If this task was created in the context of a process execution, one 
+   * of three things might happen depending on configurations of the task 
+   * in the process definition: 
+   * a) process executions resumes 
+   * b) whole process execution is cancelled as well.
+   * c) exception is thrown */
+  void cancelTask(long taskDbid);
+
+  /** Deletes the task providing an indication of the reason.  Example reasons 
+   * could be: "failed", "error", "exited", "obsolete" or "deleted". 
+   * If this task was created in the context of a process execution, one 
+   * of three things might happen depending on configurations of the task 
+   * in the process definition: 
+   * a) process executions resumes 
+   * b) whole process execution is cancelled as well.
+   * c) exception is thrown */
+  void cancelTask(long taskDbid, String reason);
+
+  /** add a role to a given task.
+   * @param participation specifies the kind of involvement of the participatingUser
+   * in this task. see {@link Participation} for default constants. */
+  void addTaskParticipatingUser(long taskDbid, String userId, String participationType);
+    
+  /** add a role to a given task.
+   * @param participation specifies the kind of involvement of the participatingUser
+   * in this task. see {@link Participation} for default constants. */
+  void addTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
+    
+  /** get roles related to a given task. */
+  List<Participation> getTaskParticipations(long taskDbid);
+  
+  /** removes a role to a given task.  Nothing happens (no exception) if 
+   * the role does not exist.
+   * @param participation specifies the kind of involvement of the participatingUser
+   * in this task. see {@link Participation} for default constants. */
+  void removeTaskParticipatingUser(long taskDbid, String userId, String participationType);
+  
+  /** removes a role to a given task.  Nothing happens (no exception) if 
+   * the role does not exist.
+   * @param participation specifies the kind of involvement of the participatingUser
+   * in this task. see {@link Participation} for default constants. */
+  void removeTaskParticipatingGroup(long taskDbid, String groupId, String participationType);
+
+  /** create a new query for tasks */
+  TaskQuery createTaskQuery();
+
+  /** list of tasks that are assigned to the given user. 
+   * Returns an empty list in case no such tasks exist. */
+  List<Task> findAssignedTasks(String userId);
+
+  /** list of tasks that can be taken by the given user.
+   * Returns an empty list in case no such tasks exist. */
+  List<Task> findTakableTasks(String userId);
+
+  /** get the subtasks for this task.  Only goes one level deep at a time. */
+  List<Task> getSubTasks(long taskDbid);
+
+  /** add a comment to a task */
+  Comment addTaskComment(long taskDbid, String message);
+
+  /** get the list of comments made to a task.  this will 
+   * fetch all the comments and recursively all replies to those 
+   * comments. */
+  List<Comment> getTaskComments(long taskDbid);
+
+  /** add a reply to another comment */
+  Comment addReplyComment(long commentDbid, String message);
+
+  /** delete a comment.
+   * this will recursively delete all replies to this comment. */
+  void deleteComment(long commentDbid);
+
+  /** creates or overwrites a variable value on the given task */
+  void setVariable(long taskDbid, String name, Object value);
+
+  /** creates or overwrites the variable values on the given task */
+  void setVariables(long taskDbid, Map<String, Object> variables);
+
+  /** retrieves a variable */
+  Object getVariable(long taskDbid, String variableName);
+
+  /** all the variables visible in the given task */
+  Set<String> getVariableNames(long taskDbid);
+
+  /** retrieves a map of variables */
+  Map<String, Object> getVariables(long taskDbid, Set<String> variableNames);
+
+}


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

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityBehaviour.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.activity;
+package org.jbpm.api.activity;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ActivityExecution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,19 +19,19 @@
  * 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.activity;
+package org.jbpm.api.activity;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Activity;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.task.Task;
 
 
 /** view upon an {@link Execution path of execution} exposed to 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivityBehaviour.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/activity/ExternalActivityBehaviour.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
  * 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.activity;
+package org.jbpm.api.activity;
 
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 
 
 /** extends {@link ActivityBehaviour} for handling external triggers after a wait state.

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/client)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientExecution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,15 +19,15 @@
  * 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.client;
+package org.jbpm.api.client;
 
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.model.OpenExecution;
+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.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,10 +19,10 @@
  * 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.client;
+package org.jbpm.api.client;
 
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.OpenProcessDefinition;
 
 
 /** adds factory methods for creating and beginning new process instances.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ClientProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.client;
+package org.jbpm.api.client;
 
-import org.jbpm.model.OpenProcessInstance;
+import org.jbpm.api.model.OpenProcessInstance;
 
 
 /**

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,8 +1,8 @@
-package org.jbpm.cmd;
+package org.jbpm.api.cmd;
 
 import java.io.Serializable;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 
 public interface Command<T> extends Serializable {
   

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/CommandService.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/CommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
-package org.jbpm.cmd;
+package org.jbpm.api.cmd;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * abstract extensible session facade.  Developers can use this directly or 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/env)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.env;
+package org.jbpm.api.env;
 
 import java.util.Set;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
  * 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.env;
+package org.jbpm.api.env;
 
 import java.io.Serializable;
 import java.util.Stack;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.env;
+package org.jbpm.api.env;
 
 import java.io.InputStream;
 import java.io.Serializable;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.env;
+package org.jbpm.api.env;
 
 import javax.transaction.Synchronization;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/WireObject.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.env;
+package org.jbpm.api.env;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 
 /**

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/history)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.history;
+package org.jbpm.api.history;
 
 import java.util.Date;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
  * 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.history;
+package org.jbpm.api.history;
 
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.history;
+package org.jbpm.api.history;
 
 import java.util.Date;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.history;
+package org.jbpm.api.history;
 
 import java.util.List;
 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/Group.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/Group.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.identity;
+package org.jbpm.api.identity;
 
 
 /** a group.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/identity/User.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/identity/User.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.identity;
+package org.jbpm.api.identity;
 
 
 /** a user

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/job)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Job.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Job.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
  * 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.job;
+package org.jbpm.api.job;
 
 import java.util.Date;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 
 /** base class for timers and messages.
  * 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Message.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Message.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.job;
+package org.jbpm.api.job;
 
 /** an asynchronous message.
  * 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/Timer.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/job/Timer.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.job;
+package org.jbpm.api.job;
 
 
 /** a timer.

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/jpdl/DecisionHandler.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/jpdl/DecisionHandler.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.jpdl;
+package org.jbpm.api.jpdl;
 
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
 
 
 /**

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListener.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.listener;
+package org.jbpm.api.listener;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,14 +19,14 @@
  * 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.listener;
+package org.jbpm.api.listener;
 
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
 
 
 /** view upon an {@link Execution path of execution} exposed to 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/model)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Comment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,12 +19,12 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 
 /** a free text comment that can be made to an {@link Execution} 
  * or a task.  

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/CompositeElement.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.List;
 import java.util.Map;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Condition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Discussable.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.List;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 
 /** event constants.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/ObservableElement.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.Set;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenExecution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,15 +19,15 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.job.Timer;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Timer;
 
 
 /** execution that opens up access to the related 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.model;
+package org.jbpm.api.model;
 
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.ProcessDefinition;
 
 
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessInstance.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/OpenProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.model;
+package org.jbpm.api.model;
 
-import org.jbpm.ProcessInstance;
+import org.jbpm.api.ProcessInstance;
 
 public interface OpenProcessInstance extends OpenExecution, ProcessInstance {
 }

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Transition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.model;
+package org.jbpm.api.model;
 
 import java.util.Set;
 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html	2009-04-16 19:28:20 UTC (rev 4570)
@@ -0,0 +1,5 @@
+<body>the primary facade interfaces to 
+{@link org.jbpm.pvm.ProcessService the process repository}, 
+{@link org.jbpm.pvm.ExecutionService the execution repository} 
+and {@link org.jbpm.pvm.ManagementService the management functionalities}.
+</body>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/package.html
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/session)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/DbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.session;
+package org.jbpm.api.session;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/MessageSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.session;
+package org.jbpm.api.session;
 
-import org.jbpm.job.Message;
+import org.jbpm.api.job.Message;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/PvmDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,16 +19,16 @@
  * 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.session;
+package org.jbpm.api.session;
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.job.Job;
-import org.jbpm.job.Message;
-import org.jbpm.job.Timer;
+import org.jbpm.api.Execution;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.job.Timer;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/RepositorySession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/RepositorySession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,13 +19,13 @@
  * 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.session;
+package org.jbpm.api.session;
 
 import java.io.InputStream;
 
-import org.jbpm.Deployment;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.client.ClientProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TaskDbSession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TaskDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,10 +19,10 @@
  * 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.session;
+package org.jbpm.api.session;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 
 /** 
  * Persistence interface for tasks.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/session/TimerSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.session;
+package org.jbpm.api.session;
 
-import org.jbpm.job.Timer;
+import org.jbpm.api.job.Timer;
 
 /**
  * @author Tom Baeyens, Pascal Verdage

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task (from rev 4568, jbpm4/trunk/modules/api/src/main/java/org/jbpm/task)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Assignable.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Assignable.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/AssignmentHandler.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/AssignmentHandler.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,11 +19,11 @@
  * 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.task;
+package org.jbpm.api.task;
 
 import java.io.Serializable;
 
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
 
 
 /** interface to delegate {@link Task} or {@link Swimlane} assignment.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/GroupRef.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/GroupRef.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/IdentityRef.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/IdentityRef.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,19 +19,19 @@
  * 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.task;
+package org.jbpm.api.task;
 
 import java.io.Serializable;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 
 /**
  * references an identity. usally a user or group.
  *
- * @see org.jbpm.task.UserRef
- * @see org.jbpm.task.GroupRef
- * @see org.jbpm.task.Participation
+ * @see org.jbpm.api.task.UserRef
+ * @see org.jbpm.api.task.GroupRef
+ * @see org.jbpm.api.task.Participation
  *
  * @author Tom Baeyens
  * @author Heiko Braun

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/OpenTask.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/OpenTask.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,9 +19,9 @@
  * 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.task;
+package org.jbpm.api.task;
 
-import org.jbpm.client.ClientExecution;
+import org.jbpm.api.client.ClientExecution;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Participation.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Participation.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Swimlane.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Swimlane.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/Task.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/TaskDefinition.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/TaskHandler.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/TaskHandler.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 
 /** for advanced task customization.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/UserRef.java	2009-04-16 16:28:23 UTC (rev 4568)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/UserRef.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -19,7 +19,7 @@
  * 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.task;
+package org.jbpm.api.task;
 
 
 

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/package.html	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,5 +0,0 @@
-<body>the primary facade interfaces to 
-{@link org.jbpm.pvm.ProcessService the process repository}, 
-{@link org.jbpm.pvm.ExecutionService the execution repository} 
-and {@link org.jbpm.pvm.ManagementService the management functionalities}.
-</body>
\ No newline at end of file

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -32,12 +32,12 @@
 import javax.transaction.UserTransaction;
 import javax.transaction.SystemException;
 
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+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;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -40,9 +40,9 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.job.Job;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import javax.ejb.CreateException;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
 import javax.ejb.FinderException;
 import javax.ejb.RemoveException;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.TimerSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.TimerSession;
 
 /**
  * Timer session based on the EJB 2.1 timer service.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.Date;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.enterprise.internal.ejb;
 
-import org.jbpm.cmd.Command;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.rmi.RemoteException;
 
-import org.jbpm.cmd.Command;
+import org.jbpm.api.cmd.Command;
 
 /**
  * EJB2 remote interface for the command executor.

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
 import org.jbpm.pvm.internal.job.TimerImpl;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.sql.SQLException;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.DbSession;
 
 /**
  * @author Alejandro Guizar

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
 import org.jbpm.pvm.internal.job.TimerImpl;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.model.CommentImpl;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 
 /**
  * @author Alejandro Guizar

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -37,7 +37,7 @@
 
 import org.apache.cactus.ServletTestCase;
 
-import org.jbpm.cmd.Command;
+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;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,20 +27,20 @@
 
 import junit.framework.Test;
 
-import org.jbpm.ExecutionService;
-import org.jbpm.RepositoryService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+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.api.session.DbSession;
+import org.jbpm.api.session.TimerSession;
 import org.jbpm.enterprise.internal.custom.HappyListener;
 import org.jbpm.enterprise.internal.custom.WaitState;
-import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.TimerSession;
 import org.jbpm.test.enterprise.EnvironmentServletTestCase;
 import org.jbpm.test.enterprise.IntegrationTestSetup;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,23 +28,23 @@
 
 import junit.framework.Test;
 
-import org.jbpm.Execution;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessService;
-import org.jbpm.RepositoryService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessService;
+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.api.session.DbSession;
 import org.jbpm.enterprise.internal.custom.HappyListener;
 import org.jbpm.enterprise.internal.custom.NoisyListener;
 import org.jbpm.enterprise.internal.custom.WaitState;
-import org.jbpm.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
 import org.jbpm.test.enterprise.EnvironmentServletTestCase;
 import org.jbpm.test.enterprise.IntegrationTestSetup;
 

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.test.deployer;
 
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessEngine;
-import org.jbpm.ProcessService;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.RepositoryService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.RepositoryService;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 import java.util.Map;
 
 import org.apache.cactus.ServletTestCase;
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.internal.log.Log;
 
 /**

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessInstance;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/conditions/DecisionConditionsTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/expression/DecisionExpressionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/ContentEvaluation.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.examples.decision.handler;
 
-import org.jbpm.jpdl.DecisionHandler;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.jpdl.DecisionHandler;
+import org.jbpm.api.model.OpenExecution;
 
 public class ContentEvaluation implements DecisionHandler {
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/decision/handler/DecisionHandlerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.end.multiple;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.end.processinstance;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.end.state;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,7 +30,7 @@
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
 
 
 public class LogListener implements EventListener {

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.java;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.examples.script.text.Person;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/services/ServicesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,13 +2,13 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.Configuration;
-import org.jbpm.ExecutionService;
-import org.jbpm.HistoryService;
-import org.jbpm.ManagementService;
-import org.jbpm.ProcessEngine;
-import org.jbpm.RepositoryService;
-import org.jbpm.TaskService;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.ManagementService;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.TaskService;
 import org.jbpm.test.JbpmTestCase;
 
 /** shows explicitely the part of the API that is  

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.state.choice;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.examples.state.sequence;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/AssignTask.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.examples.task.assignmenthandler;
 
-import org.jbpm.model.OpenExecution;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.AssignmentHandler;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.AssignmentHandler;
 
 
 /**

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.UserRef;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.job.Job;
+import org.jbpm.api.Execution;
+import org.jbpm.api.job.Job;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.integration.console;
 
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
 
 import javax.naming.InitialContext;
 

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,14 +31,14 @@
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,15 +28,15 @@
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.server.integration.ProcessManagement;
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstanceQuery;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.RepositoryService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessInstanceQuery;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.model.OpenExecution;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,11 +26,11 @@
 
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.server.integration.TaskManagement;
-import org.jbpm.IdentityService;
-import org.jbpm.TaskService;
-import org.jbpm.task.GroupRef;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.task.GroupRef;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
-import org.jbpm.RepositoryService;
+import org.jbpm.api.RepositoryService;
 import org.jbpm.internal.log.Log;
 
 /**

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.integration.spi;
 
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ProcessEngine;
 import org.jbpm.integration.spi.mgmt.ServerConfig;
 import org.jbpm.internal.log.Log;
 

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineObjectFactory.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.integration.spi;
 
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
 
 import javax.naming.Context;
 import javax.naming.Name;
@@ -31,7 +31,7 @@
 import java.util.Hashtable;
 
 /**
- * Constructs a {@link org.jbpm.ProcessEngine} on the JNDI client side.
+ * Constructs a {@link org.jbpm.api.ProcessEngine} on the JNDI client side.
  * 
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/ProcessEngineReference.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.integration.spi;
 
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.ProcessEngine;
 
 import javax.naming.Referenceable;
 import javax.naming.Reference;
@@ -29,7 +29,7 @@
 import javax.naming.StringRefAddr;
 
 /**
- * Stored in JNDI. Will be used to reference a {@link org.jbpm.ProcessEngine}
+ * Stored in JNDI. Will be used to reference a {@link org.jbpm.api.ProcessEngine}
  * when the {@link org.jbpm.integration.spi.ProcessEngineObjectFactory} is invoked.
  * 
  * @author Heiko.Braun <heiko.braun at jboss.com>

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionConditionActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Condition;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Transition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionExpressionActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.env.EnvironmentDefaults;
 import org.jbpm.pvm.internal.script.ScriptManager;
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.jpdl.DecisionHandler;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.jpdl.DecisionHandler;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.OpenExecution;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jbpm.api.model.OpenExecution;
 import org.jbpm.internal.log.Log;
-import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.internal.model.ExpressionEvaluator;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
-import org.jbpm.listener.EventListener;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenExecution;
 import org.jbpm.internal.log.Log;
-import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityBehaviour;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlAutomaticActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,9 +1,9 @@
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.OpenExecution;
 
 
 public abstract class JpdlAutomaticActivity extends JpdlActivity implements EventListener {

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
+import org.jbpm.api.model.Event;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.jpdl.internal.xml.UnresolvedTransitions;
-import org.jbpm.model.Event;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.pvm.internal.model.TransitionImpl;
 import org.jbpm.pvm.internal.util.TagBinding;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlExternalActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.script.ScriptManager;
 
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityExecution;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StateActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,16 +23,16 @@
 
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.TaskHandler;
 import org.jbpm.jpdl.internal.model.JpdlExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.TaskHandler;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,11 @@
 import java.util.StringTokenizer;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.AssignmentHandler;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;
@@ -39,9 +42,6 @@
 import org.jbpm.pvm.internal.task.TaskImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.AssignmentHandler;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,10 @@
 import java.io.InputStream;
 import java.util.List;
 
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.env.Environment;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
 import org.jbpm.internal.log.Log;
 import org.jbpm.jpdl.internal.model.JpdlProcessDefinition;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
@@ -34,7 +35,6 @@
 import org.jbpm.pvm.internal.repository.Deployer;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.session.RepositorySession;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,12 +30,12 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.env.Environment;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.internal.log.Log;
 import org.jbpm.jpdl.internal.activity.JpdlBinding;
 import org.jbpm.jpdl.internal.model.JpdlProcessDefinition;
-import org.jbpm.listener.EventListener;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.ObservableElementImpl;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl;
 
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.internal.log.Log;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Problem;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.pvm.internal.model.CompositeElementImpl;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.ActivityImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.wire.Descriptor;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.wire.Descriptor;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.model.ExceptionHandlerImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
-import org.jbpm.model.Event;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.model.TransitionImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.builder;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.EventListenerReference;
 import org.jbpm.pvm.internal.model.ObservableElementImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/TimerBuilder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.Date;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 import org.jbpm.pvm.internal.model.TimerDefinitionImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * represents a time duration.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,19 +27,19 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.Configuration;
-import org.jbpm.ExecutionService;
-import org.jbpm.HistoryService;
-import org.jbpm.IdentityService;
-import org.jbpm.ManagementService;
-import org.jbpm.ProcessEngine;
-import org.jbpm.ProcessService;
-import org.jbpm.RepositoryService;
-import org.jbpm.TaskService;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.ManagementService;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.WireObject;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.env.PvmEnvironment;
 import org.jbpm.pvm.internal.env.JbpmConfigurationParser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.WireObject;
 import org.jbpm.pvm.internal.spring.SpringEnvironment;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.springframework.context.ApplicationContext;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.WireObject;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,10 +22,10 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.task.IdentityRef;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.IdentityRef;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+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.api.session.DbSession;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.DbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.task.Assignable;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.DbSession;
-import org.jbpm.task.Assignable;
 
 /**
  * @author Alejandro Guizar

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 
 
 /** container for executing multiple commands in one transaction. 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.RepositorySession;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 import org.jbpm.pvm.internal.repository.RepositoryCache;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.RepositorySession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 import org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding;
-import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
-import org.jbpm.session.RepositorySession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.session.PvmDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
 
 import java.util.Date;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+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.api.job.Job;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.jobexecutor.JobExceptionHandler;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.ProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.task.Participation;
 import org.jbpm.pvm.internal.task.ParticipationImpl;
-import org.jbpm.task.Participation;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.io.InputStream;
 
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.RepositorySession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+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;
-import org.jbpm.task.Task;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
 
 /**
  * @author Alejandro Guizar

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
 
 import java.util.Set;
 
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.TaskDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,12 +25,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
-import org.jbpm.session.TaskDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
+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/RemoveParticipantCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.Set;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.task.ParticipationImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
 
 /**
  * @author Alejandro Guizar

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Message;
-import org.jbpm.session.MessageSession;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.MessageSession;
 
 /** sends a given message to the configured message service.
  * 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.TaskDbSession;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.TaskDbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+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.api.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
 import java.util.Map;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+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.api.session.RepositorySession;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,13 +24,13 @@
 import java.util.Map;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessInstance;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
-import org.jbpm.session.RepositorySession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinitionQuery;
+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.api.session.RepositorySession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.env;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.script.ScriptManager;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.env.Context;
+import org.jbpm.api.Execution;
+import org.jbpm.api.env.Context;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 public class ExecutionContext implements Context {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.env;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.env;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.stream.StreamInput;
 import org.jbpm.pvm.internal.util.XmlUtil;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 public class JobContext implements Context {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.env;
 
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.util.Closable;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -32,7 +32,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.type.ImmutableType;
 import org.hibernate.usertype.ParameterizedType;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.type.Converter;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -11,7 +11,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.usertype.UserType;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ActivityImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.Session;
-import org.jbpm.session.DbSession;
+import org.jbpm.api.session.DbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.util.Clock;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,22 +25,22 @@
 
 import org.hibernate.Query;
 import org.hibernate.metadata.ClassMetadata;
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.history.HistoryProcessInstance;
+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.history.HistoryProcessInstance;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.PvmDbSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Job;
-import org.jbpm.job.Message;
-import org.jbpm.job.Timer;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
 import org.jbpm.pvm.internal.svc.DefaultCommandService;
 import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
 import java.io.Serializable;
 
 import org.hibernate.Query;
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Task;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.task.LifeCycle;
 import org.jbpm.pvm.internal.task.SwimlaneImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
 import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Task;
 
 /**
  * @author Alejandro Guizar

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.history.events;
 
 import org.hibernate.Session;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.util.Clock;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.history.events;
 
 import org.hibernate.Session;
-import org.jbpm.env.Environment;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/AutomaticEnd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.history.events;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.history.model.HistoryAutomaticInstanceImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/DecisionEnd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.history.events;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.history.model.HistoryDecisionInstanceImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.history.events;
 
 import org.hibernate.Session;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 import org.jbpm.pvm.internal.util.Clock;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.io.Serializable;
 
 import org.hibernate.Session;
-import org.jbpm.env.Environment;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskStart.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.history.events;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.task.Task;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl;
-import org.jbpm.task.Task;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.jbpm.history.HistoryActivityInstance;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryActivityInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryAutomaticInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.history.model;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.util.Clock;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDecisionInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.history.model;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.Date;
 import java.util.Set;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.internal.util.Clock;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.history.model;
 
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroup.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembership.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUser.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroup.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembership.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUser.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroup.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroups.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUser.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.identity.cmd;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.User;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.User;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsers.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.User;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.User;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.identity.Group;
+import org.jbpm.api.identity.Group;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionResource.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import org.jboss.identity.idm.api.IdentitySession;
 import org.jboss.identity.idm.api.Transaction;
 import org.jboss.identity.idm.exception.IdentityException;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.tx.StandardResource;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -39,10 +39,10 @@
 import org.jboss.identity.idm.impl.api.SimpleAttribute;
 import org.jboss.identity.idm.impl.api.model.SimpleGroupType;
 import org.jboss.identity.idm.p3p.P3PConstants;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import org.jboss.identity.idm.exception.IdentityException;
 import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl;
 import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.identity.impl;
 
-import org.jbpm.identity.User;
-import org.jbpm.identity.Group;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.identity.User;
+import org.jbpm.api.identity.User;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/spi/IdentitySession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.jbpm.JbpmException;
-import org.jbpm.job.Message;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
 
 /** message service implementation based on JMS.
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.job;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,8 +3,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.job.Job;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.job.Job;
 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/job/MessageImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.job;
 
-import org.jbpm.JbpmException;
-import org.jbpm.job.Message;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.job.Message;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.model.ObservableElement;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
-import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.internal.cal.BusinessCalendar;
 import org.jbpm.pvm.internal.cal.Duration;
 import org.jbpm.pvm.internal.env.JobContext;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.job.JobImpl;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
 
 /** this thread is responsible for acquiring jobs in the job that need to be 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Date;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.job.JobImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,10 +2,10 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
 import org.jbpm.pvm.internal.job.JobImpl;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
 
 /** internal interface used by the job executor and the 
  * implementations of {@link MessageSession} and {@link TimerSession}.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,11 +27,11 @@
 import javax.transaction.Synchronization;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+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.job.JobImpl;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -30,9 +30,9 @@
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,14 +21,14 @@
  */
 package org.jbpm.pvm.internal.jobexecutor;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Message;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Message;
 import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,9 +29,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -13,12 +13,12 @@
  **/
 package org.jbpm.pvm.internal.jobexecutor;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.TimerSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.session.TimerSession;
 
 /**
  * Timers created with this service are committed at the end of the transaction,

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.sql.SQLException;
 
 import org.hibernate.Hibernate;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 public class BlobStrategyBlob implements BlobStrategy {
   

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.sql.SQLException;
 
 import org.hibernate.Hibernate;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 public class ClobStrategyClob implements ClobStrategy {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Transition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.wire.Descriptor;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
 import org.jbpm.pvm.internal.task.TaskImpl;
 import org.jbpm.pvm.internal.util.Clock;
 import org.jbpm.pvm.internal.util.EqualsUtil;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.model.CompositeElement;
-import org.jbpm.model.Activity;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.CompositeElement;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.model;
 
 import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.listener.EventListener;
-import org.jbpm.model.Event;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.wire.Descriptor;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.listener.EventListener;
+import org.jbpm.api.listener.EventListener;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
 import java.util.List;
 
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+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.listener.EventListener;
-import org.jbpm.model.OpenProcessDefinition;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,13 +24,13 @@
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
-import org.jbpm.session.DbSession;
+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.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -34,23 +34,25 @@
 import java.util.Queue;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+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.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.session.MessageSession;
+import org.jbpm.api.session.RepositorySession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Comment;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.history.HistoryEvent;
 import org.jbpm.pvm.internal.history.HistorySession;
 import org.jbpm.pvm.internal.history.events.ActivityEnd;
@@ -69,8 +71,6 @@
 import org.jbpm.pvm.internal.model.op.TakeTransition;
 import org.jbpm.pvm.internal.util.EqualsUtil;
 import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.session.MessageSession;
-import org.jbpm.session.RepositorySession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionEvaluator.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.model.Condition;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.OpenExecution;
 import org.jbpm.pvm.internal.env.EnvironmentDefaults;
 import org.jbpm.pvm.internal.script.ScriptManager;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
 
 
 /** observable and visible process elements.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,12 +27,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.env.Environment;
+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.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.lob.Lob;
 import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
 import org.jbpm.pvm.internal.util.IoUtil;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessInstanceEndedSynchronization.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,11 +27,11 @@
 import javax.transaction.Synchronization;
 
 import org.hibernate.Session;
-import org.jbpm.ExecutionService;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jbpm.model.Activity;
+import org.jbpm.api.model.Activity;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,11 +31,12 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.job.Timer;
+import org.jbpm.api.session.TimerSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.job.Timer;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.type.Converter;
 import org.jbpm.pvm.internal.type.Type;
@@ -43,7 +44,6 @@
 import org.jbpm.pvm.internal.type.Variable;
 import org.jbpm.pvm.internal.type.variable.NullVariable;
 import org.jbpm.pvm.internal.type.variable.UnpersistableVariable;
-import org.jbpm.session.TimerSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.model.Condition;
-import org.jbpm.model.Event;
-import org.jbpm.model.Transition;
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityBehaviour;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jbpm.api.model.Condition;
+import org.jbpm.api.model.Event;
 import org.jbpm.internal.log.Log;
-import org.jbpm.model.Condition;
-import org.jbpm.model.Event;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ActivityImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.history.HistoryActivityInstance;
-import org.jbpm.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.history.HistoryActivityInstance;
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.history.HistoryProcessInstance;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
 import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.JobQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.job.Job;
+import org.jbpm.api.JobQuery;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.job.Job;
 import org.jbpm.pvm.internal.job.JobImpl;
 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/query/ProcessDefinitionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 import org.jbpm.pvm.internal.repository.DeploymentProperty;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.Execution;
-import org.jbpm.ProcessInstanceQuery;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessInstanceQuery;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentClassLoader.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.util.IoUtil;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -33,10 +33,10 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.jbpm.Deployment;
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.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/DeploymentProperty.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositoryServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.io.InputStream;
 
-import org.jbpm.Deployment;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.RepositoryService;
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.RepositoryService;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.pvm.internal.cmd.DeleteDeploymentCmd;
 import org.jbpm.pvm.internal.cmd.GetResourceAsStreamCmd;
 import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,14 +25,14 @@
 import java.util.ArrayList;
 
 import org.hibernate.Session;
-import org.jbpm.Deployment;
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.Deployment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.session.RepositorySession;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
-import org.jbpm.session.RepositorySession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,8 +27,8 @@
 
 import javax.script.Bindings;
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.env.ExecutionContext;
 import org.jbpm.pvm.internal.env.ExecutionEnvironment;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.spring;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,10 +22,10 @@
 package org.jbpm.pvm.internal.spring;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+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.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 import org.springframework.transaction.support.TransactionTemplate;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.spring;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.SpringConfiguration;
 import org.jbpm.pvm.internal.env.BasicEnvironment;
 import org.springframework.context.ApplicationContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamInput.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 import java.io.Serializable;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamInput.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamInput.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.InputStream;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.InputStream;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamInput.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 import java.net.URL;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.WireObject;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.WireObject;
 import org.jbpm.pvm.internal.cmd.AbstractCommand;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.session.MessageSession;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 
 /** 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+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;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.WireObject;
+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;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.ExecutionService;
-import org.jbpm.ProcessInstance;
-import org.jbpm.ProcessInstanceQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.ProcessInstanceQuery;
 import org.jbpm.pvm.internal.cmd.DeleteProcessInstance;
 import org.jbpm.pvm.internal.cmd.EndProcessInstance;
 import org.jbpm.pvm.internal.cmd.FindExecutionCmd;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
 import org.jbpm.pvm.internal.identity.cmd.FindGroups;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.Map;
 
-import org.jbpm.HistoryService;
-import org.jbpm.history.HistoryActivityInstanceQuery;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.history.HistoryActivityInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
 import org.jbpm.pvm.internal.query.AvgDurationPerActivityQueryCmd;
 import org.jbpm.pvm.internal.query.ChoiceDistributionQueryCmd;
 import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/IdentityServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.IdentityService;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+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.identity.cmd.CreateGroup;
 import org.jbpm.pvm.internal.identity.cmd.CreateMembership;
 import org.jbpm.pvm.internal.identity.cmd.CreateUser;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.cmd.CommandService;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ManagementServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.JobQuery;
-import org.jbpm.ManagementService;
+import org.jbpm.api.JobQuery;
+import org.jbpm.api.ManagementService;
 import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
 import org.jbpm.pvm.internal.query.JobQueryImpl;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.svc;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
 import org.jbpm.internal.log.Log;
 
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
 import org.jbpm.internal.log.Log;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.TaskQuery;
-import org.jbpm.TaskService;
-import org.jbpm.model.Comment;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.TaskService;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.*;
 import org.jbpm.pvm.internal.cmd.*;
 import org.jbpm.pvm.internal.task.TaskImpl;
 import org.jbpm.pvm.internal.task.TaskQueryImpl;
-import org.jbpm.task.*;
 
 /**
  * @author Alejandro Guizar, Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.model.Activity;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.client.ClientProcessInstance;
+import org.jbpm.api.model.Activity;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.IdGenerator;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.task.Participation;
+import org.jbpm.api.task.Participation;
 
 
 /** the relation between a task and a person.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,12 +26,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Swimlane;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Swimlane;
 
 /**
  * runtime process role for a specific process instance.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,11 +29,18 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.TaskDbSession;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.OpenTask;
+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.internal.log.Log;
-import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.history.events.TaskCancel;
 import org.jbpm.pvm.internal.history.events.TaskComplete;
 import org.jbpm.pvm.internal.history.events.TaskStart;
@@ -44,13 +51,6 @@
 import org.jbpm.pvm.internal.util.EqualsUtil;
 import org.jbpm.pvm.internal.util.Priority;
 import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.session.TaskDbSession;
-import org.jbpm.task.Assignable;
-import org.jbpm.task.OpenTask;
-import org.jbpm.task.Participation;
-import org.jbpm.task.Swimlane;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskHandler;
 
 /**
  * is one task instance that can be assigned to an actor (read: put in 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,17 +25,17 @@
 import java.util.List;
 
 import org.hibernate.Query;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.TaskQuery;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.task.Task;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.identity.spi.IdentitySession;
 import org.jbpm.pvm.internal.query.AbstractQuery;
 import org.jbpm.pvm.internal.query.Page;
-import org.jbpm.task.Task;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Job;
+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.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/JtaTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Transaction;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
 
 import javax.transaction.Synchronization;
 
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.internal.log.Log;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+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.svc.Interceptor;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.type.Converter;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.type.Converter;
 
 public class SerializableToBytesConverter implements Converter {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.type.Type;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.type.Matcher;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.type.variable;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.lob.Lob;
 import org.jbpm.pvm.internal.type.Variable;
-import org.jbpm.session.DbSession;
 
 public class BlobVariable extends Variable {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /** default implementation of the {@link Observable} interface.
  * 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 /** listener that only delegates events to a given listener if 
  * they pass the filter based on event names. */

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 public abstract class IoUtil {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.util;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 public abstract class Priority {
   

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -9,8 +9,8 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.util;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.xml.Binding;
 import org.jbpm.pvm.internal.xml.Bindings;
 import org.w3c.dom.Element;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 import java.net.URL;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.xml.Entity;
 import org.jbpm.pvm.internal.xml.Parser;
 import org.xml.sax.EntityResolver;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,7 +29,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.xml.Parse;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -29,10 +29,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.model.ProcessElementImpl;
@@ -73,7 +73,7 @@
  * </p>
  * 
  * <p>Another usage of the WireContext is construction and configuration of user 
- * code objects in a persistable way.  {@link ActivityBehaviour}s and {@link org.jbpm.activity.ExternalActivityBehaviour}
+ * code objects in a persistable way.  {@link ActivityBehaviour}s and {@link org.jbpm.api.activity.ExternalActivityBehaviour}
  * and other user code can be instantiated with a WireContext.  That way, they can 
  * be persisted in a fixed schema.    
  * </p>

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.env.WireObject;
+import org.jbpm.api.env.WireObject;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.wire.Descriptor;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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/ContextRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.Context;
+import org.jbpm.api.env.Context;
 import org.jbpm.pvm.internal.wire.descriptor.ContextRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.wire.descriptor.EnvironmentDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentityServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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/MessageSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,6 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.MessageSession;
 import org.jbpm.pvm.internal.jms.JmsMessageSession;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutorMessageSession;
 import org.jbpm.pvm.internal.util.XmlUtil;
@@ -30,8 +32,6 @@
 import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.MessageSession;
 import org.w3c.dom.Element;
 
 /** parses a descriptor for creating a {@link MessageSession}.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TaskServiceBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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/binding/TimerSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
+import org.jbpm.api.session.TimerSession;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutorTimerSession;
@@ -31,7 +32,6 @@
 import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.session.TimerSession;
 import org.w3c.dom.Element;
 
 /** parses a descriptor for creating a {@link TimerSession}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.pvm.internal.tx.JtaTransaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.ProcessService;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.env.Environment;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessService;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 import org.jbpm.pvm.internal.util.XmlUtil;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.cmd.CommandService;
+import org.jbpm.api.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/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.wire.WireContext;
 
 /** the {@link EnvironmentFactory} of the current {@link WireContext}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.svc.EnvironmentInterceptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,7 +28,7 @@
 import java.util.Properties;
 
 import org.hibernate.cfg.Configuration;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.impl.SessionImpl;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.tx.HibernateSessionResource;
 import org.jbpm.pvm.internal.tx.StandardTransaction;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
 import org.jboss.identity.idm.api.IdentitySessionFactory;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 
 import org.jboss.identity.idm.api.IdentitySessionFactory;
 import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl;
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -13,7 +13,7 @@
  **/
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.util.Listener;
@@ -25,7 +25,7 @@
  * Descriptor for the JobExecutor.
  * If it is automatically started, a listener is created to stop it when
  * the environementFactory is closed
- * @see org.jbpm.env.EnvironmentFactory
+ * @see org.jbpm.api.env.EnvironmentFactory
  * @see org.jbpm.pvm.internal.wire.binding.JobExecutorBinding
  */
 public class JobExecutorDescriptor extends ObjectDescriptor {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -7,8 +7,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.util.ArrayUtil;
 import org.jbpm.pvm.internal.util.ReflectUtil;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.pvm.internal.wire.WireContext;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.operation;
 
-import org.jbpm.env.Transaction;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.tx.StandardResource;
 import org.jbpm.pvm.internal.tx.StandardTransaction;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.util.FilterListener;
 import org.jbpm.pvm.internal.util.Listener;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -31,7 +31,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 
-import org.jbpm.JbpmException;
+import org.jbpm.api.JbpmException;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.stream.FileStreamInput;
 import org.jbpm.pvm.internal.stream.InputStreamInput;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 import org.xml.sax.SAXParseException;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
 import org.jbpm.internal.log.Log;
 import org.jbpm.pvm.internal.repository.DeploymentImpl;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/AutomaticActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.activities;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/DisplaySource.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.activities;
 
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
 
 public class DisplaySource implements EventListener {
   

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/PrintLn.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.pvm.activities;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.OpenExecution;
 
 public class PrintLn implements ActivityBehaviour, EventListener {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/WaitState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Transition;
+import org.jbpm.api.client.ClientProcessDefinition;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.model.ActivityImpl;
 import org.jbpm.test.BaseJbpmTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/TestActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.builder;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.env;
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.env;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.env;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.env;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventListenerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.eventlistener;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Event;
+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;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Event;
+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;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/AutomaticActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.executionmode.embedded;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
 
 /** a activity behaviour implementation that records its execution and then 
  * just proceeds.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.executionmode.embedded;
 
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/WaitState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
 import org.jbpm.pvm.activities.AutomaticActivity;
 import org.jbpm.pvm.activities.WaitState;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,10 +24,10 @@
 import java.util.Date;
 import java.util.List;
 
-import org.jbpm.model.Comment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.test.EnvironmentDbTestCase;
-import org.jbpm.session.DbSession;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.expr;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+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;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.expr;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+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;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.IdentityService;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
+import org.jbpm.api.IdentityService;
+import org.jbpm.api.identity.Group;
+import org.jbpm.api.identity.User;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireException;
 import org.jbpm.pvm.internal.wire.WireTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.Configuration;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.env.Transaction;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Transaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
-import org.jbpm.env.Environment;
+import org.jbpm.api.Problem;
+import org.jbpm.api.env.Environment;
 
 /**
  * Tests for the ClassDescriptor
@@ -89,7 +89,7 @@
     Object o = wireContext.get("o");
 
     assertNotNull(o);
-    assertEquals(org.jbpm.env.Environment.class, o);
+    assertEquals(org.jbpm.api.env.Environment.class, o);
   }
 
 }

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.wire;
 
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 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/internal/wire/ContextTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -16,8 +16,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.wire;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.wire;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.util.DefaultObservable;
 import org.jbpm.pvm.internal.util.Observable;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.util.DefaultObservable;
 import org.jbpm.pvm.internal.util.Observable;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.JbpmException;
-import org.jbpm.Problem;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 import org.jbpm.pvm.internal.util.FileUtil;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 
 public class SetWireTest extends WireTestCase {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire;
 
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.util.DefaultObservable;
 import org.jbpm.pvm.internal.util.Observable;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.env.Context;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.env.Context;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
 import org.jbpm.pvm.internal.util.Listener;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.Problem;
+import org.jbpm.api.Problem;
 import org.jbpm.pvm.internal.wire.xml.WireParser;
 import org.jbpm.test.BaseJbpmTestCase;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/PrintlnTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.println;
 
-import org.jbpm.client.ClientProcessDefinition;
+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;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
-import org.jbpm.Execution;
-import org.jbpm.model.OpenProcessDefinition;
-import org.jbpm.session.DbSession;
-import org.jbpm.session.PvmDbSession;
+import org.jbpm.api.Execution;
+import org.jbpm.api.model.OpenProcessDefinition;
+import org.jbpm.api.session.DbSession;
+import org.jbpm.api.session.PvmDbSession;
 import org.jbpm.test.Db;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Configuration;
-import org.jbpm.JbpmException;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.test.BaseJbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.test;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,10 +26,10 @@
 import javax.transaction.Synchronization;
 
 import org.hibernate.Session;
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.env.Transaction;
+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.model.CommentImpl;
 import org.jbpm.pvm.internal.type.variable.StringVariable;
 import org.jbpm.test.JbpmTestCase;

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
-import org.jbpm.env.Environment;
+import org.jbpm.api.env.Environment;
 import org.jbpm.internal.log.Jdk14LogFactory;
 import org.jbpm.internal.log.Log;
 import org.jbpm.internal.log.LogFormatter;

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -35,8 +35,8 @@
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.Table;
-import org.jbpm.ProcessEngine;
-import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.internal.log.Log;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.test;
 
-import org.jbpm.*;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.job.Job;
-import org.jbpm.task.Task;
+import org.jbpm.api.*;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.enterprise.IntegrationTestHelper;
 
 import java.util.ArrayList;

Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -1,36 +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.test;
-
-
-/**
- * @author Tom Baeyens
- */
-public class MessageFinder {
-  
-  protected JbpmTestCase jbpmTestCase;
-
-  public MessageFinder(JbpmTestCase jbpmTestCase) {
-    this.jbpmTestCase = jbpmTestCase;
-  }
-  
-}

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/DecisionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/StateTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.activities;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.cfg;
 
-import org.jbpm.Configuration;
-import org.jbpm.ProcessEngine;
+import org.jbpm.api.Configuration;
+import org.jbpm.api.ProcessEngine;
 import org.jbpm.test.BaseJbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,9 +24,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.api.Execution;
+import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,8 +4,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.test.execution;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/SignalExecutionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/StartExecutionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.Execution;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/AvgDurationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.history.HistoryProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.history.HistoryProcessInstance;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.history.HistoryProcessInstance;
-import org.jbpm.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jbpm.job.Job;
+import org.jbpm.api.job.Job;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -28,8 +28,8 @@
 import java.io.OutputStream;
 import java.util.Arrays;
 
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessDefinitionQuery;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.task.Task;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.model.Comment;
-import org.jbpm.task.Task;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.Date;
 import java.text.DateFormat;
 
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.test.task;
 
-import org.jbpm.Execution;
-import org.jbpm.task.OpenTask;
-import org.jbpm.task.Task;
-import org.jbpm.task.TaskHandler;
+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.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskListTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.task.Task;
-import org.jbpm.task.UserRef;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.UserRef;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jbpm.task.Participation;
-import org.jbpm.task.Task;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
 
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
-import org.jbpm.TaskQuery;
-import org.jbpm.task.Task;
+import org.jbpm.api.TaskQuery;
+import org.jbpm.api.task.Task;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
 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/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
 
 /** a activity behaviour implementation that records its execution and then 
  * just proceeds.

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,9 +25,9 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.OpenProcessDefinition;
+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;
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,17 +26,17 @@
 import java.util.Set;
 
 import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+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.api.session.MessageSession;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.session.MessageSession;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,9 +26,9 @@
 import java.util.Set;
 
 import org.hibernate.Session;
-import org.jbpm.Execution;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+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.job.CommandMessage;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,13 +26,13 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.MessageSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,16 +21,16 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.internal.log.Log;
-import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.session.DbSession;
 
 
 /**

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,14 +24,14 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.job.Job;
+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.api.session.MessageSession;
+import org.jbpm.api.session.PvmDbSession;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.MessageSession;
-import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.JbpmTestCase;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,13 +21,13 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.DbSession;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.load.async;
 
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -27,9 +27,9 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.CommandService;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,8 +24,8 @@
 import java.util.Random;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,13 +25,13 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
-import org.jbpm.model.Comment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.model.Comment;
+import org.jbpm.api.session.MessageSession;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.session.MessageSession;
 import org.jbpm.test.Db;
 
 /**

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.Execution;
+import org.jbpm.api.Execution;
 import org.jbpm.internal.log.Log;
 import org.jbpm.test.load.LoadTestCase;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -22,8 +22,8 @@
 package org.jbpm.test.load.messages;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.env.Environment;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.env.Environment;
+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.model.Comment;
 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/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticActivity.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.test.activities;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
+import org.jbpm.api.activity.ActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+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.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,15 +25,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.Event;
-import org.jbpm.model.ObservableElement;
+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.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.test.BaseJbpmTestCase;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,16 +25,16 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
-import org.jbpm.model.Activity;
-import org.jbpm.model.ObservableElement;
+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.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Activity;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ObservableElement;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
+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.listener.EventListener;
+import org.jbpm.api.listener.EventListenerExecution;
+import org.jbpm.api.model.Event;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,13 +23,13 @@
 
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.Execution;
+import org.jbpm.api.JbpmException;
+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.test.BaseJbpmTestCase;
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,10 +25,10 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+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.pvm.internal.builder.ProcessDefinitionBuilder;
 
 

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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -25,15 +25,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -4,11 +4,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+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.pvm.internal.builder.ProcessDefinitionBuilder;
 import org.jbpm.test.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
 
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.api.Execution;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,12 +24,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,12 +23,12 @@
 
 import java.util.Map;
 
-import org.jbpm.JbpmException;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.OpenExecution;
+import org.jbpm.api.JbpmException;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
+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.pvm.internal.builder.ProcessDefinitionBuilder;
 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/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -5,15 +5,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityBehaviour;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.model.Activity;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
+import org.jbpm.api.Execution;
+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.model.Activity;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.model.Transition;
 import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
 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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -24,11 +24,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListener;
-import org.jbpm.listener.EventListenerExecution;
-import org.jbpm.model.Event;
+import org.jbpm.api.client.ClientExecution;
+import org.jbpm.api.client.ClientProcessDefinition;
+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.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-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -26,11 +26,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.client.ClientProcessInstance;
+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.test.BaseJbpmTestCase;
 

Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java	2009-04-16 18:39:40 UTC (rev 4569)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/WaitState.java	2009-04-16 19:28:20 UTC (rev 4570)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivityBehaviour;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.activity.ExternalActivityBehaviour;
 
 /**
  * @author Tom Baeyens




More information about the jbpm-commits mailing list