[jbpm-commits] JBoss JBPM SVN: r5099 - in jbpm4/trunk/modules: enterprise/src/main/java/org/jbpm/enterprise/internal/ejb and 50 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-06-23 16:29:56 -0400 (Tue, 23 Jun 2009) New Revision: 5099 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Transaction.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WireObject.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/environment.gif Removed: 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/env/environment.gif jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/package.html jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java 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/EjbTimerSession.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/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/enterprise/EnvironmentServletTestCase.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.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/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.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/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/MailActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.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/SubProcessActivity.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/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/Command.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/CreateDeploymentQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/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/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/GetActivityCoordinates.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/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/RemoveParticipantCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/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/SuspendDeploymentCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.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/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/env/SpringContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/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/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/identity/cmd/CreateGroupCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.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/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/GetNextDueDateCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/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/JobExecutorTimerSession.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/CommentImpl.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/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/ObjectReference.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/ScopeInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.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/ExecuteEventListenerMessage.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/TransitionStartActivityMessage.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/ProcessDefinitionQueryImpl.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/script/EnvironmentBindings.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/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/SpringTransactionInterceptor.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/jta/JtaRetryInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/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/ReflectUtil.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/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/EnvironmentInterceptorBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.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/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/EnvironmentInterceptorDescriptor.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/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/ProcessEngineDescriptor.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/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/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/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/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/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/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/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-concurrent/src/main/java/org/jbpm/test/concurrent/ConcurrentJbpmTestCase.java jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/SynchronizableCommandExecutor.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java Log: JBPM-2307 moved api package env to pvm internal Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.env; - -import java.util.Set; - -/** - * a group of named objects in an {@link Environment} that have a similar lifespan. - * - * @author Tom Baeyens - */ -public interface Context { - - /** key of the process-engine-context in the environment */ - String CONTEXTNAME_PROCESS_ENGINE = "process-engine"; - - /** key of the transaction-context in the environment */ - String CONTEXTNAME_TRANSACTION = "transaction"; - - /** key of the execution-context in the environment */ - String CONTEXTNAME_EXECUTION = "execution"; - - /** key of the task-context in the environment */ - String CONTEXTNAME_TASK = "task"; - - /** key of the job-context in the environment */ - String CONTEXTNAME_JOB = "job"; - - String getName(); - - Object get(String key); - <T> T get(Class<T> type); - - boolean has(String key); - Object set(String key, Object value); - Set<String> keys(); - -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,269 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.env; - -import java.io.Serializable; -import java.util.Stack; - -import org.jbpm.api.JbpmException; - - -/** - * maintains contextual information for a thread in a set of - * {@link Context}s. - * - * <h3>Introduction</h3> - * - * <p>Objects have different lifecycles and different context's (aka scopes). An - * environment provides the structure to easily manage objects with different - * contexts. - * </p> - * - * <p>Examples of contexts are: - * <ul> - * <li><b>process-engine</b>: The process-engine context is used to store e.g. data sources, - * session factories and other static resources needed by an application. - * The process-engine context lives for the complete duration of the {@link EnvironmentFactory}. - * So if the {@link EnvironmentFactory} is maintained in a static member field, the - * process-engine context lives for the duration of the application. - * The same process-engine context is shared for all the Environments produced by one - * EnvironmentFactory.</li> - * <li><b>environment</b>: The environment context is used for e.g. a transaction - * and transactional resources, user authentication. This results in an efficient and - * configurable use of transactional resources that need to be lazily initialized.</li> - * <li>The environment can accomodate other contexts as well. They can be added - * and removed dynamically. Examples of other potential contexts are web-request, web-session, - * web-application, business processDefinition, jobImpl, ... </li> - * </ul> - * - * <center><img src="environment.gif"/></center> - * - * <p>An environment is typically installed like this - * </p> - * - * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory(); - * - * ... - * - * Environment environment = environmentFactory.openEnvironment(); - * try { - * - * ... everything available in this block ... - * - * } finally { - * environment.close(); - * } - * </pre></b> - * - * <h3>Purpose</h3> - * - * <p>The first purpose of the environment is to separate the application from the - * environment. Standard Java and Enterprise Java are quite different and an environment - * abstraction like this allows for the development of applications that can run in - * both Standard and Enterprise environments. Also test environments are easier to - * tweak this way. - * </p> - * - * <p>A second purpose of the environment is to enable specific to global searching - * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts - * 'execution', 'transaction' and 'process-engine' in the given order. - * That way, a global adminEmailAddress can be specified in the process-engine context - * and it can be refined in more specific contexts. - * </p> - * - * <h3>Search order</h3> - * - * <p>To find an object in the environment, a searchOrder can be specified. A - * search order is an sequence that specifies the order in which the contexts should - * be searched. - * </p> - * - * <p>The default search order is the inverse sequence of how the contexts are - * added to the environment. This is because in general, we can assume that the - * more recent a context was added, the more specific it is. - * </p> - * - * <h3>Transaction, username and classloader</h3> - * - * <p>Three objects are used so frequently in an environment that they get - * special treatment: - * </p> - * - * <ul> - * <li><b>Transaction</b>: an abstraction for marking a transaction with - * setRollbackOnly.</li> - * <li><b>Classloader</b>: the current class loader.</li> - * <li><b>Username</b>: the name of the currently authenticated user.</li> - * </ul> - * - * <p>For these special properties, setters are also available. That is to support - * programmatic injection into the environment. Alternatively, they can be configured - * in one of the contexts. - * </p> - * - * - * @see EnvironmentFactory - * @author Tom Baeyens - */ -public abstract class Environment implements Serializable { - - /** - * searches a named object in all the contexts in the default search order. - * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment. - */ - public abstract Object get(String name); - - /** - * searches a named object in all the contexts in the given search order. The given - * search order doesn't have to include all contexts. It can be a subset of the - * contexts available. - * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order. - * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts. - */ - public abstract Object get(String name, String[] searchOrder); - - /** searches an object based on type. The search doesn take superclasses of the context elements - * into account. - * @return the first object of the given type or null in case no such element was found. - */ - public abstract <T> T get(Class<T> type); - - - /** searches an object based on type. The search doesn take superclasses of the context elements - * into account. - * @return the first object of the given type or null in case no such element was found. - */ - public abstract <T> T get(Class<T> type, String[] searchOrder); - - /** get the authenticated user id */ - public abstract String getUserId(); - - /** set the authenticated user id */ - public abstract void setUserId(String userId); - - /** - * closes the Environment by removing all its contexts. - */ - public abstract void close(); - - public abstract Context getContext(String contextName); - public abstract void setContext(Context context); - public abstract Context removeContext(Context context); - public abstract Context removeContext(String contextName); - - public abstract ClassLoader getClassLoader(); - public abstract void setClassLoader(ClassLoader classLoader); - - // current environment ////////////////////////////////////////////////////// - /** the current environment is maintained in the currentEnvironment thread local */ - static ThreadLocal<Environment> currentEnvironment = new ThreadLocal<Environment>(); - - /** in case of nested environments, the current environment stack maintains the outer environments */ - static ThreadLocal<Stack<Environment>> currentEnvironmentStack = new ThreadLocal<Stack<Environment>>(); - - /** gets the most inner open environment. */ - public static Environment getCurrent() { - return currentEnvironment.get(); - } - - public static <T> T getFromCurrent(Class<T> type) { - return getFromCurrent(type, true); - } - - public static <T> T getFromCurrent(Class<T> type, boolean required) { - Environment environment = getCurrent(); - if (environment==null) { - if (required) { - throw new JbpmException("no environment to get "+type.getName()); - } - return null; - } - T object = environment.get(type); - if (object==null) { - if (required) { - throw new JbpmException("no "+type.getName()+" in current environment"); - } - return null; - } - return object; - } - - public static Object getFromCurrent(String name) { - return getFromCurrent(name, true); - } - - public static Object getFromCurrent(String name, boolean required) { - Environment environment = getCurrent(); - if (environment==null) { - if (required) { - throw new JbpmException("no environment to get '"+name+"'"); - } - return null; - } - Object object = environment.get(name); - if (object==null) { - if (required) { - throw new JbpmException("no '"+name+"' in current environment"); - } - return null; - } - return object; - } - - static Stack<Environment> getStack() { - // lazy initialize the current environment stack - Stack<Environment> stack = currentEnvironmentStack.get(); - if (stack==null) { - stack = new Stack<Environment>(); - currentEnvironmentStack.set(stack); - } - return stack; - } - - - /** pops the closing context from the stack of current contexts. This - * is the first thing that needs to be done when an environment is closed. - * @see EnvironmentFactory#push(Environment) */ - public static synchronized Environment popEnvironment() { - Environment popped = currentEnvironment.get(); - currentEnvironment.set(null); - Stack<Environment> stack = currentEnvironmentStack.get(); - if ( (stack!=null) - && (! stack.isEmpty()) - ) { - currentEnvironment.set(stack.pop()); - } - return popped; - } - - /** after opening of a new environment succeeded, the environment - * must be pushed in the stack of current environments. - * - * @see Environment#pop() */ - public static synchronized void pushEnvironment(Environment environment) { - Environment current = currentEnvironment.get(); - if (current!=null) { - getStack().push(current); - } - currentEnvironment.set(environment); - } -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.env; - -import java.io.InputStream; -import java.io.Serializable; -import java.util.List; - -import org.xml.sax.InputSource; - -/** - * factory for {@link Environment}s. - * - * <p>Default implementation is - * {@link PvmEnvironmentFactory}. EnvironmentFactory is thread safe, you - * should use one environment factory for all your threads. - * </p> - * - * <p>Easiest way to obtain an EnvironmentFactory is with - * <ul> - * <li>{@link #parseResource(String)}</li> - * <li>{@link #parseInputStream(InputStream)}</li> - * <li>{@link #parseInputSource(InputSource)}</li> - * <li>{@link #parseXmlString(String)}</li> - * </ul> - * </p> - * - * <p>For the default parser's XML schema, see {@link PvmEnvironmentFactoryParser}.</p> - * - * @author Tom Baeyens - */ -public interface EnvironmentFactory extends Context, Serializable { - - /** - * open a new Environment. The client is responsible for - * closing the environment with {@link Environment#close()}. - */ - Environment openEnvironment(); - - /** - * open a new Environment and pass in a list of objects - * that must be placed/exposed in the transaction context. - * The client is responsible for - * closing the environment with {@link Environment#close()}. - */ - Environment openEnvironment(List<WireObject> txWireObjects); - - /** - * closes this environment factory and cleans any allocated - * resources. - */ - void close(); - - -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.env; - -import javax.transaction.Synchronization; - - -/** provides access to the transaction in the environment. - * - * @author Tom Baeyens - */ -public interface Transaction { - - /** marks a transaction for rollback only. - * The transaction will be rolled back upon closing the environment. */ - void setRollbackOnly(); - - /** is this transaction marked for rollback only ? */ - boolean isRollbackOnly(); - - /** register a transaction listener. This method will have no - * effect if the transactionListener is null. */ - void registerSynchronization(Synchronization synchronization); -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.env; - -import org.jbpm.api.JbpmException; - - -/** - * @author Tom Baeyens - */ -public class WireObject { - - protected String name; - protected Object object; - protected boolean isTypeExposed; - - public WireObject(Object object) { - this(object, null, true); - } - - public WireObject(Object object, String name) { - this(object, null, true); - } - - public WireObject(Object object, String name, boolean isTypeExposed) { - if (object==null) { - throw new JbpmException("object is null"); - } - this.object = object; - this.isTypeExposed = isTypeExposed; - this.name = name; - } - - public String getName() { - return name; - } - public Object getObject() { - return object; - } - public boolean isTypeExposed() { - return isTypeExposed; - } -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/environment.gif =================================================================== (Binary files differ) Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/package.html =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/package.html 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/package.html 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,3 +0,0 @@ -<body>a layer that abstracts the engine and activities from the concrete environment -in which the Process Virtual Machine runs. -</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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -34,11 +34,11 @@ import org.jbpm.api.Configuration; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; /** * Stateless session command executor. 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -28,9 +28,9 @@ 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.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.session.TimerSession; Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,9 +23,9 @@ import java.util.Date; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,8 +23,8 @@ import java.sql.SQLException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,8 +26,8 @@ import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.CommentImpl; /** Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -29,7 +29,6 @@ import org.jbpm.api.ExecutionService; import org.jbpm.api.RepositoryService; -import org.jbpm.api.env.Environment; import org.jbpm.enterprise.internal.custom.HappyListener; import org.jbpm.enterprise.internal.custom.WaitState; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; @@ -37,6 +36,7 @@ import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.session.TimerSession; Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -31,7 +31,6 @@ import org.jbpm.api.Execution; import org.jbpm.api.ExecutionService; import org.jbpm.api.RepositoryService; -import org.jbpm.api.env.Environment; import org.jbpm.enterprise.internal.custom.HappyListener; import org.jbpm.enterprise.internal.custom.NoisyListener; import org.jbpm.enterprise.internal.custom.WaitState; @@ -40,6 +39,7 @@ import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import org.apache.cactus.ServletTestCase; 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; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,17 +21,17 @@ */ package org.jbpm.integration.console; +import java.util.ArrayList; +import java.util.List; + import org.jboss.bpm.console.client.model.DeploymentRef; import org.jboss.bpm.console.server.plugin.DeploymentPlugin; import org.jbpm.api.Deployment; +import org.jbpm.api.DeploymentQuery; import org.jbpm.api.RepositoryService; -import org.jbpm.api.DeploymentQuery; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; -import java.util.ArrayList; -import java.util.List; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,21 +21,27 @@ */ package org.jbpm.integration.console; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + 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.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.api.model.OpenExecution; -import org.jbpm.api.*; +import org.jbpm.api.Execution; +import org.jbpm.api.ExecutionService; +import org.jbpm.api.HistoryService; +import org.jbpm.api.ProcessDefinition; +import org.jbpm.api.ProcessDefinitionQuery; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.ProcessInstanceQuery; +import org.jbpm.api.RepositoryService; +import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.history.HistoryProcessInstanceQuery; -import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.model.ExecutionImpl; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,19 +21,19 @@ */ package org.jbpm.integration.console; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.server.integration.TaskManagement; import org.jbpm.api.TaskService; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.api.task.Participation; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java =================================================================== --- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,31 +21,43 @@ */ package org.jbpm.integration.console.forms; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.naming.InitialContext; + import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; -import org.jbpm.api.*; +import org.jbpm.api.ExecutionService; +import org.jbpm.api.ProcessDefinition; +import org.jbpm.api.ProcessDefinitionQuery; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.RepositoryService; +import org.jbpm.api.TaskService; import org.jbpm.api.model.Transition; -import org.jbpm.api.model.OpenExecution; import org.jbpm.api.task.Task; -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.api.env.Environment; import org.jbpm.integration.spi.mgmt.ServerConfig; import org.jbpm.integration.spi.mgmt.ServerConfigFactory; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; +import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.task.TaskImpl; -import org.jbpm.pvm.internal.model.ExecutionImpl; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.naming.InitialContext; -import java.net.MalformedURLException; -import java.net.URL; -import java.io.*; -import java.util.Set; -import java.util.Map; -import java.util.HashMap; -import java.util.List; - +import freemarker.template.DefaultObjectWrapper; import freemarker.template.Template; -import freemarker.template.DefaultObjectWrapper; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java =================================================================== --- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -36,9 +36,9 @@ import org.jbpm.api.ProcessEngine; 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.ActivityCoordinates; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.model.ExecutionImpl; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,10 +23,10 @@ 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.env.Environment; 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/HqlActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,9 +24,9 @@ import org.hibernate.Query; import org.hibernate.Session; 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.pvm.internal.env.Environment; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,8 +25,8 @@ import java.util.List; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.EnvironmentDefaults; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -29,9 +29,9 @@ import org.jbpm.api.Execution; 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.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,10 +25,10 @@ import javax.mail.Message; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenExecution; import org.jbpm.pvm.internal.email.spi.MailProducer; import org.jbpm.pvm.internal.email.spi.MailSession; +import org.jbpm.pvm.internal.env.Environment; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,12 +25,12 @@ import javax.mail.Message; -import org.jbpm.api.env.Environment; import org.jbpm.api.listener.EventListener; import org.jbpm.api.listener.EventListenerExecution; import org.jbpm.api.task.Task; import org.jbpm.pvm.internal.email.spi.MailProducer; import org.jbpm.pvm.internal.email.spi.MailSession; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.jpdl.internal.activity; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.jpdl.internal.activity; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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/SubProcessActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,11 +25,11 @@ import java.util.Map; import org.jbpm.api.activity.ActivityExecution; -import org.jbpm.api.env.Context; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Activity; import org.jbpm.jpdl.internal.model.JpdlExecution; import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.env.Context; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,12 +25,12 @@ import java.util.Map; 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.task.Task; import org.jbpm.internal.log.Log; import org.jbpm.jpdl.internal.model.JpdlExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskDefinitionImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,10 +27,10 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Assignable; import org.jbpm.api.task.AssignmentHandler; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,10 +27,10 @@ import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.jpdl.internal.model.JpdlProcessDefinition; import org.jbpm.jpdl.internal.xml.JpdlParser; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.repository.Deployer; import org.jbpm.pvm.internal.repository.DeploymentImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -34,7 +34,6 @@ import org.w3c.dom.Element; import org.jbpm.api.activity.ActivityBehaviour; -import org.jbpm.api.env.Environment; import org.jbpm.api.listener.EventListener; import org.jbpm.api.model.Event; import org.jbpm.internal.log.Log; @@ -45,6 +44,7 @@ import org.jbpm.pvm.internal.email.impl.MailTemplate; import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry; import org.jbpm.pvm.internal.email.spi.MailProducer; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ActivityCoordinatesImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.CompositeElementImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -35,13 +35,13 @@ import org.jbpm.api.ProcessEngine; 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.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.env.PvmEnvironment; +import org.jbpm.pvm.internal.env.WireObject; import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,12 +25,12 @@ import java.util.List; import org.jbpm.api.ProcessEngine; -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.pvm.internal.env.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.PvmEnvironment; import org.jbpm.pvm.internal.env.SpringContext; +import org.jbpm.pvm.internal.env.WireObject; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.api.env.WireObject; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,8 +23,8 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.IdentityRef; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.task.TaskImpl; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CancelTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Assignable; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; public interface Command<T> extends Serializable { 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; /** container for executing multiple commands in one transaction. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.DeploymentQueryImpl; import org.jbpm.pvm.internal.query.JobQueryImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.JobQueryImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl; import org.jbpm.pvm.internal.session.RepositorySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskQueryImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,8 +27,8 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.repository.RepositoryCache; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.wire.binding.DbSessionBinding; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.session.RepositorySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,11 +24,11 @@ import java.util.Date; import org.jbpm.api.JbpmException; -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.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.JobContext; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobExceptionHandler; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,7 +23,7 @@ import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.ProcessDefinition; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenProcessDefinition; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenProcessDefinition; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,8 +23,8 @@ import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinates.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.ActivityCoordinates; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.session.RepositorySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,9 +26,9 @@ import java.util.Set; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Transition; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,8 +26,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Participation; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.task.ParticipationImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,7 +23,7 @@ import java.io.InputStream; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,8 +25,8 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.task.TaskImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariableNamesCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,8 +24,8 @@ import java.util.Set; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,8 +26,8 @@ import java.util.Set; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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/ResumeDeploymentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.hibernate.Session; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.repository.DeploymentImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.job.Message; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,8 +25,8 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,9 +26,9 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.client.ClientProcessInstance; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.RepositorySession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,9 +26,9 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.client.ClientProcessInstance; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.RepositorySession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.hibernate.Session; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.repository.DeploymentImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,8 +25,8 @@ import java.util.Map; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -28,10 +28,10 @@ import javax.mail.internet.InternetAddress; 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.email.spi.AddressResolver; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -46,11 +46,11 @@ import org.jbpm.api.Execution; 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.email.spi.AddressResolver; import org.jbpm.pvm.internal.email.spi.MailProducer; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,8 +26,6 @@ import java.util.Map; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Context; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Context.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.env; + +import java.util.Set; + +/** + * a group of named objects in an {@link Environment} that have a similar lifespan. + * + * @author Tom Baeyens + */ +public interface Context { + + /** key of the process-engine-context in the environment */ + String CONTEXTNAME_PROCESS_ENGINE = "process-engine"; + + /** key of the transaction-context in the environment */ + String CONTEXTNAME_TRANSACTION = "transaction"; + + /** key of the execution-context in the environment */ + String CONTEXTNAME_EXECUTION = "execution"; + + /** key of the task-context in the environment */ + String CONTEXTNAME_TASK = "task"; + + /** key of the job-context in the environment */ + String CONTEXTNAME_JOB = "job"; + + String getName(); + + Object get(String key); + <T> T get(Class<T> type); + + boolean has(String key); + Object set(String key, Object value); + Set<String> keys(); + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Environment.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -0,0 +1,269 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.env; + +import java.io.Serializable; +import java.util.Stack; + +import org.jbpm.api.JbpmException; + + +/** + * maintains contextual information for a thread in a set of + * {@link Context}s. + * + * <h3>Introduction</h3> + * + * <p>Objects have different lifecycles and different context's (aka scopes). An + * environment provides the structure to easily manage objects with different + * contexts. + * </p> + * + * <p>Examples of contexts are: + * <ul> + * <li><b>process-engine</b>: The process-engine context is used to store e.g. data sources, + * session factories and other static resources needed by an application. + * The process-engine context lives for the complete duration of the {@link EnvironmentFactory}. + * So if the {@link EnvironmentFactory} is maintained in a static member field, the + * process-engine context lives for the duration of the application. + * The same process-engine context is shared for all the Environments produced by one + * EnvironmentFactory.</li> + * <li><b>environment</b>: The environment context is used for e.g. a transaction + * and transactional resources, user authentication. This results in an efficient and + * configurable use of transactional resources that need to be lazily initialized.</li> + * <li>The environment can accomodate other contexts as well. They can be added + * and removed dynamically. Examples of other potential contexts are web-request, web-session, + * web-application, business processDefinition, jobImpl, ... </li> + * </ul> + * + * <center><img src="environment.gif"/></center> + * + * <p>An environment is typically installed like this + * </p> + * + * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory(); + * + * ... + * + * Environment environment = environmentFactory.openEnvironment(); + * try { + * + * ... everything available in this block ... + * + * } finally { + * environment.close(); + * } + * </pre></b> + * + * <h3>Purpose</h3> + * + * <p>The first purpose of the environment is to separate the application from the + * environment. Standard Java and Enterprise Java are quite different and an environment + * abstraction like this allows for the development of applications that can run in + * both Standard and Enterprise environments. Also test environments are easier to + * tweak this way. + * </p> + * + * <p>A second purpose of the environment is to enable specific to global searching + * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts + * 'execution', 'transaction' and 'process-engine' in the given order. + * That way, a global adminEmailAddress can be specified in the process-engine context + * and it can be refined in more specific contexts. + * </p> + * + * <h3>Search order</h3> + * + * <p>To find an object in the environment, a searchOrder can be specified. A + * search order is an sequence that specifies the order in which the contexts should + * be searched. + * </p> + * + * <p>The default search order is the inverse sequence of how the contexts are + * added to the environment. This is because in general, we can assume that the + * more recent a context was added, the more specific it is. + * </p> + * + * <h3>Transaction, username and classloader</h3> + * + * <p>Three objects are used so frequently in an environment that they get + * special treatment: + * </p> + * + * <ul> + * <li><b>Transaction</b>: an abstraction for marking a transaction with + * setRollbackOnly.</li> + * <li><b>Classloader</b>: the current class loader.</li> + * <li><b>Username</b>: the name of the currently authenticated user.</li> + * </ul> + * + * <p>For these special properties, setters are also available. That is to support + * programmatic injection into the environment. Alternatively, they can be configured + * in one of the contexts. + * </p> + * + * + * @see EnvironmentFactory + * @author Tom Baeyens + */ +public abstract class Environment implements Serializable { + + /** + * searches a named object in all the contexts in the default search order. + * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment. + */ + public abstract Object get(String name); + + /** + * searches a named object in all the contexts in the given search order. The given + * search order doesn't have to include all contexts. It can be a subset of the + * contexts available. + * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order. + * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts. + */ + public abstract Object get(String name, String[] searchOrder); + + /** searches an object based on type. The search doesn take superclasses of the context elements + * into account. + * @return the first object of the given type or null in case no such element was found. + */ + public abstract <T> T get(Class<T> type); + + + /** searches an object based on type. The search doesn take superclasses of the context elements + * into account. + * @return the first object of the given type or null in case no such element was found. + */ + public abstract <T> T get(Class<T> type, String[] searchOrder); + + /** get the authenticated user id */ + public abstract String getUserId(); + + /** set the authenticated user id */ + public abstract void setUserId(String userId); + + /** + * closes the Environment by removing all its contexts. + */ + public abstract void close(); + + public abstract Context getContext(String contextName); + public abstract void setContext(Context context); + public abstract Context removeContext(Context context); + public abstract Context removeContext(String contextName); + + public abstract ClassLoader getClassLoader(); + public abstract void setClassLoader(ClassLoader classLoader); + + // current environment ////////////////////////////////////////////////////// + /** the current environment is maintained in the currentEnvironment thread local */ + static ThreadLocal<Environment> currentEnvironment = new ThreadLocal<Environment>(); + + /** in case of nested environments, the current environment stack maintains the outer environments */ + static ThreadLocal<Stack<Environment>> currentEnvironmentStack = new ThreadLocal<Stack<Environment>>(); + + /** gets the most inner open environment. */ + public static Environment getCurrent() { + return currentEnvironment.get(); + } + + public static <T> T getFromCurrent(Class<T> type) { + return getFromCurrent(type, true); + } + + public static <T> T getFromCurrent(Class<T> type, boolean required) { + Environment environment = getCurrent(); + if (environment==null) { + if (required) { + throw new JbpmException("no environment to get "+type.getName()); + } + return null; + } + T object = environment.get(type); + if (object==null) { + if (required) { + throw new JbpmException("no "+type.getName()+" in current environment"); + } + return null; + } + return object; + } + + public static Object getFromCurrent(String name) { + return getFromCurrent(name, true); + } + + public static Object getFromCurrent(String name, boolean required) { + Environment environment = getCurrent(); + if (environment==null) { + if (required) { + throw new JbpmException("no environment to get '"+name+"'"); + } + return null; + } + Object object = environment.get(name); + if (object==null) { + if (required) { + throw new JbpmException("no '"+name+"' in current environment"); + } + return null; + } + return object; + } + + static Stack<Environment> getStack() { + // lazy initialize the current environment stack + Stack<Environment> stack = currentEnvironmentStack.get(); + if (stack==null) { + stack = new Stack<Environment>(); + currentEnvironmentStack.set(stack); + } + return stack; + } + + + /** pops the closing context from the stack of current contexts. This + * is the first thing that needs to be done when an environment is closed. + * @see EnvironmentFactory#push(Environment) */ + public static synchronized Environment popEnvironment() { + Environment popped = currentEnvironment.get(); + currentEnvironment.set(null); + Stack<Environment> stack = currentEnvironmentStack.get(); + if ( (stack!=null) + && (! stack.isEmpty()) + ) { + currentEnvironment.set(stack.pop()); + } + return popped; + } + + /** after opening of a new environment succeeded, the environment + * must be pushed in the stack of current environments. + * + * @see Environment#pop() */ + public static synchronized void pushEnvironment(Environment environment) { + Environment current = currentEnvironment.get(); + if (current!=null) { + getStack().push(current); + } + currentEnvironment.set(environment); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.script.ScriptManager; Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/EnvironmentFactory.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.env; + +import java.io.InputStream; +import java.io.Serializable; +import java.util.List; + +import org.xml.sax.InputSource; + +/** + * factory for {@link Environment}s. + * + * <p>Default implementation is + * {@link PvmEnvironmentFactory}. EnvironmentFactory is thread safe, you + * should use one environment factory for all your threads. + * </p> + * + * <p>Easiest way to obtain an EnvironmentFactory is with + * <ul> + * <li>{@link #parseResource(String)}</li> + * <li>{@link #parseInputStream(InputStream)}</li> + * <li>{@link #parseInputSource(InputSource)}</li> + * <li>{@link #parseXmlString(String)}</li> + * </ul> + * </p> + * + * <p>For the default parser's XML schema, see {@link PvmEnvironmentFactoryParser}.</p> + * + * @author Tom Baeyens + */ +public interface EnvironmentFactory extends Context, Serializable { + + /** + * open a new Environment. The client is responsible for + * closing the environment with {@link Environment#close()}. + */ + Environment openEnvironment(); + + /** + * open a new Environment and pass in a list of objects + * that must be placed/exposed in the transaction context. + * The client is responsible for + * closing the environment with {@link Environment#close()}. + */ + Environment openEnvironment(List<WireObject> txWireObjects); + + /** + * closes this environment factory and cleans any allocated + * resources. + */ + void close(); + + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,7 +26,6 @@ import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Context; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ScopeInstanceImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.api.env.Context; import org.jbpm.api.job.Job; import org.jbpm.pvm.internal.job.JobImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.env; -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/env/SpringContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringContext.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringContext.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.api.env.Context; import org.springframework.context.ApplicationContext; /** Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Transaction.java (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/Transaction.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Transaction.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Transaction.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.env; + +import javax.transaction.Synchronization; + + +/** provides access to the transaction in the environment. + * + * @author Tom Baeyens + */ +public interface Transaction { + + /** marks a transaction for rollback only. + * The transaction will be rolled back upon closing the environment. */ + void setRollbackOnly(); + + /** is this transaction marked for rollback only ? */ + boolean isRollbackOnly(); + + /** register a transaction listener. This method will have no + * effect if the transactionListener is null. */ + void registerSynchronization(Synchronization synchronization); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Transaction.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WireObject.java (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/WireObject.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WireObject.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WireObject.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.env; + +import org.jbpm.api.JbpmException; + + +/** + * @author Tom Baeyens + */ +public class WireObject { + + protected String name; + protected Object object; + protected boolean isTypeExposed; + + public WireObject(Object object) { + this(object, null, true); + } + + public WireObject(Object object, String name) { + this(object, null, true); + } + + public WireObject(Object object, String name, boolean isTypeExposed) { + if (object==null) { + throw new JbpmException("object is null"); + } + this.object = object; + this.isTypeExposed = isTypeExposed; + this.name = name; + } + + public String getName() { + return name; + } + public Object getObject() { + return object; + } + public boolean isTypeExposed() { + return isTypeExposed; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WireObject.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/environment.gif (from rev 5097, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/env/environment.gif) =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/environment.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -31,12 +31,12 @@ import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessDefinition; -import org.jbpm.api.env.Environment; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.task.Task; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientExecution; import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.history.events; import org.hibernate.Session; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.history.events; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.pvm.internal.env.Environment; 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/ProcessInstanceEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.history.events; import org.hibernate.Session; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceStart.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,8 +24,8 @@ import java.io.Serializable; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.pvm.internal.env.Environment; 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/identity/cmd/CreateGroupCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.identity.Group; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,9 +23,9 @@ import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.api.identity.Group; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.identity.cmd; -import org.jbpm.api.env.Environment; import org.jbpm.api.identity.User; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,9 +23,9 @@ import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.api.identity.User; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,7 +25,7 @@ import org.jboss.identity.idm.common.exception.IdentityException; import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl; import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.job; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,13 +25,13 @@ import java.util.Date; 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.pvm.internal.cal.BusinessCalendar; import org.jbpm.pvm.internal.cal.Duration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.jobexecutor.JobAddedNotification; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -28,9 +28,9 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,9 +23,9 @@ import java.util.Date; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,11 +27,11 @@ import javax.transaction.Synchronization; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.Transaction; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.Transaction; import org.jbpm.api.job.Message; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.session.MessageSession; import org.jbpm.pvm.internal.util.ReflectUtil; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -31,8 +31,8 @@ import org.jbpm.api.Configuration; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.EnvironmentFactory; /** * starts the job executor on init and closes the 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -19,9 +19,9 @@ import org.hibernate.Session; import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Transaction; import org.jbpm.api.job.Timer; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.session.TimerSession; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.List; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -28,8 +28,8 @@ import java.util.List; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; +import org.jbpm.pvm.internal.env.Environment; 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/DefaultIdGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,8 +24,8 @@ import org.hibernate.Session; import org.jbpm.api.Execution; import org.jbpm.api.ProcessDefinition; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,12 +27,12 @@ import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.Transaction; import org.jbpm.api.listener.EventListener; import org.jbpm.api.model.OpenProcessDefinition; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.model.op.AtomicOperation; import org.jbpm.pvm.internal.model.op.MoveToChildActivity; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,11 +25,11 @@ import javax.transaction.Synchronization; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.api.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.session.DbSession; public class ExceptionHandlerSynchronization implements Synchronization, Command<Object> { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -38,8 +38,6 @@ import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; import org.jbpm.api.activity.ActivityExecution; -import org.jbpm.api.env.Context; -import org.jbpm.api.env.Environment; import org.jbpm.api.job.Job; import org.jbpm.api.job.Timer; import org.jbpm.api.listener.EventListenerExecution; @@ -52,6 +50,8 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.client.ClientProcessInstance; +import org.jbpm.pvm.internal.env.Context; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.history.HistoryEvent; import org.jbpm.pvm.internal.history.HistorySession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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/ProcessDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,11 +26,11 @@ import java.util.Map; import org.jbpm.api.Execution; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenProcessDefinition; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.client.ClientProcessInstance; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.task.TaskDefinitionImpl; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -31,8 +31,8 @@ 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.Environment; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.type.Converter; import org.jbpm.pvm.internal.type.Type; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,7 +23,7 @@ import java.io.Serializable; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.script.ScriptManager; 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/VariableOutDefinitionSet.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.script.ScriptManager; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.EventImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,7 +24,7 @@ import java.util.Map; import org.jbpm.api.Execution; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,8 +27,8 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,8 +27,8 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -30,7 +30,7 @@ import org.jbpm.api.Deployment; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; 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/repository/DeploymentImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -38,9 +38,9 @@ import org.jbpm.api.Deployment; import org.jbpm.api.NewDeployment; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.DeployCmd; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.stream.ByteArrayStreamInput; import org.jbpm.pvm.internal.stream.FileStreamInput; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,8 +27,8 @@ import javax.script.Bindings; -import org.jbpm.api.env.Context; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Context; +import org.jbpm.pvm.internal.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AbstractServiceImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,10 +25,10 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.api.env.WireObject; import org.jbpm.pvm.internal.cmd.AbstractCommand; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.env.ProvidedAuthentication; +import org.jbpm.pvm.internal.env.WireObject; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.api.Execution; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.session.MessageSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.svc; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,11 +23,11 @@ import java.util.List; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.api.env.WireObject; import org.jbpm.pvm.internal.cmd.AbstractCommand; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.WireObject; /** sets up an environment around the execution of the command. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.api.env.Environment; import org.jbpm.api.identity.Group; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.cmd.FindGroupsCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -31,7 +31,6 @@ 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.model.Event; import org.jbpm.api.task.Assignable; @@ -39,6 +38,7 @@ import org.jbpm.api.task.Participation; import org.jbpm.api.task.Swimlane; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.history.events.TaskAssign; import org.jbpm.pvm.internal.history.events.TaskCancel; import org.jbpm.pvm.internal.history.events.TaskComplete; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,10 +27,10 @@ import org.hibernate.Query; import org.jbpm.api.JbpmException; import org.jbpm.api.TaskQuery; -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.env.Environment; import org.jbpm.pvm.internal.identity.spi.IdentitySession; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.query.AbstractQuery; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,11 +24,11 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jbpm.api.Execution; -import org.jbpm.api.env.Environment; import org.jbpm.api.job.Job; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,9 +23,9 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.spring.CommandTransactionCallback; import org.jbpm.pvm.internal.svc.Interceptor; import org.springframework.transaction.PlatformTransactionManager; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,8 +27,8 @@ import javax.transaction.Synchronization; -import org.jbpm.api.env.Transaction; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Transaction; /** simple 2 phase commit transaction. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.tx; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.svc.Interceptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,9 +24,9 @@ import javax.transaction.Status; import javax.transaction.UserTransaction; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.svc.RetryInterceptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -29,8 +29,8 @@ import javax.transaction.UserTransaction; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Transaction; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Transaction; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import javax.transaction.UserTransaction; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.svc.Interceptor; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,8 +24,8 @@ import org.hibernate.SessionFactory; import org.hibernate.metadata.ClassMetadata; import org.hibernate.type.Type; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.type.variable; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.type.Variable; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -11,8 +11,8 @@ import java.util.List; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor; public abstract class ReflectUtil { 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -30,11 +30,11 @@ import java.util.Set; 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.env.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.model.ProcessElementImpl; import org.jbpm.pvm.internal.util.Closable; import org.jbpm.pvm.internal.util.DefaultObservable; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; -import org.jbpm.api.env.WireObject; +import org.jbpm.pvm.internal.env.WireObject; 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/ContextRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.api.env.Context; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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/EnvironmentInterceptorBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.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/ProcessEngineRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.descriptor.ProcessEngineDescriptor; 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/TransactionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.api.env.Transaction; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.tx.jta.JtaTransaction; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.api.env.Transaction; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,8 +23,8 @@ import java.io.Serializable; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.repository.DeploymentImpl; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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/EnvironmentInterceptorDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.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/HibernateSessionDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,8 +26,8 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.impl.SessionImpl; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.tx.HibernateSessionResource; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.wire.WireContext; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,7 +25,7 @@ import org.jboss.identity.idm.api.IdentitySessionFactory; import org.jboss.identity.idm.common.exception.IdentityException; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.identity.impl.IdentitySessionResource; import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl; import org.jbpm.pvm.internal.tx.StandardTransaction; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -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.api.env.EnvironmentFactory + * @see org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -9,8 +9,8 @@ import java.util.List; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.env.EnvironmentDefaults; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.internal.util.ReflectUtil; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.wire.descriptor; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.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/TransactionRefDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.Transaction; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.wire.operation; -import org.jbpm.api.env.Transaction; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Transaction; import org.jbpm.pvm.internal.tx.StandardResource; import org.jbpm.pvm.internal.tx.StandardTransaction; import org.jbpm.pvm.internal.wire.WireContext; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -4,9 +4,9 @@ import java.util.List; import java.util.Set; -import org.jbpm.api.env.Context; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.Context; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.util.FilterListener; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.util.Observable; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.env; -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.env.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.test.BaseJbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,12 +21,12 @@ */ package org.jbpm.pvm.internal.expr; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.test.BaseJbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,12 +21,12 @@ */ package org.jbpm.pvm.internal.expr; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.client.ClientExecution; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.script.ScriptManager; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -4,9 +4,9 @@ import java.util.List; 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.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.tx; import org.jbpm.api.Configuration; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.tx; import org.jbpm.api.Configuration; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.tx; 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.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; +import org.jbpm.pvm.internal.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/ClassWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -3,7 +3,7 @@ import java.util.List; import org.jbpm.api.Problem; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.env.Environment; /** * Tests for the ClassDescriptor @@ -89,7 +89,7 @@ Object o = wireContext.get("o"); assertNotNull(o); - assertEquals(org.jbpm.api.env.Environment.class, o); + assertEquals(org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.wire; -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.env.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; 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/test/java/org/jbpm/pvm/internal/wire/ContextTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -16,9 +16,9 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireObjectEventInfo; 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -23,10 +23,10 @@ import java.util.List; -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.env.Context; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.test.BaseJbpmTestCase; Deleted: 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentDbTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -1,152 +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.pvm.test; - -import java.lang.reflect.Field; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.jbpm.pvm.internal.session.DbSession; -import org.jbpm.test.Db; - - -/** for tests that use persistence inside environment blocks. - * - * An environment is opened in the setUp and closed in the tearDown. - * DB is cleaned inbetween tests. Extra convenience methods for usage - * inside an environment block are provided. - * - * @author Tom Baeyens - */ -public abstract class EnvironmentDbTestCase extends EnvironmentTestCase { - - Transaction transaction = null; - - public EnvironmentDbTestCase() { - } - - public EnvironmentDbTestCase(String configResource) { - super(configResource); - } - - public void setUp() throws Exception { - if (isEnvironmentFactoryCached()) { - Db.clean(getEnvironmentFactory()); - } - super.setUp(); - beginTransaction(); - } - - public void tearDown() throws Exception { - commitTransaction(); - super.tearDown(); - } - - void beginTransaction() { - Session session = environment.get(Session.class); - transaction = session.beginTransaction(); - } - - void commitTransaction() { - transaction.commit(); - transaction = null; - } - - void rollbackTransaction() { - transaction.rollback(); - transaction = null; - } - - public DbSession getDbSession() { - return environment.get(DbSession.class); - } - - public void rollbackAndBeginNewTransaction() { - rollbackTransaction(); - closeEnvironment(); - openEnvironment(); - beginTransaction(); - } - - public void newTransaction() { - try { - commitTransaction(); - closeEnvironment(); - } finally { - openEnvironment(); - beginTransaction(); - } - } - - public void beginCacheTest() { - SessionFactory sessionFactory = environment.get(SessionFactory.class); - if (sessionFactory != null) { - log.debug("================================================================="); - log.debug("Beginning of the cache test, no more sql query should be performed before the end of the test"); - log.debug("================================================================="); - - sessionFactory.getStatistics().clear(); - sessionFactory.getStatistics().setStatisticsEnabled(true); - } - } - - public void endCacheTest() { - SessionFactory sessionFactory = environment.get(SessionFactory.class); - if (sessionFactory != null) { - assertEquals(0, sessionFactory.getStatistics().getEntityLoadCount()); - assertEquals(0, sessionFactory.getStatistics().getCollectionLoadCount()); - } - } - - public <T> T reload(Object object, Class<T> persistentClass) { - environment.get(DbSession.class).save(object); - newTransaction(); - - Long dbid = null; - try { - Field dbidField = getDbidField(persistentClass); - dbidField.setAccessible(true); - dbid = (Long) dbidField.get(object); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeException(e); - } - - return environment.get(DbSession.class).get(persistentClass, dbid); - } - - private Field getDbidField(Class<?> clazz) { - Field[] fields = clazz.getDeclaredFields(); - for (int i=0; i<fields.length; i++) { - if ("dbid".equals(fields[i].getName())) { - return fields[i]; - } - } - Class<?> superClass = clazz.getSuperclass(); - if (superClass!=null) { - return getDbidField(superClass); - } - throw new RuntimeException("no dbid field in object to reload"); - } -} 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,7 +26,7 @@ import org.jbpm.api.Configuration; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.test; -import org.jbpm.api.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,10 +27,10 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,7 +24,6 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Jdk14LogFactory; import org.jbpm.internal.log.Log; import org.jbpm.internal.log.LogFormatter; @@ -60,14 +59,12 @@ Throwable exception; protected void setUp() throws Exception { - assertNull("there is already an environment open", Environment.getCurrent()); LogFormatter.resetIndentation(); log.debug("=== starting "+getName()+" ============================="); } protected void tearDown() throws Exception { log.debug("=== ending "+getName()+" =============================\n"); - assertNull("there is still an environment open", Environment.getCurrent()); } public void assertTextPresent(String expected, String value) { 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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,10 @@ package org.jbpm.test; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.hibernate.Hibernate; import org.hibernate.SQLQuery; @@ -36,7 +38,6 @@ import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.Table; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.internal.log.Log; @@ -47,29 +48,21 @@ private static final Log log = Log.getLog(Db.class.getName()); - private static final String TABLE_NAMES_KEY = "tableNames"; - private static final String CLEAN_SQL_KEY = "cleanSql"; - + static Map<ProcessEngine, String[]> cleanSqlCache = new HashMap<ProcessEngine, String[]>(); + static Map<ProcessEngine, String[]> tableNamesCache = new HashMap<ProcessEngine, String[]>(); + public static void clean(ProcessEngine processEngine) { - clean((EnvironmentFactory) processEngine); - } - - public static String verifyClean(ProcessEngine processEngine) { - return verifyClean((EnvironmentFactory) processEngine); - } - - public static void clean(EnvironmentFactory environmentFactory) { - SessionFactory sessionFactory = environmentFactory.get(SessionFactory.class); + SessionFactory sessionFactory = processEngine.get(SessionFactory.class); // when running this with a remote ejb invocation configuration, there is no // session factory and no cleanup needs to be done if (sessionFactory==null) { return; } - String[] cleanSql = (String[]) environmentFactory.get(CLEAN_SQL_KEY); + String[] cleanSql = cleanSqlCache.get(processEngine); if (cleanSql == null) { - Configuration configuration = environmentFactory.get(Configuration.class); + Configuration configuration = processEngine.get(Configuration.class); SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory; Dialect dialect = sessionFactoryImplementor.getDialect(); @@ -132,7 +125,7 @@ cleanSql = (String[]) cleanSqlList.toArray(new String[cleanSqlList.size()]); - environmentFactory.set(CLEAN_SQL_KEY, cleanSql); + cleanSqlCache.put(processEngine, cleanSql); } Session session = sessionFactory.openSession(); @@ -146,18 +139,18 @@ } } - public static String verifyClean(EnvironmentFactory environmentFactory) { - SessionFactory sessionFactory = environmentFactory.get(SessionFactory.class); + public static String verifyClean(ProcessEngine processEngine) { + SessionFactory sessionFactory = processEngine.get(SessionFactory.class); // when running this with a remote ejb invocation configuration, there is no // session factory and no cleanup needs to be done if (sessionFactory==null) { return null; } - String[] tableNames = (String[]) environmentFactory.get(TABLE_NAMES_KEY); + String[] tableNames = tableNamesCache.get(processEngine); if (tableNames == null) { - Configuration configuration = environmentFactory.get(Configuration.class); + Configuration configuration = processEngine.get(Configuration.class); // loop over all foreign key constraints List<String> tableNamesList = new ArrayList<String>(); @@ -171,7 +164,7 @@ tableNames = tableNamesList.toArray(new String[tableNamesList.size()]); - environmentFactory.set(TABLE_NAMES_KEY, tableNames); + tableNamesCache.put(processEngine, tableNames); } String recordsLeftMsg = ""; @@ -191,7 +184,7 @@ } if (recordsLeftMsg.length()>0) { - clean(environmentFactory); + clean(processEngine); } return recordsLeftMsg; Modified: jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/ConcurrentJbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/ConcurrentJbpmTestCase.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/ConcurrentJbpmTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,7 +24,7 @@ */ package org.jbpm.test.concurrent; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/SynchronizableCommandExecutor.java =================================================================== --- jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/SynchronizableCommandExecutor.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-concurrent/src/main/java/org/jbpm/test/concurrent/SynchronizableCommandExecutor.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -29,11 +29,11 @@ import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; -import org.jbpm.api.env.Environment; -import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.api.job.Job; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; +import org.jbpm.pvm.internal.env.Environment; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.tx.StandardTransaction; /** Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.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/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,10 +25,10 @@ import java.util.List; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.OpenProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -29,10 +29,10 @@ import org.jbpm.api.Execution; import org.jbpm.api.activity.ActivityExecution; import org.jbpm.api.activity.ExternalActivityBehaviour; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import org.hibernate.Session; import org.jbpm.api.Execution; -import org.jbpm.api.env.Environment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -26,10 +26,10 @@ import java.util.List; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.MessageSession; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,10 +21,10 @@ */ package org.jbpm.test.load.async; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.model.CommentImpl; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,9 +25,9 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.env.Environment; import org.jbpm.api.job.Job; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.MessageSession; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,9 +21,9 @@ */ package org.jbpm.test.load.async; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.session.DbSession; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -21,8 +21,8 @@ */ package org.jbpm.test.load.async; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -27,9 +27,9 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -24,8 +24,8 @@ import java.util.Random; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,9 +25,9 @@ import java.util.List; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.model.CommentImpl; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -22,8 +22,8 @@ package org.jbpm.test.load.messages; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.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-06-23 18:44:34 UTC (rev 5098) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-06-23 20:29:56 UTC (rev 5099) @@ -25,12 +25,12 @@ import java.util.List; import org.hibernate.Session; -import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CompositeCmd; import org.jbpm.pvm.internal.cmd.SendMessageCmd; +import org.jbpm.pvm.internal.env.Environment; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.model.CommentImpl;