[jbpm-commits] JBoss JBPM SVN: r2682 - in jbpm4/trunk/modules/pvm/src: main/java/org/jbpm/pvm and 47 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-10-30 11:05:34 -0400 (Thu, 30 Oct 2008) New Revision: 2682 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Configuration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Deployment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Execution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ExecutionService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ManagementService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessDefinition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessEngine.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/PvmException.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ResourceManager.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/TaskService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/package.html jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/DeploymentImpl.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Deployment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Execution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ExecutionService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ManagementService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessDefinition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessEngineImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/PvmException.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/package.html Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/client/ClientExecution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/Environment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/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/FindProcessDefinitionCmd.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/CreateId.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/Deployer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.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/ExecutionEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/log/Jdk14LogFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.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/op/Signal.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/stream/ByteArrayStreamSource.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamSource.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamSource.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamSource.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamSource.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/CommandExecutionService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.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/RetryInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.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/xml/Parser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/Job.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/JobTestHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Comment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/IdGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Node.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.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/ScopeStateTest.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/TransitionBasedConcurrencyTest.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/basicfeatures/BasicExecutionFlowDbTest.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/ManagementServiceTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.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/example02/PersistentExecutionModeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.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/jobexecutor/JobExecutorTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.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/ex02/BasicProcessPersistenceTest.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/InternalDecisionTest.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/TaskService.java Log: unification api proposals Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Configuration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Configuration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Configuration.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,7 @@ +package org.jbpm; + + +public abstract class Configuration { + + public abstract ProcessEngine buildProcessEngine(); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Configuration.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Deployment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Deployment.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Deployment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.io.File; +import java.io.InputStream; +import java.io.Serializable; +import java.net.URL; +import java.util.zip.ZipInputStream; + + +/** a deployment unit, containing all information to create a process + * definition that will be deployed in the persistent store of the + * Process Virtual Machine. + * + * @author Tom Baeyens + */ +public interface Deployment extends Serializable { + + void setName(String name); + void setLanguage(String language); + + void addObject(String name, Object object); + void addResource(String resource); + void addFile(File file); + void addUrl(URL url); + void addInputStream(String name, InputStream inputStream); + void addArchiveResource(String resource); + void addArchiveFile(File file); + void addArchiveUrl(URL url); + void addArchive(ZipInputStream zipInputStream); + void addDirectory(String directory); + void addDirectoryCanonical(String directory); + void addDirectory(File directory); + void addDirectoryCanonical(File directory); + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Deployment.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Execution.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Execution.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Execution.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Execution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.io.Serializable; + +import org.jbpm.pvm.client.ClientExecution; +import org.jbpm.pvm.client.ClientProcessDefinition; +import org.jbpm.pvm.model.ObservableElement; + +/** a runtime path of execution. + * + * <h3 id="state">State of an execution</h3> + * + * <p>The state of an execution is either active or locked. An active execution is either + * executing or waiting for an external trigger. If an execution is not in {@link #STATE_ACTIVE}, + * then it is locked. A locked execution is read only. + * </p> + * + * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}. To change + * the state to a locked state, use {@link #lock(String)}. + * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the + * most commonly used locked states. But the state '...' in the picture indicates + * that any string can be provided as the state in the lock method. + * </p> + * + * <p>If an execution is locked, methods that change the execution will throw + * a {@link PvmException} and the message will reference the actual locking state. + * {@link #fire(String, ObservableElement) Firing events}, + * {@link #setVariable(String, Object) updating variables}, + * {@link #setPriority(int) updating priority} and + * {@link #createComment(String) adding comments} are not considered to change an + * execution. Also {@link #createProcessInstance(String) creation} and + * {@link #removeExecution(Execution) removal} of child executions are unchecked, + * which means that those methods can be invoked by external API clients and + * node behaviour methods, even while the execution is in a locked state. + * </p> + * + * <p>Make sure that comparisons between {@link #getState()} and the + * {@link #STATE_ACTIVE STATE_* constants} are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. + * </p> + * + * <h3>Comments</h3> + * + * @author Tom Baeyens + */ +public interface Execution extends Serializable { + + /** between {@link ClientProcessDefinition#createProcessInstance() creation of + * a new process instance} and the {@link ClientExecution#start() start} of that + * process instance. The motivation of this state is that variables can be + * set programmatically on the process instance so that they can be used during + * initializations of variables and timers */ + String STATE_CREATED = "created"; + + /** either executing or in a wait state waiting for a signal. + * This is the normal state of an execution and the initial state + * when creating a new execution. Make sure that comparisons are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. */ + String STATE_ACTIVE = "active"; + + /** parents with concurrent child executions are inactive. + * When an execution has concurrent child executions, it implies that + * this execution can't be active. For example, at a fork, the parent + * execution can wait inactively in the fork being till all the + * child executions are joined. Only leaves of the + * execution tree can be active. Make sure that comparisons are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. */ + String STATE_INACTIVE = "inactive"; + + /** this execution has ended normally. Make sure that comparisons are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. */ + String STATE_ENDED = "ended"; + + /** this execution was cancelled with the {@link #cancel()} + * method before normal execution ended. Make sure that comparisons are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. */ + String STATE_CANCELLED = "cancelled"; + + /** indicates that this execution is temporary suspended with the + * {@link #suspend()} method. Human tasks of a suspended execution + * shouldn't show up in people's task list and timers of suspended + * executions shouldn't fire and the execution is locked. Make sure that comparisons are + * done with .equals and not with '==' because if executions are + * loaded from persistent storage, a new string is created instead + * of the constants. */ + String STATE_SUSPENDED = "suspended"; + + /** indicates that this execution is doing an asynchronous continuation. */ + String STATE_ASYNC = "async"; + + + long getDbid(); + /** the externally given name or id of this execution. The id of a main + * path of execution is null. Can be used to differentiate concurrent + * paths of execution e.g. the shipping and billing paths. */ + String getName(); + + /** the optional user provided business key that is unique within one + * process definition. This could be for instance the order number. + * It's a user defined identifier for one execution within the scope of + * a single process definition. */ + String getKey(); + + /** a globally unique identifier for this execution. */ + String getId(); + + /** represents the current position in the process by indicating the + * name of the current node. */ + String getNodeName(); + + /** the <a href="#state">state</a> of this execution. */ + String getState(); + + /** is this execution active ? This is the inverse of {@link #isLocked()}. */ + boolean isActive(); + + /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */ + boolean isLocked(); + + /** is this execution ended or cancelled ? */ + boolean isFinished(); + + /** is this execution ended normally ? */ + boolean isEnded(); + + /** is this execution suspended ? */ + boolean isSuspended(); + + /** indicates low priorities with negative values and high priorities + * with positive values. The default priority is 0, which means + * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), + * LOW (-1) and LOWEST (-2). For the rest, the user can set any other + * priority integer value, but then, the UI will have to display it as + * an integer and not the named value.*/ + int getPriority(); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/Execution.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ExecutionService.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ExecutionService.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ExecutionService.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ExecutionService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.util.List; +import java.util.Map; + + +/** manages runtime process executions. + * + * @author Tom Baeyens + */ +public interface ExecutionService { + + /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */ + Execution startExecution(String processDefinitionId); + + /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. + * @param executionKey is a user provided reference for the new execution that must be unique over all + * process versions with the same name. */ + Execution startExecution(String processDefinitionId, String executionKey); + + /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. + * @param variables are the initial values of the process variables that will be set before the execution starts. */ + Execution startExecution(String processDefinitionId, Map<String, Object> variables); + + /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. + * @param variables are the initial values of the process variables that will be set before the execution starts. + * @param executionKey is a user provided reference for the new execution that must be unique over all + * process versions with the same name. */ + Execution startExecution(String processDefinitionId, Map<String, Object> variables, String executionKey); + + /** starts a new execution in the latest version of the given process definition. + * @param processDefinitionName is the name of the process definition for which the latest version will be taken. */ + Execution startExecutionInLatest(String processDefinitionName); + + /** starts a new execution in the latest version of the given processDefinitionName. + * @param processDefinitionName is the name of the process definition + * for which the latest version will be taken. + * @param executionKey is a user provided reference for the new execution + * that must be unique over all process versions with the same name. */ + Execution startExecutionInLatest(String processDefinitionName, String executionKey); + + /** starts a new execution in the latest version of the given processDefinitionName. + * @param processDefinitionName is the name of the process definition + * for which the latest version will be taken. + * @param variables are the initial values of the process variables that + * will be set before the execution starts (read: before the initial + * node is executed). */ + Execution startExecutionInLatest(String processDefinitionName, Map<String, Object> variables); + + /** starts a new execution in the latest version of the given processDefinitionName. + * @param processDefinitionName is the name of the process definition for which the latest version will be taken. + * @param variables are the initial values of the process variables that will be set before the execution starts. + * @param executionKey is a user provided reference for the new execution that must be unique over all + * process versions with the same name. */ + Execution startExecutionInLatest(String processDefinitionName, Map<String, Object> variables, String executionKey); + + /** the execution that is uniquely defined by the process definition and the business key. */ + Execution findExecution(String processDefinitionName, String executionKey); + + /** the execution that is uniquely defined by the process definition and the business key. */ + Execution findExecution(String executionId); + + + /** provides an external trigger to an execution. */ + Execution signalExecution(String executionId); + + /** provides a named external trigger to an execution. */ + Execution signalExecution(String executionId, String signalName); + + /** provides a named external trigger to an execution with parameters. */ + Execution signalExecution(String executionId, String signalName, Map<String, Object> parameters); + + /** provides a external trigger to an execution with parameters. */ + Execution signalExecution(String executionId, Map<String, Object> parameters); + + + /** provides a named external trigger to an execution. */ + Execution signalExecutionByKey(String processDefinitionName, String executionKey); + + /** provides a named external trigger to an execution. */ + Execution signalExecutionByKey(String processDefinitionName, String executionKey, String signalName); + + /** provides a named external trigger to an execution with parameters. */ + Execution signalExecutionByKey(String processDefinitionName, String executionKey, Map<String, Object> parameters); + + /** provides a named external trigger to an execution with parameters. */ + Execution signalExecutionByKey(String processDefinitionName, String executionKey, String signalName, Map<String, Object> parameters); + + + /** creates or overwrites a variable value on the referenced execution */ + Execution setVariable(String executionId, String name, Object value); + + /** creates or overwrites the variable values on the referenced execution */ + Execution setVariables(String executionId, Map<String, Object> variables); + + /** retrieves a variable */ + Object getVariable(String executionId, String variableName); + + /** retrieves a map of variables */ + Map<String, Object> getVariables(String executionId, List<String> variableNames); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ExecutionService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ManagementService.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ManagementService.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ManagementService.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ManagementService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.util.List; + +import org.jbpm.pvm.job.Job; +import org.jbpm.pvm.job.Message; +import org.jbpm.pvm.job.Timer; + + +/** operations targeted to system operators that need to keep + * the process engine up and running. This functionality is typically + * exposed through a management web console. + * + * @author Tom Baeyens + */ +public interface ManagementService { + + /** all the messages which are waiting to be executed. + * Messages that are already acquired will not show up in the list. */ + List<Message> getMessages(int firstResult, int maxResults); + + /** all the timers which are waiting for their due date. + * Timers that are already acquired will not show up in the list. */ + List<Timer> getTimers(int firstResult, int maxResults); + + /** all jobs for which all the retry attempts have failed and + * which are parked, waiting for operator intervention */ + List<Job> getJobsWithException(int firstResult, int maxResults); + + /** resets the retry count, clears the exception and executes the job. + * An exception is thrown out of this method in case the execution + * of the job fails. In case the async command executor is configured + * for this service, failing job execution will not result into an + * exception coming out of this method. */ + void executeJob(String jobId); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ManagementService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessDefinition.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessDefinition.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessDefinition.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessDefinition.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.io.Serializable; + +import org.jbpm.pvm.model.ObservableElement; + + +/** a graphical process which is deployed in the {@ ProcessService}. + * + * @author Tom Baeyens + */ +public interface ProcessDefinition extends Serializable { + + /** the optional package name of this process. This can be used to create + * hierarchy of process categories for easy lookup. This is a + * similar way of grouping and creating a structure as in Java. + * We recommend the same conventions as with Java package names. */ + String getPackageName(); + + /** the short display name given to this process definition. + * Multiple process definitions can have the same as long + * as they are given a different {@link #version}. */ + String getName(); + + /** the user defined short representation of the name. Just + * like the name, multiple versions of a process definition + * can have the same key. */ + String getKey(); + + /** the unique id for this process definition. */ + String getId(); + + /** automatically assigned during deployment of a process that + * represents the sequence number for process definitions with + * the same {@link ObservableElement#getName() name}. */ + int getVersion(); + + /** the description name given to this process definition. + * Multiple process definitions can have the same */ + String getDescription(); + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessDefinition.java ___________________________________________________________________ Name: svn:mergeinfo + Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessEngine.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessEngine.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessEngine.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,12 @@ +package org.jbpm; + + +public interface ProcessEngine { + + ProcessService getProcessService(); + ExecutionService getExecutionService(); + TaskService getTaskService(); + ManagementService getManagementService(); + + ResourceManager getResourceManager(); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessEngine.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessService.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessService.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessService.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +import java.util.List; + +import org.jbpm.pvm.DeploymentImpl; + + +/** a process definition repository. + * + * @author Tom Baeyens + */ +public interface ProcessService { + + Deployment createDeployment(); + + /** deploy a new process definition into the process repository. */ + ProcessDefinition deploy(DeploymentImpl deploymentImpl); + + /** all deployed process names. */ + List<String> findProcessDefinitionNames(); + + /** all versions of the given process. */ + List<ProcessDefinition> findProcessDefinitions(String processDefinitionName); + + /** latest version of the processDefinition with the given name. */ + ProcessDefinition findLatestProcessDefinition(String processDefinitionName); + + /** specific version of a named processDefinition. */ + ProcessDefinition findProcessDefinition(String processDefinitionName, int processDefinitionVersion); + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ProcessService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/PvmException.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/PvmException.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/PvmException.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/PvmException.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +public class PvmException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public PvmException() { + super(); + } + public PvmException(String msg, Throwable cause) { + super(msg, cause); + } + public PvmException(String msg) { + super(msg); + } + public PvmException(Throwable cause) { + super(cause); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/PvmException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ResourceManager.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ResourceManager.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ResourceManager.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,19 @@ +package org.jbpm; + +/** can be used to provide transactional reasources + * like JDBC connection or hibernate session to + * the method invocations on a service. + * + * TODO what about subsequent service method invocations ? + * will a provided resource only be used once in the next method invocation. + * Or will the the resource be available for the remainder of the thread. + * In other words: should interceptor that propagates these resources into the + * environment clean them from the thread local or not ? + * + * @author Tom Baeyens + */ +public interface ResourceManager { + + void addResource(Object object); + void addResource(String name, Object object); +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ResourceManager.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/TaskService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/TaskService.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/TaskService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,6 @@ +package org.jbpm; + + +public interface TaskService { + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/TaskService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/package.html (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/package.html) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/package.html (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/package.html 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,5 @@ +<body>the primary facade interfaces to +{@link org.jbpm.pvm.ProcessService the process repository}, +{@link org.jbpm.pvm.ExecutionService the execution repository} +and {@link org.jbpm.pvm.ManagementService the management functionalities}. +</body> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/package.html ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Deployment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Deployment.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Deployment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,245 +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; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.net.URL; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.jbpm.pvm.internal.stream.ByteArrayStreamSource; -import org.jbpm.pvm.internal.stream.FileStreamSource; -import org.jbpm.pvm.internal.stream.InputStreamSource; -import org.jbpm.pvm.internal.stream.ResourceStreamSource; -import org.jbpm.pvm.internal.stream.StreamSource; -import org.jbpm.pvm.internal.stream.UrlStreamSource; -import org.jbpm.pvm.internal.util.IoUtil; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Document; - - -/** a deployment unit, containing all information to create a process - * definition that will be deployed in the persistent store of the - * Process Virtual Machine. - * - * @author Tom Baeyens - */ -public class Deployment implements Serializable { - - private static final long serialVersionUID = 1L; - - private static final Parser parser = new Parser(); - - protected String name; - protected String language; - - protected Map<String, StreamSource> files; - protected Map<String, Document> documents; - - protected ProcessDefinition processDefinition; - - public Deployment() { - } - - public Deployment(ProcessDefinition processDefinition) { - setProcessDefinition(processDefinition); - } - - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public void addResource(String resource) { - addStreamSource(resource, new ResourceStreamSource(resource)); - } - - public void addFile(File file) { - addStreamSource(file.getAbsolutePath(), new FileStreamSource(file)); - } - - public void addUrl(URL url) { - addStreamSource(url.toString(), new UrlStreamSource(url)); - } - - public void addInputStream(String name, InputStream inputStream) { - addStreamSource(name, new InputStreamSource(inputStream)); - } - - public void addArchiveResource(String resource) { - this.name = resource; - ResourceStreamSource streamSource = new ResourceStreamSource(resource); - addStreamSource(resource, streamSource); - } - - public void addArchiveFile(File file) { - addStreamSource(file.getAbsolutePath(), new FileStreamSource(file)); - } - - public void addArchiveUrl(URL url) { - addStreamSource(url.toString(), new UrlStreamSource(url)); - } - - public void addArchive(ZipInputStream zipInputStream) { - try { - ZipEntry zipEntry = zipInputStream.getNextEntry(); - while(zipEntry!=null) { - String entryName = zipEntry.getName(); - byte[] bytes = IoUtil.readBytes(zipInputStream); - if (bytes!=null) { - addStreamSource(entryName, new ByteArrayStreamSource(bytes)); - } - zipEntry = zipInputStream.getNextEntry(); - } - } catch (Exception e) { - throw new PvmException("couldn't read zip archive", e); - } - } - - /** recursively adds all files in a directory using the relative file names */ - public void addDirectory(String directory) { - if (directory==null) { - throw new PvmException("directory is null"); - } - addDirectory(new File(directory), "", false); - } - - /** recursively adds all files in a directory using the canonical file names */ - public void addDirectoryCanonical(String directory) { - if (directory==null) { - throw new PvmException("directory is null"); - } - addDirectory(new File(directory), "", true); - } - - /** recursively adds all files in a directory using the relative file names */ - public void addDirectory(File directory) { - addDirectory(directory, "", false); - } - - /** recursively adds all files in a directory using the canonical file names */ - public void addDirectoryCanonical(File directory) { - addDirectory(directory, "", true); - } - - protected void addDirectory(File directory, String relativeDirectoryName, boolean canonicalPathNames) { - if (directory==null) { - throw new PvmException("directory is null"); - } - if (!directory.isDirectory()) { - throw new PvmException(directory.getAbsolutePath()+" is not a directory"); - } - - File[] files = directory.listFiles(); - if (files!=null) { - for (File file: files) { - String relativeFileName = (canonicalPathNames ? null : relativeDirectoryName+"/"+file.getName()); - if (file.isFile()) { - if (canonicalPathNames) { - try { - addStreamSource(file.getCanonicalPath(), new FileStreamSource(file)); - } catch (IOException e) { - throw new PvmException("can't get canonical path name for "+file); - } - } else { - addStreamSource(relativeFileName, new FileStreamSource(file)); - } - } else if (file.isDirectory()) { - addDirectory(file, relativeFileName, canonicalPathNames); - } - } - } - } - - protected void addStreamSource(String name, StreamSource streamSource) { - if (this.name==null) { - this.name = name; - } - if (files==null) { - files = new HashMap<String, StreamSource>(); - } - files.put(name, streamSource); - } - - public InputStream getFile(String name) { - if (files==null) { - return null; - } - StreamSource streamSource = files.get(name); - return (streamSource!=null ? streamSource.openStream() : null); - } - - public Set<String> getFileNames() { - if (files==null) { - return Collections.EMPTY_SET; - } - return files.keySet(); - } - - public Document getDocument(String name) { - if ( (documents!=null) - && (documents.containsKey(name)) - ) { - return documents.get(name); - } - if ( (files!=null) - && (files.containsKey(name)) - ) { - InputStream fileStream = getFile(name); - return parser.createParse() - .setInputStream(fileStream) - .execute() - .checkProblems("deployment file "+name) - .getDocument(); - } - return null; - } - - public ProcessDefinition getProcessDefinition() { - return processDefinition; - } - - public void setProcessDefinition(ProcessDefinition processDefinition) { - if (language==null) { - language = "api"; - } - this.processDefinition = processDefinition; - } - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/DeploymentImpl.java (from rev 2558, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Deployment.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/DeploymentImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/DeploymentImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -0,0 +1,256 @@ +/* + * 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; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.net.URL; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import org.jbpm.Deployment; +import org.jbpm.ProcessDefinition; +import org.jbpm.PvmException; +import org.jbpm.pvm.internal.stream.ByteArrayStreamSource; +import org.jbpm.pvm.internal.stream.FileStreamSource; +import org.jbpm.pvm.internal.stream.InputStreamSource; +import org.jbpm.pvm.internal.stream.ResourceStreamSource; +import org.jbpm.pvm.internal.stream.StreamSource; +import org.jbpm.pvm.internal.stream.UrlStreamSource; +import org.jbpm.pvm.internal.util.IoUtil; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Document; + + +/** a deployment unit, containing all information to create a process + * definition that will be deployed in the persistent store of the + * Process Virtual Machine. + * + * @author Tom Baeyens + */ +public class DeploymentImpl implements Deployment, Serializable { + + private static final long serialVersionUID = 1L; + + private static final Parser parser = new Parser(); + + protected String name; + protected String language; + + protected Map<String, StreamSource> files; + protected Map<String, Document> documents; + + protected ProcessDefinition processDefinition; + protected Map<String, Object> objects; + + public DeploymentImpl() { + } + + public DeploymentImpl(ProcessDefinition processDefinition) { + setProcessDefinition(processDefinition); + } + + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public void addResource(String resource) { + addStreamSource(resource, new ResourceStreamSource(resource)); + } + + public void addFile(File file) { + addStreamSource(file.getAbsolutePath(), new FileStreamSource(file)); + } + + public void addUrl(URL url) { + addStreamSource(url.toString(), new UrlStreamSource(url)); + } + + public void addInputStream(String name, InputStream inputStream) { + addStreamSource(name, new InputStreamSource(inputStream)); + } + + public void addArchiveResource(String resource) { + this.name = resource; + ResourceStreamSource streamSource = new ResourceStreamSource(resource); + addStreamSource(resource, streamSource); + } + + public void addArchiveFile(File file) { + addStreamSource(file.getAbsolutePath(), new FileStreamSource(file)); + } + + public void addArchiveUrl(URL url) { + addStreamSource(url.toString(), new UrlStreamSource(url)); + } + + public void addArchive(ZipInputStream zipInputStream) { + try { + ZipEntry zipEntry = zipInputStream.getNextEntry(); + while(zipEntry!=null) { + String entryName = zipEntry.getName(); + byte[] bytes = IoUtil.readBytes(zipInputStream); + if (bytes!=null) { + addStreamSource(entryName, new ByteArrayStreamSource(bytes)); + } + zipEntry = zipInputStream.getNextEntry(); + } + } catch (Exception e) { + throw new PvmException("couldn't read zip archive", e); + } + } + + /** recursively adds all files in a directory using the relative file names */ + public void addDirectory(String directory) { + if (directory==null) { + throw new PvmException("directory is null"); + } + addDirectory(new File(directory), "", false); + } + + /** recursively adds all files in a directory using the canonical file names */ + public void addDirectoryCanonical(String directory) { + if (directory==null) { + throw new PvmException("directory is null"); + } + addDirectory(new File(directory), "", true); + } + + /** recursively adds all files in a directory using the relative file names */ + public void addDirectory(File directory) { + addDirectory(directory, "", false); + } + + /** recursively adds all files in a directory using the canonical file names */ + public void addDirectoryCanonical(File directory) { + addDirectory(directory, "", true); + } + + protected void addDirectory(File directory, String relativeDirectoryName, boolean canonicalPathNames) { + if (directory==null) { + throw new PvmException("directory is null"); + } + if (!directory.isDirectory()) { + throw new PvmException(directory.getAbsolutePath()+" is not a directory"); + } + + File[] files = directory.listFiles(); + if (files!=null) { + for (File file: files) { + String relativeFileName = (canonicalPathNames ? null : relativeDirectoryName+"/"+file.getName()); + if (file.isFile()) { + if (canonicalPathNames) { + try { + addStreamSource(file.getCanonicalPath(), new FileStreamSource(file)); + } catch (IOException e) { + throw new PvmException("can't get canonical path name for "+file); + } + } else { + addStreamSource(relativeFileName, new FileStreamSource(file)); + } + } else if (file.isDirectory()) { + addDirectory(file, relativeFileName, canonicalPathNames); + } + } + } + } + + protected void addStreamSource(String name, StreamSource streamSource) { + if (this.name==null) { + this.name = name; + } + if (files==null) { + files = new HashMap<String, StreamSource>(); + } + files.put(name, streamSource); + } + + public InputStream getFile(String name) { + if (files==null) { + return null; + } + StreamSource streamSource = files.get(name); + return (streamSource!=null ? streamSource.openStream() : null); + } + + public Set<String> getFileNames() { + if (files==null) { + return Collections.EMPTY_SET; + } + return files.keySet(); + } + + public Document getDocument(String name) { + if ( (documents!=null) + && (documents.containsKey(name)) + ) { + return documents.get(name); + } + if ( (files!=null) + && (files.containsKey(name)) + ) { + InputStream fileStream = getFile(name); + return parser.createParse() + .setInputStream(fileStream) + .execute() + .checkProblems("deployment file "+name) + .getDocument(); + } + return null; + } + + public ProcessDefinition getProcessDefinition() { + return processDefinition; + } + + public void setProcessDefinition(ProcessDefinition processDefinition) { + if (language==null) { + language = "api"; + } + this.processDefinition = processDefinition; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public void addObject(String name, Object object) { + if (objects!=null) { + objects = new HashMap<String, Object>(); + } + objects.put(name, object); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/DeploymentImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Execution.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Execution.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/Execution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,167 +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; - -import java.io.Serializable; - -import org.jbpm.pvm.client.ClientExecution; -import org.jbpm.pvm.client.ClientProcessDefinition; -import org.jbpm.pvm.model.ObservableElement; - -/** a runtime path of execution. - * - * <h3 id="state">State of an execution</h3> - * - * <p>The state of an execution is either active or locked. An active execution is either - * executing or waiting for an external trigger. If an execution is not in {@link #STATE_ACTIVE}, - * then it is locked. A locked execution is read only. - * </p> - * - * <p>When a new execution is created, it is in {@link #STATE_ACTIVE}. To change - * the state to a locked state, use {@link #lock(String)}. - * {@link #STATE_ACTIVE Some STATE_* constants} are provided that represent the - * most commonly used locked states. But the state '...' in the picture indicates - * that any string can be provided as the state in the lock method. - * </p> - * - * <p>If an execution is locked, methods that change the execution will throw - * a {@link PvmException} and the message will reference the actual locking state. - * {@link #fire(String, ObservableElement) Firing events}, - * {@link #setVariable(String, Object) updating variables}, - * {@link #setPriority(int) updating priority} and - * {@link #createComment(String) adding comments} are not considered to change an - * execution. Also {@link #createProcessInstance(String) creation} and - * {@link #removeExecution(Execution) removal} of child executions are unchecked, - * which means that those methods can be invoked by external API clients and - * node behaviour methods, even while the execution is in a locked state. - * </p> - * - * <p>Make sure that comparisons between {@link #getState()} and the - * {@link #STATE_ACTIVE STATE_* constants} are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. - * </p> - * - * <h3>Comments</h3> - * - * @author Tom Baeyens - */ -public interface Execution extends Serializable { - - /** between {@link ClientProcessDefinition#createProcessInstance() creation of - * a new process instance} and the {@link ClientExecution#start() start} of that - * process instance. The motivation of this state is that variables can be - * set programmatically on the process instance so that they can be used during - * initializations of variables and timers */ - String STATE_CREATED = "created"; - - /** either executing or in a wait state waiting for a signal. - * This is the normal state of an execution and the initial state - * when creating a new execution. Make sure that comparisons are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. */ - String STATE_ACTIVE = "active"; - - /** parents with concurrent child executions are inactive. - * When an execution has concurrent child executions, it implies that - * this execution can't be active. For example, at a fork, the parent - * execution can wait inactively in the fork being till all the - * child executions are joined. Only leaves of the - * execution tree can be active. Make sure that comparisons are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. */ - String STATE_INACTIVE = "inactive"; - - /** this execution has ended normally. Make sure that comparisons are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. */ - String STATE_ENDED = "ended"; - - /** this execution was cancelled with the {@link #cancel()} - * method before normal execution ended. Make sure that comparisons are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. */ - String STATE_CANCELLED = "cancelled"; - - /** indicates that this execution is temporary suspended with the - * {@link #suspend()} method. Human tasks of a suspended execution - * shouldn't show up in people's task list and timers of suspended - * executions shouldn't fire and the execution is locked. Make sure that comparisons are - * done with .equals and not with '==' because if executions are - * loaded from persistent storage, a new string is created instead - * of the constants. */ - String STATE_SUSPENDED = "suspended"; - - /** indicates that this execution is doing an asynchronous continuation. */ - String STATE_ASYNC = "async"; - - - long getDbid(); - /** the externally given name or id of this execution. The id of a main - * path of execution is null. Can be used to differentiate concurrent - * paths of execution e.g. the shipping and billing paths. */ - String getName(); - - /** the optional user provided business key that is unique within one - * process definition. This could be for instance the order number. - * It's a user defined identifier for one execution within the scope of - * a single process definition. */ - String getKey(); - - /** a globally unique identifier for this execution. */ - String getId(); - - /** represents the current position in the process by indicating the - * name of the current node. */ - String getNodeName(); - - /** the <a href="#state">state</a> of this execution. */ - String getState(); - - /** is this execution active ? This is the inverse of {@link #isLocked()}. */ - boolean isActive(); - - /** is this execution {@link #lock(String) locked} ? This is the inverse of {@link #isActive()}. */ - boolean isLocked(); - - /** is this execution ended or cancelled ? */ - boolean isFinished(); - - /** is this execution ended normally ? */ - boolean isEnded(); - - /** is this execution suspended ? */ - boolean isSuspended(); - - /** indicates low priorities with negative values and high priorities - * with positive values. The default priority is 0, which means - * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), - * LOW (-1) and LOWEST (-2). For the rest, the user can set any other - * priority integer value, but then, the UI will have to display it as - * an integer and not the named value.*/ - int getPriority(); -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ExecutionService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ExecutionService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,126 +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; - -import java.util.List; -import java.util.Map; - - -/** manages runtime process executions. - * - * @author Tom Baeyens - */ -public interface ExecutionService { - - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. - * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */ - Execution startExecution(String processDefinitionId); - - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. - * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. - * @param executionKey is a user provided reference for the new execution that must be unique over all - * process versions with the same name. */ - Execution startExecution(String processDefinitionId, String executionKey); - - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. - * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. - * @param variables are the initial values of the process variables that will be set before the execution starts. */ - Execution startExecution(String processDefinitionId, Map<String, Object> variables); - - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. - * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. - * @param variables are the initial values of the process variables that will be set before the execution starts. - * @param executionKey is a user provided reference for the new execution that must be unique over all - * process versions with the same name. */ - Execution startExecution(String processDefinitionId, Map<String, Object> variables, String executionKey); - - /** starts a new execution in the latest version of the given process definition. - * @param processDefinitionName is the name of the process definition for which the latest version will be taken. */ - Execution startExecutionInLatest(String processDefinitionName); - - /** starts a new execution in the latest version of the given processDefinitionName. - * @param processDefinitionName is the name of the process definition - * for which the latest version will be taken. - * @param executionKey is a user provided reference for the new execution - * that must be unique over all process versions with the same name. */ - Execution startExecutionInLatest(String processDefinitionName, String executionKey); - - /** starts a new execution in the latest version of the given processDefinitionName. - * @param processDefinitionName is the name of the process definition - * for which the latest version will be taken. - * @param variables are the initial values of the process variables that - * will be set before the execution starts (read: before the initial - * node is executed). */ - Execution startExecutionInLatest(String processDefinitionName, Map<String, Object> variables); - - /** starts a new execution in the latest version of the given processDefinitionName. - * @param processDefinitionName is the name of the process definition for which the latest version will be taken. - * @param variables are the initial values of the process variables that will be set before the execution starts. - * @param executionKey is a user provided reference for the new execution that must be unique over all - * process versions with the same name. */ - Execution startExecutionInLatest(String processDefinitionName, Map<String, Object> variables, String executionKey); - - /** the execution that is uniquely defined by the process definition and the business key. */ - Execution findExecution(String processDefinitionName, String executionKey); - - /** the execution that is uniquely defined by the process definition and the business key. */ - Execution findExecution(String executionId); - - - /** provides an external trigger to an execution. */ - Execution signalExecution(String executionId); - - /** provides a named external trigger to an execution. */ - Execution signalExecution(String executionId, String signalName); - - /** provides a named external trigger to an execution with parameters. */ - Execution signalExecution(String executionId, String signalName, Map<String, Object> parameters); - - /** provides a external trigger to an execution with parameters. */ - Execution signalExecution(String executionId, Map<String, Object> parameters); - - - /** provides a named external trigger to an execution. */ - Execution signalExecutionByKey(String processDefinitionName, String executionKey); - - /** provides a named external trigger to an execution. */ - Execution signalExecutionByKey(String processDefinitionName, String executionKey, String signalName); - - /** provides a named external trigger to an execution with parameters. */ - Execution signalExecutionByKey(String processDefinitionName, String executionKey, Map<String, Object> parameters); - - /** provides a named external trigger to an execution with parameters. */ - Execution signalExecutionByKey(String processDefinitionName, String executionKey, String signalName, Map<String, Object> parameters); - - - /** creates or overwrites a variable value on the referenced execution */ - Execution setVariable(String executionId, String name, Object value); - - /** creates or overwrites the variable values on the referenced execution */ - Execution setVariables(String executionId, Map<String, Object> variables); - - /** retrieves a variable */ - Object getVariable(String executionId, String variableName); - - /** retrieves a map of variables */ - Map<String, Object> getVariables(String executionId, List<String> variableNames); -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ManagementService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ManagementService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ManagementService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm; - -import java.util.List; - -import org.jbpm.pvm.job.Job; -import org.jbpm.pvm.job.Message; -import org.jbpm.pvm.job.Timer; - - -/** operations targeted to system operators that need to keep - * the process engine up and running. This functionality is typically - * exposed through a management web console. - * - * @author Tom Baeyens - */ -public interface ManagementService { - - /** all the messages which are waiting to be executed. - * Messages that are already acquired will not show up in the list. */ - List<Message> getMessages(int firstResult, int maxResults); - - /** all the timers which are waiting for their due date. - * Timers that are already acquired will not show up in the list. */ - List<Timer> getTimers(int firstResult, int maxResults); - - /** all jobs for which all the retry attempts have failed and - * which are parked, waiting for operator intervention */ - List<Job> getJobsWithException(int firstResult, int maxResults); - - /** resets the retry count, clears the exception and executes the job. - * An exception is thrown out of this method in case the execution - * of the job fails. In case the async command executor is configured - * for this service, failing job execution will not result into an - * exception coming out of this method. */ - void executeJob(String jobId); -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm; - -//$Id$ - -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Configuration; - -/** - * A mock process engine configuration - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public class MockProcessEngineConfiguration implements Configuration -{ - public ProcessEngine getProcessEngine() - { - return new ProcessEngineImpl(); - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessDefinition.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessDefinition.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,63 +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; - -import java.io.Serializable; - -import org.jbpm.pvm.model.ObservableElement; - - -/** a graphical process which is deployed in the {@ ProcessService}. - * - * @author Tom Baeyens - */ -public interface ProcessDefinition extends Serializable { - - /** the optional package name of this process. This can be used to create - * hierarchy of process categories for easy lookup. This is a - * similar way of grouping and creating a structure as in Java. - * We recommend the same conventions as with Java package names. */ - String getPackageName(); - - /** the short display name given to this process definition. - * Multiple process definitions can have the same as long - * as they are given a different {@link #version}. */ - String getName(); - - /** the user defined short representation of the name. Just - * like the name, multiple versions of a process definition - * can have the same key. */ - String getKey(); - - /** the unique id for this process definition. */ - String getId(); - - /** automatically assigned during deployment of a process that - * represents the sequence number for process definitions with - * the same {@link ObservableElement#getName() name}. */ - int getVersion(); - - /** the description name given to this process definition. - * Multiple process definitions can have the same */ - String getDescription(); - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessEngineImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessEngineImpl.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessEngineImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm; - -//$Id$ - -import org.jbpm.api.client.ProcessEngine; - -/** - * A process engine - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public class ProcessEngineImpl extends ProcessEngine -{ - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ProcessService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm; - -import java.util.List; - - -/** a process definition repository. - * - * @author Tom Baeyens - */ -public interface ProcessService { - - /** deploy a new process definition into the process repository. */ - ProcessDefinition deploy(Deployment deployment); - - /** all deployed process names. */ - List<String> findProcessDefinitionNames(); - - /** all versions of the given process. */ - List<ProcessDefinition> findProcessDefinitions(String processDefinitionName); - - /** latest version of the processDefinition with the given name. */ - ProcessDefinition findLatestProcessDefinition(String processDefinitionName); - - /** specific version of a named processDefinition. */ - ProcessDefinition findProcessDefinition(String processDefinitionName, int processDefinitionVersion); - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/PvmException.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/PvmException.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/PvmException.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,40 +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; - -public class PvmException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public PvmException() { - super(); - } - public PvmException(String msg, Throwable cause) { - super(msg, cause); - } - public PvmException(String msg) { - super(msg); - } - public PvmException(Throwable cause) { - super(cause); - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.activity; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +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; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/ExternalActivity.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Map; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** extends {@link Activity} for handling external triggers after a wait state. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/client/ClientExecution.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/client/ClientExecution.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/client/ClientExecution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +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; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/Environment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/Environment.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/Environment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.io.Serializable; import java.util.Stack; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/EnvironmentHelper.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/Duration.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * represents a time duration. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandException.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * abstract extensible session facade. Developers can use this directly or 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.PvmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.deploy.DeployerManager; @@ -34,14 +34,14 @@ private static final long serialVersionUID = 1L; - protected Deployment deployment; + protected DeploymentImpl deploymentImpl; - public DeployCmd(Deployment deployment) { - this.deployment = deployment; + public DeployCmd(DeploymentImpl deploymentImpl) { + this.deploymentImpl = deploymentImpl; } public ProcessDefinition execute(Environment environment) throws Exception { - ProcessDefinition processDefinition = deployment.getProcessDefinition(); + ProcessDefinition processDefinition = deploymentImpl.getProcessDefinition(); if (processDefinition!=null) { DeployerManager deployerManager = environment.get(DeployerManager.class); @@ -51,7 +51,7 @@ // let the process parser managemer determine the process language // and handle the deployment - deployerManager.deploy(deployment); + deployerManager.deploy(deploymentImpl); } return processDefinition; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.OpenProcessDefinition; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.session.PvmDbSession; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetVariablesCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +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; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +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; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.log.Log; @@ -38,8 +38,8 @@ protected boolean assign = true; - public void deploy(Deployment deployment) { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) deployment.getProcessDefinition(); + public void deploy(DeploymentImpl deploymentImpl) { + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) deploymentImpl.getProcessDefinition(); String name = processDefinition.getName(); if (name == null) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; @@ -34,8 +34,8 @@ private static final Log log = Log.getLog(CreateId.class.getName()); - public void deploy(Deployment deployment) { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) deployment.getProcessDefinition(); + public void deploy(DeploymentImpl deploymentImpl) { + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) deploymentImpl.getProcessDefinition(); if (processDefinition.getId()==null) { String key = processDefinition.getKey(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.deploy; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.PvmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.internal.log.Log; @@ -37,8 +37,8 @@ protected Class<?> processDefinitionClass; - public void deploy(Deployment deployment) { - ProcessDefinition processDefinition = deployment.getProcessDefinition(); + public void deploy(DeploymentImpl deploymentImpl) { + ProcessDefinition processDefinition = deploymentImpl.getProcessDefinition(); if (processDefinition==null) { if (processDefinitionClass==null) { @@ -54,7 +54,7 @@ } // make the process definition available in the deployment - deployment.setProcessDefinition(processDefinition); + deploymentImpl.setProcessDefinition(processDefinition); } else { log.trace("using process definition provided in deployment"); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/Deployer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/Deployer.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/Deployer.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.pvm.Deployment; +import org.jbpm.pvm.DeploymentImpl; @@ -30,6 +30,6 @@ */ public interface Deployer { - void deploy(Deployment deployment); + void deploy(DeploymentImpl deploymentImpl); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/DeployerManager.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,8 +26,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.PvmException; + +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.internal.log.Log; @@ -56,15 +57,15 @@ /** maps language-ids to a sequence of process deployers */ protected Map<String, List<Deployer>> deployers = new HashMap<String, List<Deployer>>(); - public void deploy(Deployment deployment) { - if (deployment==null) { + public void deploy(DeploymentImpl deploymentImpl) { + if (deploymentImpl==null) { throw new PvmException("deployment is null"); } // find the language based on the extension - String language = deployment.getLanguage(); + String language = deploymentImpl.getLanguage(); if (language==null) { - String deploymentName = deployment.getName(); + String deploymentName = deploymentImpl.getName(); log.trace("no language specified in deployment, looking for extension in "+deploymentName); if (deploymentName==null) { throw new PvmException("no name nor language specified in deployment"); @@ -80,7 +81,7 @@ } if (language==null) { - throw new PvmException("couldn't find process language matching extension of "+deploymentName+ " for deploying "+deployment); + throw new PvmException("couldn't find process language matching extension of "+deploymentName+ " for deploying "+deploymentImpl); } } @@ -88,14 +89,14 @@ log.trace("looking up process deployer sequence for language "+language); List<Deployer> deployerSequence = deployers.get(language); if (deployerSequence==null) { - throw new PvmException("couldn't find deployer sequence for language "+language+ " for deploying "+deployment); + throw new PvmException("couldn't find deployer sequence for language "+language+ " for deploying "+deploymentImpl); } - log.debug("deploying deployment "+deployment+" with "+language+"-parser"); + log.debug("deploying deployment "+deploymentImpl+" with "+language+"-parser"); for (Deployer deployer: deployerSequence) { - log.trace("deploying "+deployment+" to "+deployer); - deployer.deploy(deployment); + log.trace("deploying "+deploymentImpl+" to "+deployer); + deployer.deploy(deploymentImpl); } } 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.PvmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.session.PvmDbSession; @@ -33,7 +33,7 @@ */ public class SaveProcess implements Deployer { - public void deploy(Deployment deployment) { + public void deploy(DeploymentImpl deploymentImpl) { Environment environment = Environment.getCurrent(); if (environment==null) { throw new PvmException("environment is required by "+getClass().getName()); @@ -44,7 +44,7 @@ throw new PvmException(PvmDbSession.class.getName()+" is required in the environment by "+getClass().getName()); } - ProcessDefinition processDefinition = deployment.getProcessDefinition(); + ProcessDefinition processDefinition = deploymentImpl.getProcessDefinition(); if (processDefinition==null) { throw new PvmException("a process definition in the deployment is required by "+getClass().getName()); } 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.log.Log; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Set; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ExecutionEnvironment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -32,7 +32,7 @@ import org.hibernate.HibernateException; import org.hibernate.type.ImmutableType; import org.hibernate.usertype.ParameterizedType; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.type.Converter; import org.jbpm.pvm.internal.util.ReflectUtil; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -11,7 +11,7 @@ import org.hibernate.HibernateException; import org.hibernate.usertype.ParameterizedType; import org.hibernate.usertype.UserType; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.log.Log; 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/hibernate/HibernateJobDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.util.Clock; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.job.Job; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.session.DbSession; import org.jbpm.pvm.session.MessageSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.job; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.job.Message; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cal.BusinessCalendar; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.Date; import org.hibernate.Session; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -2,7 +2,7 @@ import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.session.DbSession; import org.jbpm.pvm.session.MessageSession; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import javax.transaction.Synchronization; import org.hibernate.Session; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -29,7 +29,8 @@ import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import org.jbpm.pvm.PvmException; + +import org.jbpm.PvmException; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.log.Log; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.job.MessageImpl; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.PvmEnvironmentFactory; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -13,7 +13,7 @@ **/ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.log.Log; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,7 +3,7 @@ import java.sql.SQLException; import org.hibernate.Hibernate; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; public class BlobStrategyBlob implements BlobStrategy { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ClobStrategyClob.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,7 +3,7 @@ import java.sql.SQLException; import org.hibernate.Hibernate; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; public class ClobStrategyClob implements ClobStrategy { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/log/Jdk14LogFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/log/Jdk14LogFactory.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/log/Jdk14LogFactory.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.util.logging.LogManager; import java.util.logging.Logger; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CommentImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.EqualsUtil; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.model; import org.hibernate.Session; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ProcessDefinition; +import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.model.IdGenerator; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cmd.CommandService; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import javax.transaction.Status; import javax.transaction.Synchronization; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.Transaction; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -35,8 +35,8 @@ import java.util.Queue; import java.util.Set; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientProcessInstance; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.model.Node; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientProcessInstance; import org.jbpm.pvm.internal.lob.Blob; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.log.Log; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -28,7 +28,7 @@ import javax.script.Bindings; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,8 +27,8 @@ import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.env.ExecutionEnvironment; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamSource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamSource.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ByteArrayStreamSource.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamSource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamSource.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/FileStreamSource.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.io.InputStream; import java.net.MalformedURLException; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamSource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamSource.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/InputStreamSource.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.io.InputStream; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamSource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamSource.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamSource.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.io.InputStream; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.util.ReflectUtil; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamSource.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamSource.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/UrlStreamSource.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.io.InputStream; import java.net.URL; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.svc; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.svc; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ExecutionService; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.FindExecutionCmd; import org.jbpm.pvm.internal.cmd.GetVariablesCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.ManagementService; +import org.jbpm.ManagementService; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.GetMessagesCmd; import org.jbpm.pvm.internal.cmd.GetTimersCmd; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,9 +23,10 @@ import java.util.List; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.ProcessService; +import org.jbpm.Deployment; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessService; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionCmd; @@ -44,12 +45,12 @@ protected CommandService commandService; public ProcessDefinition deploy(OpenProcessDefinition processDefinition) { - Deployment deployment = new Deployment(processDefinition); - return commandService.execute(new DeployCmd(deployment)); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + return commandService.execute(new DeployCmd(deploymentImpl)); } - public ProcessDefinition deploy(Deployment deployment) { - return commandService.execute(new DeployCmd(deployment)); + public ProcessDefinition deploy(DeploymentImpl deploymentImpl) { + return commandService.execute(new DeployCmd(deploymentImpl)); } public ProcessDefinition findLatestProcessDefinition(String processDefinitionName) { @@ -74,4 +75,8 @@ public void setCommandService(CommandService commandService) { this.commandService = commandService; } + + public Deployment createDeployment() { + return new DeploymentImpl(); + } } 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.svc; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.svc; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.log.Log; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.tx; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.log.Log; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/TransactionException.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.tx; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.io.Serializable; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.model.ExecutionImpl; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/DateToStringConverter.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.type.Converter; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -28,7 +28,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.type.Converter; public class SerializableToBytesConverter implements Converter { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DefaultObservable.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** default implementation of the {@link Observable} interface. * Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/FilterListener.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** listener that only delegates events to a given listener if * they pass the filter based on event names. */ Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/IoUtil.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import java.io.InputStream; import java.io.OutputStream; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; public abstract class IoUtil { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/Priority.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.util; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; public abstract class Priority { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -9,7 +9,7 @@ import java.util.Enumeration; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/StringUtil.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/TagBinding.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.util; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.xml.Binding; import org.jbpm.pvm.internal.xml.Bindings; import org.w3c.dom.Element; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/UrlEntity.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.io.InputStream; import java.net.URL; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.xml.Entity; import org.jbpm.pvm.internal.xml.Parser; import org.xml.sax.EntityResolver; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,8 @@ import java.util.List; import java.util.Set; import java.util.StringTokenizer; -import org.jbpm.pvm.PvmException; + +import org.jbpm.PvmException; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.xml.Parse; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,6 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireException; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -29,7 +29,8 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.jbpm.pvm.PvmException; + +import org.jbpm.PvmException; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JobExecutorDescriptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -13,7 +13,7 @@ **/ package org.jbpm.pvm.internal.wire.descriptor; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.util.Listener; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.util.ArrayUtil; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.stream.StreamSource; import org.jbpm.pvm.internal.util.UrlEntity; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/Job.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/Job.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/Job.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Date; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** base class for timers and messages. * Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/JobTestHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/JobTestHelper.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/job/JobTestHelper.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.cmd.CommandService; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/listener/EventListenerExecution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.listener; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.model.Event; import org.jbpm.pvm.model.ObservableElement; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Comment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Comment.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Comment.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Date; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** a free text comment that can be made to an {@link Execution} * or a task. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ExecutionKeyGenerator.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.model; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ProcessDefinition; +import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/IdGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/IdGenerator.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/IdGenerator.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.model; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ProcessDefinition; +import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Node.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Node.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/Node.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenExecution.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.job.Timer; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/OpenProcessDefinition.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.model; -import org.jbpm.pvm.ProcessDefinition; +import org.jbpm.ProcessDefinition; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,8 +26,8 @@ import java.util.List; import java.util.Stack; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.PvmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.PvmException; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.model.CompositeElementImpl; Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/package.html =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/package.html 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/package.html 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,5 +0,0 @@ -<body>the primary facade interfaces to -{@link org.jbpm.pvm.ProcessService the process repository}, -{@link org.jbpm.pvm.ExecutionService the execution repository} -and {@link org.jbpm.pvm.ManagementService the management functionalities}. -</body> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLog.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogImpl.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -25,7 +25,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.session.LogSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/ProcessLogXmlSerializer.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.text.SimpleDateFormat; import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.job.Job; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.test.base; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ManagementService; -import org.jbpm.pvm.ProcessService; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessService; import org.jbpm.pvm.internal.cmd.CommandService; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.util.ReflectUtil; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.PvmEnvironmentFactory; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,9 +23,9 @@ import java.util.Map; +import org.jbpm.Execution; +import org.jbpm.PvmException; import org.jbpm.pvm.test.base.JbpmTestCase; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.PvmException; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.Map; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,8 +23,8 @@ import java.util.Map; +import org.jbpm.PvmException; import org.jbpm.pvm.test.base.JbpmTestCase; -import org.jbpm.pvm.PvmException; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.client.ClientProcessDefinition; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; +import org.jbpm.Execution; import org.jbpm.pvm.test.base.JbpmTestCase; -import org.jbpm.pvm.Execution; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -16,8 +16,8 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; @@ -72,8 +72,8 @@ } public void testGoodRating() { - Deployment deployment = new Deployment(createCreditProcess()); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(createCreditProcess()); + processService.deploy(deploymentImpl); Map<String, Object> variables = new HashMap<String, Object>(); variables.put("creditRate", 7); @@ -84,8 +84,8 @@ } public void testAverageRating() { - Deployment deployment = new Deployment(createCreditProcess()); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(createCreditProcess()); + processService.deploy(deploymentImpl); Map<String, Object> variables = new HashMap<String, Object>(); variables.put("creditRate", 2); @@ -97,8 +97,8 @@ } public void testBadRating() { - Deployment deployment = new Deployment(createCreditProcess()); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(createCreditProcess()); + processService.deploy(deploymentImpl); Map<String, Object> variables = new HashMap<String, Object>(); variables.put("creditRate", -7); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; @@ -75,8 +75,8 @@ .node("f").behaviour(AutomaticActivity.class) .done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); Execution processInstance = executionService.startExecution("myProcess:1", "one"); 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -28,11 +28,11 @@ import junit.framework.Test; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.ProcessService; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessService; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.test.base.DbTestCase; @@ -58,8 +58,8 @@ ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").version(1).key("NCLFU").node("initial").initial() .behaviour(WaitState.class).done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); ExecutionService executionService = getEnvironmentFactory().get(ExecutionService.class); @@ -88,8 +88,8 @@ ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").version(1).key("NCLFU").node("initial").initial() .behaviour(WaitState.class).done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); ExecutionService executionService = getEnvironmentFactory().get(ExecutionService.class); @@ -114,7 +114,7 @@ ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").version(1).key("NCLFU").node("initial").initial() .behaviour(WaitState.class).done(); - processService.deploy(new Deployment(processDefinition)); + processService.deploy(new DeploymentImpl(processDefinition)); // create the map with variables Map<String, Object> variables = new HashMap<String, Object>(); @@ -280,28 +280,28 @@ ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").key("NFU").node("initial").initial().behaviour( WaitState.class).done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("ultimate seduction").key("USD").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("ultimate seduction").key("USD").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("nuclear fusion").key("NFU").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("publish book").key("PBO").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("nuclear fusion").key("NFU").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); } Execution startExecution() @@ -310,8 +310,8 @@ ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class) .done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); ExecutionService executionService = getEnvironmentFactory().get(ExecutionService.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import junit.framework.Test; -import org.jbpm.pvm.ManagementService; +import org.jbpm.ManagementService; import org.jbpm.pvm.test.base.DbTestCase; import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -26,10 +26,10 @@ import junit.framework.Test; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessDefinition; -import org.jbpm.pvm.ProcessService; -import org.jbpm.pvm.PvmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessService; +import org.jbpm.PvmException; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.test.base.DbTestCase; import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup; @@ -54,8 +54,8 @@ .done(); // deploy it - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); // fetch it back from the process service List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); @@ -78,8 +78,8 @@ .done(); // deploy it - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); // look it up again List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); @@ -95,8 +95,8 @@ processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class).done(); // deploy the second process - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); // verify that there now are 2 process definitions with that name processDefinitions = processService.findProcessDefinitions("nuclear fusion"); @@ -119,8 +119,8 @@ WaitState.class).done(); // deploy it - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); // load it List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); @@ -141,8 +141,8 @@ ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class) .done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); assertNotNull(processDefinitions); @@ -164,8 +164,8 @@ ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").key("NCF").node("initial").initial().behaviour( WaitState.class).done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); List<ProcessDefinition> processDefinitions = processService.findProcessDefinitions("nuclear fusion"); assertNotNull(processDefinitions); @@ -187,7 +187,7 @@ WaitState.class).done(); // deploy it - processService.deploy(new Deployment(processDefinition)); + processService.deploy(new DeploymentImpl(processDefinition)); // then we create a process definition with the same name and version processDefinition = ProcessFactory.build("nuclear fusion").version(1).node("initial").initial().behaviour(WaitState.class).done(); @@ -195,7 +195,7 @@ try { // and then we verify that the deployment fails - processService.deploy(new Deployment(processDefinition)); + processService.deploy(new DeploymentImpl(processDefinition)); fail("expected exception"); } catch (PvmException e) @@ -213,8 +213,8 @@ WaitState.class).done(); // deploy it - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); // load it with by name and version processDefinition = processService.findProcessDefinition("nuclear fusion", 35); @@ -296,27 +296,27 @@ ProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class) .done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("ultimate seduction").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("ultimate seduction").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("publish book").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); processDefinition = ProcessFactory.build("nuclear fusion").node("initial").initial().behaviour(WaitState.class).done(); - deployment = new Deployment(processDefinition); - processService.deploy(deployment); + deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); } } 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -1,8 +1,8 @@ package org.jbpm.pvm.api.timer; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ManagementService; -import org.jbpm.pvm.ProcessService; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessService; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.PvmEnvironmentFactory; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -18,10 +18,10 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ProcessService; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; +import org.jbpm.ProcessService; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.env.Environment; @@ -71,8 +71,8 @@ private static ExecutionImpl deployAndInstanciateProcess(OpenProcessDefinition definition) { ProcessService processService = Environment.getCurrent().get(ProcessService.class); - Deployment deployment = new Deployment(definition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(definition); + processService.deploy(deploymentImpl); Execution processInstance = getExecutionService().startExecutionInLatest(definition.getName()); 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -28,7 +28,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,11 +21,11 @@ */ package org.jbpm.pvm.example02; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ManagementService; -import org.jbpm.pvm.ProcessService; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessService; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.example01.AutomaticActivity; @@ -58,8 +58,8 @@ .node("end").behaviour(WaitState.class) .done(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); Execution execution = executionService.startExecution("loan:1", "request7836"); 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.example04; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.test.base.JbpmTestCase; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -27,7 +27,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.internal.db.type.VariableCustomTypeTest; import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -32,8 +32,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.ProcessService; +import org.jbpm.ProcessService; +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; @@ -287,9 +287,9 @@ ClientProcessDefinition processDefinition = ProcessFactory.build("excl") .node("initial").initial().behaviour(WaitState.class) .done(); - Deployment deployment = new Deployment(processDefinition); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); ProcessService processService = environment.get(ProcessService.class); - processService.deploy(deployment); + processService.deploy(deploymentImpl); PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); MessageSession messageSession = environment.get(MessageSession.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.PvmException; +import org.jbpm.PvmException; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireException; import org.jbpm.pvm.internal.xml.Problem; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.jbpm.PvmException; import org.jbpm.pvm.test.base.JbpmTestCase; -import org.jbpm.pvm.PvmException; import org.jbpm.pvm.internal.util.TagBinding; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.xml.Bindings; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,11 +21,11 @@ */ package org.jbpm.pvm.samples; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessService; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.PvmEnvironmentFactory; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ProcessService; -import org.jbpm.pvm.ManagementService; /** 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,10 +23,10 @@ import junit.framework.TestCase; -import org.jbpm.pvm.Deployment; -import org.jbpm.pvm.Execution; -import org.jbpm.pvm.ExecutionService; -import org.jbpm.pvm.ProcessService; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; +import org.jbpm.ProcessService; +import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.ExamplesConfiguration; @@ -54,8 +54,8 @@ ProcessService processService = ExamplesConfiguration.getProcessService(); - Deployment deployment = new Deployment(processDefinition); - processService.deploy(deployment); + DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); + processService.deploy(deploymentImpl); ExecutionService executionService = ExamplesConfiguration.getExecutionService(); 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.samples.activities.AutomaticActivity; import org.jbpm.pvm.samples.activities.WaitState; import org.jbpm.pvm.client.ClientProcessDefinition; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.samples.activities.WaitState; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientExecution; 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-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/Task.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.samples.ex06; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; import org.jbpm.pvm.client.ClientExecution; public class Task { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskService.java 2008-10-30 15:04:08 UTC (rev 2681) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex06/TaskService.java 2008-10-30 15:05:34 UTC (rev 2682) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.Execution; +import org.jbpm.Execution; public abstract class TaskService {