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

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Nov 17 10:05:44 EST 2008


Author: tom.baeyens at jboss.com
Date: 2008-11-17 10:05:43 -0500 (Mon, 17 Nov 2008)
New Revision: 2961

Added:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/
Removed:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
   jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.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/test/EnterpriseTimerSessionTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.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/DeployCmd.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/FindLatestProcessDefinitionCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.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/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/StartExecutionCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.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/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/PvmEnvironmentFactoryParser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/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/ExecuteJobCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/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/Blob.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.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/op/ExecuteNode.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/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/CommandProcessService.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/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/type/matcher/HibernateIdMatcher.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/binding/ContextRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.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/JobExecutorDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.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/jobexecutor/ExclusiveTestCommand.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.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/type/VariableAutoTypeResolutionTest.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/samples/ExamplesConfiguration.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java
   jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java
   jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java
   jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
   jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java
Log:
removed pvm from api package names

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/Activity.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/Activity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.activity;
+package org.jbpm.activity;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,19 +19,19 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.activity;
+package org.jbpm.activity;
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.ObservableElement;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.model.Transition;
-import org.jbpm.pvm.processlog.ProcessLog;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.env.Environment;
+import org.jbpm.model.Node;
+import org.jbpm.model.ObservableElement;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.Transition;
+import org.jbpm.processlog.ProcessLog;
+import org.jbpm.session.PvmDbSession;
 
 
 /** view upon an {@link Execution path of execution} exposed to 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ExternalActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.activity;
+package org.jbpm.activity;
 
 import java.util.Map;
 

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientExecution.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,15 +19,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.client;
+package org.jbpm.client;
 
 import java.util.Map;
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.model.OpenExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.model.OpenExecution;
 
 /** view upon an {@link Execution path of execution} exposed to 
  * external clients.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessDefinition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,10 +19,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.client;
+package org.jbpm.client;
 
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.model.OpenProcessDefinition;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.OpenProcessDefinition;
 
 
 /** adds factory methods for creating and beginning new process instances.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientProcessInstance.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.client;
+package org.jbpm.client;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/Command.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 public interface Command<T> extends Serializable {
   

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Context.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.env;
+package org.jbpm.env;
 
 import java.util.Set;
 

Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,268 +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.env;
-
-import java.io.Serializable;
-import java.util.Stack;
-
-import org.jbpm.PvmException;
-
-
-/**
- * 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>environment-factory</b>: The environment-factory context is used to store e.g. data sources,
- *     session factories and other static resources needed by an application.
- *     The environment-factory context lives for the complete duration of the {@link EnvironmentFactory}.  
- *     So if the {@link EnvironmentFactory} is maintained in a static member field, the 
- *     environment-factory context lives for the duration of the application.
- *     The same environment-factory 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
- * 'processDefinition-execution', 'processDefinition-definition' and 'environment-factory' in the given order.
- * That way, a global adminEmailAddress can be specified in the environment-factory context 
- * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution.
- * </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 addContext(Context context);
-  public abstract void removeContext(Context context);
-  
-  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 PvmException("no environment to get "+type.getName());
-      }
-      return null;
-    }
-    T object = environment.get(type);
-    if (object==null) {
-      if (required) {
-        throw new PvmException("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 PvmException("no environment to get '"+name+"'");
-      }
-      return null;
-    }
-    Object object = environment.get(name);
-    if (object==null) {
-      if (required) {
-        throw new PvmException("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) */ 
-  protected 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);
-  }
-}

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java (from rev 2735, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java	                        (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -0,0 +1,268 @@
+/*
+ * 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.env;
+
+import java.io.Serializable;
+import java.util.Stack;
+
+import org.jbpm.PvmException;
+
+
+/**
+ * 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>environment-factory</b>: The environment-factory context is used to store e.g. data sources,
+ *     session factories and other static resources needed by an application.
+ *     The environment-factory context lives for the complete duration of the {@link EnvironmentFactory}.  
+ *     So if the {@link EnvironmentFactory} is maintained in a static member field, the 
+ *     environment-factory context lives for the duration of the application.
+ *     The same environment-factory 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
+ * 'processDefinition-execution', 'processDefinition-definition' and 'environment-factory' in the given order.
+ * That way, a global adminEmailAddress can be specified in the environment-factory context 
+ * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution.
+ * </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 addContext(Context context);
+  public abstract void removeContext(Context context);
+  
+  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 PvmException("no environment to get "+type.getName());
+      }
+      return null;
+    }
+    T object = environment.get(type);
+    if (object==null) {
+      if (required) {
+        throw new PvmException("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 PvmException("no environment to get '"+name+"'");
+      }
+      return null;
+    }
+    Object object = environment.get(name);
+    if (object==null) {
+      if (required) {
+        throw new PvmException("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);
+  }
+}

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentFactory.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentFactory.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.env;
+package org.jbpm.env;
 
 import java.io.InputStream;
 import java.io.Serializable;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/EnvironmentHelper.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.env;
+package org.jbpm.env;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Transaction.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Transaction.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.env;
+package org.jbpm.env;
 
 import javax.transaction.Synchronization;
 

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/EventListener.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListener.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.listener;
+package org.jbpm.listener;
 
 import java.io.Serializable;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/EventListenerExecution.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,15 +19,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.listener;
+package org.jbpm.listener;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.ObservableElement;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.model.Transition;
-import org.jbpm.pvm.processlog.ProcessLog;
+import org.jbpm.activity.Activity;
+import org.jbpm.model.Event;
+import org.jbpm.model.ObservableElement;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.Transition;
+import org.jbpm.processlog.ProcessLog;
 
 
 /** view upon an {@link Execution path of execution} exposed to 

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Comment.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Comment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.Date;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/CompositeElement.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/CompositeElement.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.List;
 import java.util.Map;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Condition.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,11 +19,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.io.Serializable;
 
-import org.jbpm.pvm.listener.EventListenerExecution;
+import org.jbpm.listener.EventListenerExecution;
 
 /** user code that reflects a runtime calculation of a boolean value.
  * Used for {@link Transition#getCondition() transition guard conditions} and 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Discussable.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Discussable.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.List;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Event.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Event.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 
 /** event constants.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import org.jbpm.Execution;
 import org.jbpm.ProcessDefinition;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/IdGenerator.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import org.jbpm.Execution;
 import org.jbpm.ProcessDefinition;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Node.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Node.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.List;
 import java.util.Map;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ObservableElement.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ObservableElement.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.Set;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/OpenExecution.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.Collection;
 import java.util.Map;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import org.jbpm.ProcessDefinition;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/Transition.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Transition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.model;
+package org.jbpm.model;
 
 import java.util.Set;
 

Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog (from rev 2734, jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog)

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/LogSessionChain.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionChain.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,12 +19,12 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.pvm.session.LogSession;
+import org.jbpm.session.LogSession;
 
 
 /** log session that delegates to a delegate list of log sessions.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/LogSessionFilter.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/LogSessionFilter.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,9 +19,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
-import org.jbpm.pvm.session.LogSession;
+import org.jbpm.session.LogSession;
 
 
 /** filtering log session.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLog.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
 import java.util.Date;
 import java.util.List;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,15 +19,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.session.LogSession;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.session.LogSession;
 
 /** base class for process logs.  Process logs are dispatched to the 
  * {@link LogSession} that is configured in the environment.

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogProperty.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogProperty.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ProcessLogXmlSerializer.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.processlog;
+package org.jbpm.processlog;
 
 import java.text.SimpleDateFormat;
 import java.util.List;

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

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/DbSession.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/DbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.session;
+package org.jbpm.session;
 
 
 /**

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/LogSession.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/LogSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,9 +19,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.session;
+package org.jbpm.session;
 
-import org.jbpm.pvm.processlog.ProcessLog;
+import org.jbpm.processlog.ProcessLog;
 
 public interface LogSession {
   

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/MessageSession.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/MessageSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.session;
+package org.jbpm.session;
 
 import org.jbpm.job.Message;
 

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/PvmDbSession.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/PvmDbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,16 +19,16 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.session;
+package org.jbpm.session;
 
 import java.util.List;
 
 import org.jbpm.Execution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.job.Job;
 import org.jbpm.job.Message;
 import org.jbpm.job.Timer;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 
 /**
  * @author Tom Baeyens, Pascal Verdage

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/session/TimerSession.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/TimerSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jbpm.pvm.session;
+package org.jbpm.session;
 
 import org.jbpm.job.Timer;
 

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -33,9 +33,9 @@
 import org.jbpm.Configuration;
 import org.jbpm.cfg.JbpmConfiguration;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
 
 /**
  * Stateless session command executor.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,11 +25,11 @@
 import javax.ejb.RemoveException;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
 import org.jbpm.job.Timer;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.TimerSession;
 
 /**
  * Timer session based on the EJB 2.1 timer service.

Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,10 +24,10 @@
 import java.util.Date;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -34,16 +34,16 @@
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
 import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
 import org.jbpm.enterprise.test.custom.HappyActivity;
+import org.jbpm.env.Environment;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
 import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.TimerSession;
 
 /**
  * Server-side test for the enterprise

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -37,18 +37,18 @@
 import org.jbpm.enterprise.internal.ejb.TimerEB;
 import org.jbpm.enterprise.test.custom.HappyActivity;
 import org.jbpm.enterprise.test.custom.NoisyActivity;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
 import org.jbpm.pvm.internal.cmd.GetVariablesCmd;
 import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 /**
  * Server-side test for the {@linkplain TimerEB timerImpl bean}. The local

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 import java.util.Date;
 
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.internal.job.TimerImpl;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/InsertPhraseCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import java.sql.SQLException;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.DbSession;
 
 /**
  * @author Alejandro Guizar

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,9 +24,9 @@
 import java.sql.SQLException;
 import java.util.Date;
 
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
 import org.jbpm.pvm.internal.job.TimerImpl;
 
 /**

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/RemovePhraseCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,7 +27,7 @@
 import org.hibernate.criterion.Restrictions;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 /**
  * @author Alejandro Guizar

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ExpressionResolver.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,6 +1,6 @@
 package org.jbpm.el;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 public interface ExpressionResolver {
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/JpdlProcessDefinition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl;
 
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionConditionActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,9 +25,9 @@
 
 import org.jbpm.jpdl.JpdlException;
 import org.jbpm.jpdl.JpdlExecution;
-import org.jbpm.pvm.model.Condition;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.Transition;
+import org.jbpm.model.Condition;
+import org.jbpm.model.Node;
+import org.jbpm.model.Transition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionExpressionActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,11 +22,11 @@
 package org.jbpm.jpdl.activity;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.EnvironmentHelper;
 import org.jbpm.jpdl.JpdlExecution;
-import org.jbpm.pvm.env.EnvironmentHelper;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;
-import org.jbpm.pvm.model.Transition;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/DecisionHandlerActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,16 +22,16 @@
 package org.jbpm.jpdl.activity;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentHelper;
 import org.jbpm.jpdl.DecisionHandler;
 import org.jbpm.jpdl.JpdlException;
 import org.jbpm.jpdl.JpdlExecution;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentHelper;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.pvm.model.Transition;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.jpdl.activity;
 
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.jpdl.JpdlExecution;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,9 +24,9 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 import org.jbpm.jpdl.JpdlExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,9 +26,9 @@
 import java.util.Enumeration;
 import java.util.List;
 
+import org.jbpm.activity.Activity;
 import org.jbpm.jpdl.JpdlProcessDefinition;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.internal.model.TransitionImpl;

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,9 +21,9 @@
  */
 package org.jbpm.jpdl;
 
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.xml.JpdlParser;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.jpdl.controlflow;
 
 import org.jbpm.PvmException;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.JpdlTestCase;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,11 +21,11 @@
  */
 package org.jbpm.jpdl.controlflow;
 
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.DecisionHandler;
 import org.jbpm.jpdl.JpdlExecution;
 import org.jbpm.jpdl.JpdlTestCase;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.jpdl.controlflow;
 
 import org.jbpm.PvmException;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.JpdlTestCase;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.xml.Problem;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,7 +23,7 @@
 
 import java.util.List;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.xml.Problem;
 
 /**

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Node;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.xml.Problem;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.Transition;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -33,10 +33,10 @@
 import org.jbpm.ProcessService;
 import org.jbpm.ResourceManager;
 import org.jbpm.TaskService;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.env.PvmEnvironment;
 import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser;
 import org.jbpm.pvm.internal.stream.FileStreamSource;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,7 +24,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.spring.SpringEnvironment;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.springframework.context.ApplicationContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,7 +26,7 @@
 import org.jbpm.Execution;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,12 +21,12 @@
  */
 package org.jbpm.pvm.internal.cmd;
 
+import org.jbpm.client.ClientExecution;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.jbpm.ProcessDefinition;
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.deploy.DeployerManager;
 
 /**

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,9 +24,9 @@
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.cmd;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.model.OpenProcessDefinition;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,10 +23,10 @@
 
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.model.OpenProcessDefinition;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import java.util.List;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
+import org.jbpm.env.Environment;
 import org.jbpm.job.Message;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 import java.util.List;
 
+import org.jbpm.env.Environment;
 import org.jbpm.job.Timer;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,10 +26,10 @@
 import java.util.Map;
 
 import org.jbpm.PvmException;
+import org.jbpm.client.ClientExecution;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.env.Environment;
 
 
 /**

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,11 +25,11 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
+import org.jbpm.client.ClientExecution;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,10 +25,10 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.env.Environment;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,10 +25,10 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.env.Environment;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,12 +22,12 @@
 package org.jbpm.pvm.internal.deploy;
 
 import org.jbpm.PvmException;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 import org.jbpm.ProcessDefinition;
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 
 /**

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,9 +26,9 @@
 import java.util.Map;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
 
 
 /**

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.env.Context;
+import org.jbpm.env.Context;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 
 public class ExecutionContext implements Context {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JobContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jbpm.pvm.env.Context;
+import org.jbpm.env.Context;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 public class JobContext implements Context {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
+import org.jbpm.env.Context;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Context;
 import org.jbpm.pvm.internal.util.Closable;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Context;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.stream.StreamSource;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Set;
 
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 
 public class WebRequestContext implements Context {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,7 +23,7 @@
 
 import java.util.Set;
 
-import org.jbpm.pvm.env.Context;
+import org.jbpm.env.Context;
 
 public class WebSessionContext implements Context {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateDbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,7 +25,7 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.Session;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,12 +25,12 @@
 
 import org.hibernate.Query;
 import org.jbpm.Execution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.job.Job;
 import org.jbpm.job.Message;
 import org.jbpm.job.Timer;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.PvmDbSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,8 +28,8 @@
 
 import org.jbpm.PvmException;
 import org.jbpm.job.Message;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.MessageSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.MessageSession;
 
 /** message service implementation based on JMS.
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.job;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,10 +25,11 @@
 import java.util.Date;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.job.Timer;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.internal.cal.BusinessCalendar;
 import org.jbpm.pvm.internal.cal.Duration;
 import org.jbpm.pvm.internal.env.JobContext;
@@ -36,8 +37,7 @@
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.model.ObservableElement;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 /** a runtime timer instance.
  * 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -29,8 +29,8 @@
 import java.util.List;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,10 +27,10 @@
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.job.Job;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import java.util.Date;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -4,8 +4,8 @@
 
 import org.jbpm.Execution;
 import org.jbpm.pvm.internal.job.JobImpl;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.MessageSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.MessageSession;
 
 /** internal interface used by the jobImpl executor and the 
  * implementations of {@link MessageSession} and {@link TimerSession}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -30,9 +30,9 @@
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
 import org.jbpm.pvm.internal.job.JobImpl;
 
 /**  

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,13 +22,13 @@
 package org.jbpm.pvm.internal.jobexecutor;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.job.Message;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
 import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.MessageSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.MessageSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -32,7 +32,7 @@
 import org.jbpm.Configuration;
 import org.jbpm.PvmException;
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 
 /**
  * starts the jobImpl 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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -14,11 +14,11 @@
 package org.jbpm.pvm.internal.jobexecutor;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Transaction;
 import org.jbpm.job.Timer;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Transaction;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.TimerSession;
 
 /**
  * Timers created with this service are committed at the end of the transaction,

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 public class Blob implements Serializable {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Clob.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 public class Clob {
 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,10 +28,10 @@
 import java.util.List;
 
 import org.jbpm.PvmException;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.util.Clock;
 import org.jbpm.pvm.internal.util.EqualsUtil;
-import org.jbpm.pvm.model.Comment;
 
 public class CommentImpl implements Serializable, Comment {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,8 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.pvm.model.CompositeElement;
-import org.jbpm.pvm.model.Node;
+import org.jbpm.model.CompositeElement;
+import org.jbpm.model.Node;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.hibernate.Session;
 import org.jbpm.Execution;
 import org.jbpm.ProcessDefinition;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.model.IdGenerator;
+import org.jbpm.env.Environment;
+import org.jbpm.model.IdGenerator;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,9 +25,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jbpm.listener.EventListener;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.model.Event;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.pvm.listener.EventListener;
+import org.jbpm.listener.EventListener;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,13 +28,13 @@
 
 import org.jbpm.PvmException;
 import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
+import org.jbpm.listener.EventListener;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.model.op.MoveToChildNode;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,10 +27,10 @@
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
-import org.jbpm.pvm.env.Transaction;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.env.Transaction;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -37,12 +37,22 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.env.Environment;
 import org.jbpm.job.Timer;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.model.Comment;
+import org.jbpm.model.Event;
+import org.jbpm.model.IdGenerator;
+import org.jbpm.model.Node;
+import org.jbpm.model.ObservableElement;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.Transition;
+import org.jbpm.processlog.ProcessLog;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.job.TimerImpl;
 import org.jbpm.pvm.internal.model.op.AtomicOperation;
@@ -61,19 +71,9 @@
 import org.jbpm.pvm.internal.util.Clock;
 import org.jbpm.pvm.internal.util.EqualsUtil;
 import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Comment;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.IdGenerator;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.ObservableElement;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.model.Transition;
-import org.jbpm.pvm.processlog.ProcessLog;
-import org.jbpm.pvm.session.LogSession;
-import org.jbpm.pvm.session.MessageSession;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.LogSession;
+import org.jbpm.session.MessageSession;
+import org.jbpm.session.TimerSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,10 +27,10 @@
 import java.util.Map;
 
 import org.jbpm.PvmException;
-import org.jbpm.pvm.activity.Activity;
+import org.jbpm.activity.Activity;
+import org.jbpm.model.Node;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.Transition;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObservableElementImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.ObservableElement;
+import org.jbpm.model.Event;
+import org.jbpm.model.ObservableElement;
 
 
 /** observable and visible process elements.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,12 +28,12 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.lob.Blob;
 import org.jbpm.pvm.internal.util.IoUtil;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessElementImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,8 +28,8 @@
 import java.util.Set;
 
 import org.jbpm.log.Log;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 
 /** 
  * superclass for {@link NodeImpl}, {@link TransitionImpl} and {@link ProcessDefinitionImpl}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jbpm.pvm.model.Node;
+import org.jbpm.model.Node;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,11 +23,11 @@
 
 import java.util.List;
 
+import org.jbpm.model.Condition;
+import org.jbpm.model.Event;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.pvm.model.Condition;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.Transition;
 
 
 /** 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.io.Serializable;
 
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.env.PvmEnvironment;
 import org.jbpm.pvm.internal.type.Type;
 import org.jbpm.pvm.internal.wire.Descriptor;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
+import org.jbpm.activity.Activity;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestinationMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import java.util.Map;
 
 import org.jbpm.PvmException;
+import org.jbpm.activity.ExternalActivity;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.ExternalActivity;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,13 +25,13 @@
 import java.util.List;
 
 import org.jbpm.log.Log;
+import org.jbpm.model.Condition;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.model.ObservableElementImpl;
 import org.jbpm.pvm.internal.model.TransitionImpl;
-import org.jbpm.pvm.model.Condition;
-import org.jbpm.pvm.model.Event;
 
 public class TakeTransition implements AtomicOperation {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransitionMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.model.op;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.model.ExecutionImpl;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -29,8 +29,8 @@
 import javax.script.Bindings;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -29,7 +29,7 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.env.ExecutionContext;
 import org.jbpm.pvm.internal.env.ExecutionEnvironment;
 import org.jbpm.pvm.internal.wire.WireContext;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.spring;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.hibernate.Session;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 import org.springframework.transaction.support.TransactionTemplate;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.spring;
 
 import org.jbpm.cfg.SpringConfiguration;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.env.BasicEnvironment;
 import org.springframework.context.ApplicationContext;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,7 +23,7 @@
 
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.MessageSession;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,7 +23,7 @@
 
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 public interface AuthorizationSession {
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,13 +27,13 @@
 import org.jbpm.ProcessDefinition;
 import org.jbpm.ProcessService;
 import org.jbpm.cmd.CommandService;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
 import org.jbpm.pvm.internal.cmd.DeployCmd;
 import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionCmd;
 import org.jbpm.pvm.internal.cmd.FindProcessDefinitionCmd;
 import org.jbpm.pvm.internal.cmd.FindProcessDefinitionNamesCmd;
 import org.jbpm.pvm.internal.cmd.FindProcessDefinitionsCmd;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 
 /** {@link ProcessService} implementation that delegates execution of the 
  * methods to a {@link CommandService}.

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.svc;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 
 
 /** sets up an environment around the execution of the command.

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,8 +27,8 @@
 
 import javax.transaction.Synchronization;
 
+import org.jbpm.env.Transaction;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.type.Type;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.type.Matcher;
 
 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -10,8 +10,8 @@
 import java.util.List;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -29,12 +29,12 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jbpm.activity.Activity;
 import org.jbpm.cfg.JbpmConfiguration;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.model.ProcessElementImpl;
 import org.jbpm.pvm.internal.util.Closable;
 import org.jbpm.pvm.internal.util.DefaultObservable;
@@ -73,7 +73,7 @@
  * </p>
  * 
  * <p>Another usage of the WireContext is construction and configuration of user 
- * code objects in a persistable way.  {@link Activity}s and {@link org.jbpm.pvm.activity.ExternalActivity}
+ * code objects in a persistable way.  {@link Activity}s and {@link org.jbpm.activity.ExternalActivity}
  * and other user code can be instantiated with a WireContext.  That way, they can 
  * be persisted in a fixed schema.    
  * </p>

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ContextRefBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.Context;
+import org.jbpm.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/EnvironmentFactoryRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.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/EnvironmentRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentRefBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.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/MessageSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -30,8 +30,8 @@
 import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.MessageSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.MessageSession;
 import org.w3c.dom.Element;
 
 /** parses a descriptor for creating a {@link MessageSession}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TimerSessionBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -31,7 +31,7 @@
 import org.jbpm.pvm.internal.wire.descriptor.TransactionRefDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.TimerSession;
 import org.w3c.dom.Element;
 
 /** parses a descriptor for creating a {@link TimerSession}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.env.Transaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionRefBinding.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.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/descriptor/ContextRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.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/EnvironmentDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,6 +1,6 @@
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.wire.WireContext;
 
 /** the {@link EnvironmentFactory} of the current {@link WireContext}.

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentInterceptorDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.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/EnvironmentTypeRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,8 +25,8 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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/JobExecutorDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -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.pvm.env.EnvironmentFactory
+ * @see org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -8,8 +8,8 @@
 import java.util.List;
 
 import org.jbpm.PvmException;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.util.ArrayUtil;
 import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.wire.Descriptor;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.wire.descriptor;
 
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,7 +1,7 @@
 package org.jbpm.pvm.internal.wire.operation;
 
+import org.jbpm.env.Transaction;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -4,9 +4,9 @@
 import java.util.List;
 import java.util.Set;
 
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.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/main/java/org/jbpm/pvm/model/ProcessFactory.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,8 +28,11 @@
 
 import org.jbpm.ProcessDefinition;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.activity.Activity;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListener;
+import org.jbpm.model.Condition;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.model.CompositeElementImpl;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.EventListenerReference;
@@ -46,7 +49,6 @@
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
-import org.jbpm.pvm.listener.EventListener;
 
 /** factory for process definitions.
  * 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.example03.AutomaticActivity;
 import org.jbpm.pvm.example03.WaitState;
 import org.jbpm.pvm.model.ProcessFactory;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,16 +25,16 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.ObservableElement;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Event;
+import org.jbpm.model.Node;
+import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,18 +25,18 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Event;
+import org.jbpm.model.Node;
+import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.ObservableElement;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,13 +23,13 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Event;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,11 +25,11 @@
 
 import org.jbpm.Execution;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,12 +22,13 @@
 package org.jbpm.pvm.api.basicfeatures;
 
 import junit.framework.TestCase;
+
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;
 import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
 import org.jbpm.pvm.samples.ex04.Decision;
 import org.jbpm.pvm.model.ProcessFactory;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,15 +25,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.OpenExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Node;
+import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -4,11 +4,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,11 +24,11 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,12 +24,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.OpenExecution;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Node;
+import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,11 +24,11 @@
 import java.util.Map;
 
 import org.jbpm.PvmException;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.OpenExecution;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,11 +23,11 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,13 +23,13 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Condition;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Condition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -6,15 +6,15 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.OpenExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Node;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.model.Transition;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,13 +25,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
-import org.jbpm.pvm.model.Event;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,11 +26,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -17,11 +17,11 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.OldDbTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/AutomaticActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.api.db.continuation;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 /** a node behaviour implementation that records its execution and then 
  * just proceeds.

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -31,18 +31,18 @@
 import junit.framework.Test;
 
 import org.hibernate.Session;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.OldDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -32,8 +32,8 @@
 import org.jbpm.ExecutionService;
 import org.jbpm.ProcessDefinition;
 import org.jbpm.ProcessService;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.OldDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 public class WaitState implements ExternalActivity {
   private static final long serialVersionUID = 1L;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.api.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.api.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.api.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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/api/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.api.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.api.env;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.test.JbpmTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import org.hibernate.Session;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.test.JbpmTestCase;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/IncrementCounterWaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -15,9 +15,9 @@
 
 import java.util.Map;
 
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
 
 /**
  * @author Pascal Verdage

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TestTimerSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,10 +25,10 @@
 import java.util.Date;
 import java.util.List;
 
+import org.jbpm.env.Environment;
 import org.jbpm.job.Timer;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.TimerImpl;
-import org.jbpm.pvm.session.TimerSession;
+import org.jbpm.session.TimerSession;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -5,7 +5,7 @@
 import org.jbpm.ManagementService;
 import org.jbpm.ProcessService;
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 
 /**
  * @author Pascal Verdage

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,21 +21,21 @@
 import org.jbpm.Execution;
 import org.jbpm.ExecutionService;
 import org.jbpm.ProcessService;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.env.Environment;
 import org.jbpm.job.JobTestHelper;
 import org.jbpm.job.Timer;
+import org.jbpm.model.OpenExecution;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -30,8 +30,8 @@
 import org.hibernate.Session;
 import org.jbpm.PvmException;
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.type.variable.StringVariable;
 import org.jbpm.test.OldDbTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/AutomaticActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example01;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/ObjectExecutionModeTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,9 +25,9 @@
 import org.jbpm.ExecutionService;
 import org.jbpm.ManagementService;
 import org.jbpm.ProcessService;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.env.EnvironmentFactory;
 import org.jbpm.pvm.example01.AutomaticActivity;
 import org.jbpm.pvm.example01.WaitState;
 import org.jbpm.pvm.model.ProcessFactory;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example03;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 /** a node behaviour implementation that records its execution and then 
  * just proceeds.

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.example03;
 
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example04;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 public class Display implements Activity {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.example04;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example05;
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 public class WaitState implements ExternalActivity {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example06;
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.example04.Display;
 import org.jbpm.pvm.example05.WaitState;
 import org.jbpm.pvm.model.ProcessFactory;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,13 +23,13 @@
 
 import javax.enterprise.deploy.spi.exceptions.ClientExecuteException;
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.example01.AutomaticActivity;
 import org.jbpm.pvm.example01.WaitState;
 import org.jbpm.pvm.example04.Display;
 import org.jbpm.pvm.example04.TestConsole;
-import org.jbpm.pvm.model.Event;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/PrintLn.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example07;
 
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
 
 
 public class PrintLn implements EventListener {

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/DisplaySource.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.example08;
 
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
 
 public class DisplaySource implements EventListener {
   

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,11 +24,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.example01.WaitState;
 import org.jbpm.pvm.example04.TestConsole;
-import org.jbpm.pvm.model.Event;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/AddressActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,10 +22,10 @@
 package org.jbpm.pvm.internal.db.langext;
 
 
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.env.Environment;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,11 +28,11 @@
 import junit.framework.TestSuite;
 
 import org.jbpm.Execution;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.db.type.VariableCustomTypeTest;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,9 +26,9 @@
 
 import junit.framework.Test;
 
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.model.CommentImpl;
-import org.jbpm.pvm.model.Comment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -18,15 +18,15 @@
 import junit.framework.Test;
 
 import org.hibernate.Session;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Node;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.model.Transition;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -18,16 +18,16 @@
 
 import junit.framework.Test;
 
+import org.jbpm.model.Event;
+import org.jbpm.model.Node;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.model.Transition;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.EventListenerReference;
 import org.jbpm.pvm.internal.model.ExceptionHandlerImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.Node;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.model.Transition;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -15,9 +15,9 @@
 
 import junit.framework.Test;
 
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,6 +23,7 @@
 
 import junit.framework.Test;
 
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.internal.model.EventImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.internal.model.VariableDefinitionImpl;
@@ -50,9 +51,8 @@
 import org.jbpm.pvm.internal.wire.descriptor.TrueDescriptor;
 import org.jbpm.pvm.internal.wire.operation.FieldOperation;
 import org.jbpm.pvm.internal.wire.operation.PropertyOperation;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,7 +27,7 @@
 import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.test.EnvironmentDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,9 +28,9 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.type.Variable;
 import org.jbpm.pvm.internal.type.variable.DateVariable;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.expr;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.WaitState;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.pvm.internal.expr;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.script.ScriptManager;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.WaitState;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,14 +28,14 @@
 
 import org.hibernate.Session;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.model.OpenExecution;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,15 +22,15 @@
 package org.jbpm.pvm.internal.jobexecutor;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.job.MessageImpl;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.model.Comment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,12 +22,12 @@
 package org.jbpm.pvm.internal.jobexecutor;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.model.Comment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.jobexecutor;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.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/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -17,13 +17,13 @@
 import java.util.List;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.job.Message;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-import org.jbpm.pvm.session.MessageSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.MessageSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.OldDbTestCase;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -33,23 +33,23 @@
 
 import org.hibernate.Session;
 import org.jbpm.ProcessService;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.job.Job;
 import org.jbpm.log.Log;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
 import org.jbpm.pvm.api.db.svc.ExecutionServiceTest;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.job.CommandMessage;
 import org.jbpm.pvm.internal.job.JobImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.model.Comment;
 import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.session.MessageSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.session.MessageSession;
+import org.jbpm.session.PvmDbSession;
 import org.jbpm.test.OldDbTestCase;
 import org.jbpm.test.EnvironmentFactoryTestSetup;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,12 +25,12 @@
 import java.util.Random;
 
 import org.jbpm.cmd.Command;
+import org.jbpm.env.Environment;
 import org.jbpm.log.Log;
-import org.jbpm.pvm.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;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 /**
  * @author Tom Baeyens

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.test.JbpmTestCase;
 
 /**

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.test.JbpmTestCase;
 

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.internal.tx;
 
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.Transaction;
+import org.jbpm.env.Environment;
+import org.jbpm.env.Transaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.test.JbpmTestCase;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -31,8 +31,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.type.variable.BlobVariable;
 import org.jbpm.pvm.internal.type.variable.ClobVariable;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -2,8 +2,7 @@
 
 import java.util.List;
 
-import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.pvm.internal.wire.WireException;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.xml.Problem;
 
 /**
@@ -83,14 +82,14 @@
   public void testExternalClass() {
     WireContext wireContext = createWireContext(
         "<objects>" +
-        "  <class name='o' class-name='org.jbpm.pvm.env.Environment' />" +
+        "  <class name='o' class-name='"+Environment.class.getName()+"' />" +
         "</objects>"
     );
 
     Object o = wireContext.get("o");
 
     assertNotNull(o);
-    assertEquals(org.jbpm.pvm.env.Environment.class, o);
+    assertEquals(org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -17,8 +17,8 @@
 import java.util.Set;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,8 +1,8 @@
 package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -1,8 +1,8 @@
 package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.pvm.internal.wire;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,9 +24,9 @@
 import java.util.List;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Context;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Context;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.util.Listener;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.test.JbpmTestCase;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,7 +26,7 @@
 import org.jbpm.ManagementService;
 import org.jbpm.ProcessService;
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/AutomaticActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.samples.activities;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/Display.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.samples.activities;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
 
 public class Display implements Activity, EventListener {
   

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/activities/WaitState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;
 import org.jbpm.pvm.samples.activities.WaitState;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,8 +26,8 @@
 import org.jbpm.Execution;
 import org.jbpm.ExecutionService;
 import org.jbpm.ProcessService;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.ExamplesConfiguration;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,8 +26,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.client.ClientProcessInstance;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.WaitState;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/Decision.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,11 +24,11 @@
 import junit.framework.TestCase;
 
 import org.jbpm.Execution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;
 import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/AutomaticCreditRating.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.samples.ex05;
 
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
 
 
 /**

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,10 +24,10 @@
 import junit.framework.TestCase;
 
 import org.jbpm.Execution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.WaitState;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.samples.ex06;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.client.ClientExecution;
 
 public class Task {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskActivity.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 public class TaskActivity implements ExternalActivity {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,13 +23,13 @@
 
 import junit.framework.TestCase;
 
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Event;
+import org.jbpm.model.OpenProcessDefinition;
 import org.jbpm.pvm.samples.activities.AutomaticActivity;
 import org.jbpm.pvm.samples.activities.Console;
 import org.jbpm.pvm.samples.activities.Display;
 import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.model.Event;
-import org.jbpm.pvm.model.OpenProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/Sequence.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.model.Node;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.model.Node;
 
 public class Sequence implements ExternalActivity {
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.Display;
 import org.jbpm.pvm.samples.activities.WaitState;

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/DisplaySource.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,8 +21,8 @@
  */
 package org.jbpm.pvm.samples.ex09;
 
-import org.jbpm.pvm.listener.EventListener;
-import org.jbpm.pvm.listener.EventListenerExecution;
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
 
 public class DisplaySource implements EventListener {
   

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,9 +23,9 @@
 
 import junit.framework.TestCase;
 
-import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.client.ClientExecution;
-import org.jbpm.pvm.model.Event;
+import org.jbpm.client.ClientExecution;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.model.Event;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.pvm.samples.activities.WaitState;
 

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.jbpm.cfg.JbpmConfiguration;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.List;
 
+import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.model.ObservableElement;
 import org.jbpm.task.impl.SwimlaneDefinitionImpl;
 import org.jbpm.task.impl.TaskDefinitionImpl;
 

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,9 +22,9 @@
 package org.jbpm.task.cmd;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.task.Task;
 import org.jbpm.task.db.TaskDbSession;
 import org.jbpm.task.impl.TaskDefinitionImpl;

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.task.cmd;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.DbSession;
 import org.jbpm.task.impl.TaskImpl;
 
 /**

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.task.cmd;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.DbSession;
 import org.jbpm.task.Task;
 import org.jbpm.task.impl.TaskImpl;
 

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,8 +22,8 @@
 package org.jbpm.task.cmd;
 
 import org.jbpm.cmd.Command;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.env.Environment;
+import org.jbpm.session.DbSession;
 import org.jbpm.task.Task;
 
 

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -22,7 +22,7 @@
 package org.jbpm.task.db;
 
 import org.jbpm.pvm.internal.hibernate.HibernateDbSession;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 
 /** persistence interface for tasks.
  * 

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,12 +25,12 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.client.ClientProcessInstance;
+import org.jbpm.client.ClientProcessInstance;
+import org.jbpm.model.Node;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
 import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.pvm.model.Node;
 import org.jbpm.task.TaskException;
 
 /**

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -24,10 +24,10 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.jbpm.model.ObservableElement;
 import org.jbpm.pvm.internal.model.ProcessElementImpl;
 import org.jbpm.pvm.internal.util.Priority;
 import org.jbpm.pvm.internal.wire.Descriptor;
-import org.jbpm.pvm.model.ObservableElement;
 import org.jbpm.task.TaskDefinition;
 
 /**

Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -31,7 +31,8 @@
 import java.util.Set;
 
 import org.jbpm.Execution;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.cal.Duration;
 import org.jbpm.pvm.internal.model.CommentImpl;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -39,7 +40,6 @@
 import org.jbpm.pvm.internal.util.EqualsUtil;
 import org.jbpm.pvm.internal.util.Priority;
 import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.pvm.model.Comment;
 import org.jbpm.task.Role;
 import org.jbpm.task.Swimlane;
 import org.jbpm.task.Task;

Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,12 +28,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.util.Clock;
 import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.pvm.model.Comment;
-import org.jbpm.pvm.session.DbSession;
+import org.jbpm.session.DbSession;
 import org.jbpm.task.impl.RoleImpl;
 import org.jbpm.task.impl.SwimlaneImpl;
 import org.jbpm.task.impl.TaskDefinitionImpl;

Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,7 +27,7 @@
 import org.hibernate.Session;
 import org.jbpm.cmd.Command;
 import org.jbpm.cmd.CommandService;
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 import org.jbpm.task.impl.TaskImpl;
 import org.jbpm.test.DbTestCase;
 

Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -28,11 +28,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.model.Comment;
 import org.jbpm.pvm.internal.util.Clock;
 import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.pvm.model.Comment;
 import org.jbpm.task.impl.RoleImpl;
 import org.jbpm.task.impl.SwimlaneImpl;
 import org.jbpm.task.impl.TaskDefinitionImpl;

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	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -34,7 +34,7 @@
 import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.Table;
 import org.jbpm.ProcessEngine;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 
 
 /**

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -27,9 +27,9 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.jbpm.Execution;
-import org.jbpm.pvm.model.OpenProcessDefinition;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
+import org.jbpm.model.OpenProcessDefinition;
+import org.jbpm.session.DbSession;
+import org.jbpm.session.PvmDbSession;
 
 
 /** for tests that use persistence inside environment blocks.

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -26,7 +26,7 @@
 
 import org.jbpm.Configuration;
 import org.jbpm.PvmException;
-import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.env.EnvironmentFactory;
 
 
 /**

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.test;
 
-import org.jbpm.pvm.env.Environment;
+import org.jbpm.env.Environment;
 
 /**
  * @author Tom Baeyens

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -25,11 +25,11 @@
 import junit.framework.TestCase;
 
 import org.jbpm.Configuration;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
 import org.jbpm.log.Jdk14LogFactory;
 import org.jbpm.log.Log;
 import org.jbpm.log.LogFormatter;
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.env.EnvironmentFactory;
 
 public abstract class JbpmTestCase extends TestCase {
 

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java	2008-11-17 14:15:20 UTC (rev 2960)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/BasicExecutionFlowDbTest.java	2008-11-17 15:05:43 UTC (rev 2961)
@@ -18,11 +18,11 @@
 import java.util.Map;
 
 import org.jbpm.Execution;
+import org.jbpm.activity.Activity;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.activity.ExternalActivity;
+import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.pvm.DeploymentImpl;
-import org.jbpm.pvm.activity.Activity;
-import org.jbpm.pvm.activity.ActivityExecution;
-import org.jbpm.pvm.activity.ExternalActivity;
-import org.jbpm.pvm.client.ClientProcessDefinition;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.DbTestCase;




More information about the jbpm-commits mailing list