Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 70e50b36 编写于 作者: T tombaeyens
浏览文件
操作

ACT-267 merged pvm module into engine

上级 06aae939
展开全部 隐藏空白更改
内联 并排
Showing with 362 addition and 473 deletion
distro/build.xml
浏览文件 @ 70e50b36
......@@ -22,13 +22,6 @@
<fileset dir="src" />
</copy>
<mkdir dir="${target.distro.root}/examples/activiti-pvm-examples/src" />
<copy todir="${target.distro.root}/examples/activiti-pvm-examples/src">
<fileset dir="../modules/activiti-pvm/src/test/java">
<include name="org/activiti/examples/**" />
</fileset>
</copy>
<mkdir dir="${target.distro.root}/examples/activiti-engine-examples/src" />
<copy todir="${target.distro.root}/examples/activiti-engine-examples/src">
<fileset dir="../modules/activiti-engine/src/test/java">
......@@ -54,7 +47,6 @@
<copy todir="${target.distro.root}/setup/files/examples">
<fileset dir="..">
<include name="pom.xml" />
<include name="modules/activiti-pvm/pom.xml" />
<include name="modules/activiti-engine/pom.xml" />
<include name="modules/activiti-spring/pom.xml" />
</fileset>
......@@ -71,19 +63,15 @@
<fileset dir="../modules/activiti-engine/target">
<include name="activiti-engine-*.jar"/>
</fileset>
<fileset dir="../modules/activiti-pvm/target">
<include name="activiti-pvm-*.jar"/>
</fileset>
<fileset dir="../modules/activiti-spring/target">
<include name="activiti-spring-*.jar"/>
</fileset>
<!--added to copy activiti-cycle-*.jar
we have to include it, otherwise we get a NPE in the ant setup (why??)
-->
<fileset dir="../modules/activiti-cycle/target">
<include name="activiti-cycle-*.jar"/>
</fileset>
<fileset dir="../modules/activiti-cycle/target">
<include name="activiti-cycle-*.jar"/>
</fileset>
</copy>
<mkdir dir="${target.distro.root}/setup/files/webapps/activiti-probe.war" />
......
distro/src/setup/build.xml
浏览文件 @ 70e50b36
......@@ -77,16 +77,10 @@
<target name="demo.teardown" depends="tomcat.stop, db.drop, h2.stop" />
<target name="examples.get.libs.all"
depends="examples.get.libs.pvm,
examples.get.libs.engine,
depends="examples.get.libs.engine,
examples.get.libs.spring"
description="retrieves the libs for all the examples" />
<available property="is.examples.pvm.libs.fetched" file="${activiti.home}/examples/activiti-pvm-examples/libs-runtime" />
<target name="examples.get.libs.pvm" depends="maven.install, internal.install.activiti.libs" unless="is.examples.pvm.libs.fetched">
<get-module-libs module="pvm" profile="" />
</target>
<available property="is.examples.engine.libs.fetched" file="${activiti.home}/examples/activiti-engine-examples/libs-runtime" />
<target name="examples.get.libs.engine" depends="maven.install, internal.install.activiti.libs" unless="is.examples.engine.libs.fetched">
<get-module-libs module="engine" profile="-Ddatabase=${db}" />
......@@ -124,9 +118,6 @@
</target>
<target name="internal.install.activiti.libs">
<exec dir="${activiti.home}/lib" executable="../${maven.path}" vmlauncher="${vmlauncher}">
<arg line="install:install-file -Dfile=activiti-pvm-${activiti.version}.jar -DgroupId=org.activiti -DartifactId=activiti-pvm -Dpackaging=jar -Dversion=${activiti.version}"/>
</exec>
<exec dir="${activiti.home}/lib" executable="../${maven.path}" vmlauncher="${vmlauncher}">
<arg line="install:install-file -Dfile=activiti-engine-${activiti.version}.jar -DgroupId=org.activiti -DartifactId=activiti-engine -Dpackaging=jar -Dversion=${activiti.version}"/>
</exec>
......@@ -297,7 +288,6 @@ JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787
<target name="deploy.activiti.engine.into.tomcat" depends="cfg.create, examples.get.libs.engine">
<copy todir="${tomcat.home}/lib">
<fileset dir="${activiti.home}/examples/activiti-engine-examples/libs-runtime">
<include name="activiti-pvm-${activiti.version}.jar"/>
<include name="activiti-engine-${activiti.version}.jar"/>
<include name="activiti-juel-*.jar"/>
<include name="mybatis-*.jar"/>
......
modules/activiti-engine/pom.xml
浏览文件 @ 70e50b36
......@@ -15,10 +15,6 @@
</parent>
<dependencies>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-pvm</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
......
modules/activiti-engine/src/main/java/org/activiti/engine/RepositoryService.java
浏览文件 @ 70e50b36
......@@ -16,10 +16,10 @@ package org.activiti.engine;
import java.io.InputStream;
import java.util.List;
import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
import org.activiti.engine.repository.DeploymentBuilder;
import org.activiti.engine.repository.DeploymentQuery;
import org.activiti.engine.repository.ProcessDefinitionQuery;
import org.activiti.pvm.process.ReadOnlyProcessDefinition;
/** Service providing access to the repository of process definitions and deployments.
......
modules/activiti-engine/src/main/java/org/activiti/engine/bpmn/BpmnJavaDelegation.java
浏览文件 @ 70e50b36
......@@ -13,12 +13,12 @@
package org.activiti.engine.bpmn;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.bpmn.BpmnActivityBehavior;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
* Convience class that should be used when a Java delegation in a BPMN 2.0
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/activity/ActivityBehavior.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/ActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.activity;
package org.activiti.engine.delegate;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/activity/ActivityExecution.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/ActivityExecution.java
浏览文件 @ 70e50b36
......@@ -10,15 +10,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.activity;
package org.activiti.engine.delegate;
import java.util.List;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.process.PvmActivity;
import org.activiti.pvm.process.PvmProcessDefinition;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.pvm.runtime.PvmProcessInstance;
import org.activiti.engine.impl.pvm.PvmActivity;
import org.activiti.engine.impl.pvm.PvmProcessDefinition;
import org.activiti.engine.impl.pvm.PvmProcessInstance;
import org.activiti.engine.impl.pvm.PvmTransition;
/**
* @author Tom Baeyens
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/delegate/DelegateExecution.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/DelegateExecution.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.delegate;
package org.activiti.engine.delegate;
import java.util.Map;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/event/EventListener.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/EventListener.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.event;
package org.activiti.engine.delegate;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/event/EventListenerExecution.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/EventListenerExecution.java
浏览文件 @ 70e50b36
......@@ -10,10 +10,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.event;
package org.activiti.engine.delegate;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.process.PvmProcessElement;
import org.activiti.engine.impl.pvm.PvmProcessElement;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/activity/SignallableActivityBehavior.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/SignallableActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.activity;
package org.activiti.engine.delegate;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/activity/SubProcessActivityBehavior.java → modules/activiti-engine/src/main/java/org/activiti/engine/delegate/SubProcessActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -11,9 +11,8 @@
* limitations under the License.
*/
package org.activiti.pvm.activity;
package org.activiti.engine.delegate;
import org.activiti.pvm.delegate.DelegateExecution;
/** behavior for activities that delegate to a complete separate execution of
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/RepositoryServiceImpl.java
浏览文件 @ 70e50b36
......@@ -22,12 +22,12 @@ import org.activiti.engine.impl.cmd.DeployCmd;
import org.activiti.engine.impl.cmd.GetDeploymentProcessDefinitionCmd;
import org.activiti.engine.impl.cmd.GetDeploymentResourceCmd;
import org.activiti.engine.impl.cmd.GetDeploymentResourceNamesCmd;
import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
import org.activiti.engine.impl.repository.DeploymentBuilderImpl;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.DeploymentBuilder;
import org.activiti.engine.repository.DeploymentQuery;
import org.activiti.engine.repository.ProcessDefinitionQuery;
import org.activiti.pvm.process.ReadOnlyProcessDefinition;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ant/DeployBarTask.java
浏览文件 @ 70e50b36
......@@ -24,7 +24,7 @@ import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessEngineInfo;
import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RepositoryService;
import org.activiti.pvm.impl.util.LogUtil;
import org.activiti.engine.impl.util.LogUtil;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/AbstractBpmnActivity.java
浏览文件 @ 70e50b36
......@@ -13,8 +13,8 @@
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.activity.SignallableActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.SignallableActivityBehavior;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/BoundaryTimerEventActivity.java
浏览文件 @ 70e50b36
......@@ -15,9 +15,9 @@ package org.activiti.engine.impl.bpmn;
import java.util.ArrayList;
import java.util.List;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.pvm.PvmTransition;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/BpmnActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -18,9 +18,9 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.impl.pvm.PvmTransition;
/**
* helper class for implementing BPMN 2.0 activities, offering convience methods
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/CallActivityBehaviour.java
浏览文件 @ 70e50b36
......@@ -13,12 +13,12 @@
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.SubProcessActivityBehavior;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.activity.SubProcessActivityBehavior;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.runtime.PvmProcessInstance;
import org.activiti.engine.impl.pvm.PvmProcessInstance;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/Condition.java
浏览文件 @ 70e50b36
......@@ -12,7 +12,7 @@
*/
package org.activiti.engine.impl.bpmn;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateExecution;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/DelegateEventListener.java
浏览文件 @ 70e50b36
......@@ -16,9 +16,9 @@ package org.activiti.engine.impl.bpmn;
import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.bpmn.parser.FieldDeclaration;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
* EventListener that delegates the event notification to an instance of
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ExclusiveGatewayActivity.java
浏览文件 @ 70e50b36
......@@ -17,9 +17,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.impl.pvm.PvmTransition;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ExpressionEventListener.java
浏览文件 @ 70e50b36
......@@ -13,9 +13,9 @@
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.el.Expression;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
* An {@link EventListener} that evaluates a {@link Expression} when notified.
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/MailActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -15,10 +15,10 @@ package org.activiti.engine.impl.bpmn;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.bpmn.BpmnJavaDelegation;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.el.Expression;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.pvm.delegate.DelegateExecution;
import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/NoneEndEventActivity.java
浏览文件 @ 70e50b36
......@@ -12,7 +12,7 @@
*/
package org.activiti.engine.impl.bpmn;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.engine.delegate.ActivityExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ParallelGatewayActivity.java
浏览文件 @ 70e50b36
......@@ -17,10 +17,10 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.pvm.PvmActivity;
import org.activiti.engine.impl.pvm.PvmTransition;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.process.PvmActivity;
import org.activiti.pvm.process.PvmTransition;
/**
* Implementation of the Parallel Gateway/AND gateway as definined in the BPMN
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ReceiveTaskActivity.java
浏览文件 @ 70e50b36
......@@ -14,7 +14,7 @@
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.RuntimeService;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.engine.delegate.ActivityExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ScriptTaskActivity.java
浏览文件 @ 70e50b36
......@@ -12,9 +12,9 @@
*/
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.scripting.ScriptingEngines;
import org.activiti.pvm.activity.ActivityExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ServiceTaskDelegateActivityBehaviour.java
浏览文件 @ 70e50b36
......@@ -16,10 +16,10 @@ package org.activiti.engine.impl.bpmn;
import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.SignallableActivityBehavior;
import org.activiti.engine.impl.bpmn.parser.FieldDeclaration;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.activity.SignallableActivityBehavior;
/**
* @author dsyer
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/ServiceTaskExpressionActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -13,9 +13,9 @@
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.el.Expression;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.ActivityExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/SubProcessActivity.java
浏览文件 @ 70e50b36
......@@ -16,12 +16,12 @@ package org.activiti.engine.impl.bpmn;
import java.util.ArrayList;
import java.util.List;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.CompositeActivityBehavior;
import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.activity.CompositeActivityBehavior;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.process.PvmActivity;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.impl.pvm.PvmActivity;
import org.activiti.engine.impl.pvm.PvmTransition;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/UserTaskActivity.java
浏览文件 @ 70e50b36
......@@ -12,11 +12,11 @@
*/
package org.activiti.engine.impl.bpmn;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.el.Expression;
import org.activiti.engine.impl.el.ExpressionManager;
import org.activiti.engine.impl.task.TaskDefinition;
import org.activiti.engine.impl.task.TaskEntity;
import org.activiti.pvm.activity.ActivityExecution;
/**
* activity implementation for the user task.
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/WebServiceActivityBehavior.java
浏览文件 @ 70e50b36
......@@ -16,11 +16,11 @@ import java.util.ArrayList;
import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.transformer.Identity;
import org.activiti.engine.impl.transformer.Transformer;
import org.activiti.engine.impl.webservice.SyncWebServiceClient;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.ActivityExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
浏览文件 @ 70e50b36
......@@ -22,6 +22,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.bpmn.BoundaryTimerEventActivity;
import org.activiti.engine.impl.bpmn.BpmnInterface;
import org.activiti.engine.impl.bpmn.BpmnInterfaceImplementation;
......@@ -61,6 +63,10 @@ import org.activiti.engine.impl.form.StartFormHandler;
import org.activiti.engine.impl.form.TaskFormHandler;
import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl;
import org.activiti.engine.impl.jobexecutor.TimerExecuteNestedActivityJobHandler;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
import org.activiti.engine.impl.repository.DeploymentEntity;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.scripting.ScriptingEngines;
......@@ -70,12 +76,6 @@ import org.activiti.engine.impl.util.xml.Element;
import org.activiti.engine.impl.util.xml.Parse;
import org.activiti.engine.impl.variable.VariableDeclaration;
import org.activiti.engine.impl.webservice.WSDLImporter;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
/**
* Specific parsing representation created by the {@link BpmnParser} to parse
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParseListener.java
浏览文件 @ 70e50b36
......@@ -13,12 +13,12 @@
package org.activiti.engine.impl.bpmn.parser;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.util.xml.Element;
import org.activiti.engine.impl.variable.VariableDeclaration;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/UnresolvedReference.java
浏览文件 @ 70e50b36
......@@ -12,7 +12,7 @@
*/
package org.activiti.engine.impl.bpmn.parser;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/RepositorySession.java
浏览文件 @ 70e50b36
......@@ -18,13 +18,13 @@ import java.util.List;
import org.activiti.engine.impl.DeploymentQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessDefinitionQueryImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.repository.DeploymentEntity;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.repository.ResourceEntity;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.DeploymentBuilder;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CompleteTaskCmd.java
浏览文件 @ 70e50b36
......@@ -18,8 +18,8 @@ import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.cfg.TaskSession;
import org.activiti.engine.impl.interceptor.Command;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.pvm.PvmExecution;
import org.activiti.engine.impl.task.TaskEntity;
import org.activiti.pvm.runtime.PvmExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentProcessDefinitionCmd.java
浏览文件 @ 70e50b36
......@@ -16,7 +16,7 @@ package org.activiti.engine.impl.cmd;
import org.activiti.engine.impl.cfg.RepositorySession;
import org.activiti.engine.impl.interceptor.Command;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.pvm.process.ReadOnlyProcessDefinition;
import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java
浏览文件 @ 70e50b36
......@@ -26,8 +26,8 @@ import org.activiti.engine.ActivitiOptimisticLockingException;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.interceptor.Session;
import org.activiti.engine.impl.runtime.VariableInstanceEntity;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.engine.impl.variable.DeserializedObject;
import org.activiti.pvm.impl.util.ClassNameUtil;
import org.apache.ibatis.session.RowBounds;
import org.apache.ibatis.session.SqlSession;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
浏览文件 @ 70e50b36
......@@ -35,10 +35,10 @@ import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.interceptor.Session;
import org.activiti.engine.impl.interceptor.SessionFactory;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.engine.impl.util.IoUtil;
import org.activiti.engine.impl.util.ReflectUtil;
import org.activiti.engine.impl.variable.VariableType;
import org.activiti.pvm.impl.util.ClassNameUtil;
import org.apache.ibatis.builder.xml.XMLConfigBuilder;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.apache.ibatis.mapping.Environment;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/ExecutionVariableElResolver.java
浏览文件 @ 70e50b36
......@@ -15,9 +15,9 @@ package org.activiti.engine.impl.el;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
import org.activiti.javax.el.ELContext;
import org.activiti.javax.el.ELResolver;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/Expression.java
浏览文件 @ 70e50b36
......@@ -13,7 +13,7 @@
package org.activiti.engine.impl.el;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/ExpressionManager.java
浏览文件 @ 70e50b36
......@@ -13,6 +13,7 @@
package org.activiti.engine.impl.el;
import org.activiti.el.juel.ExpressionFactoryImpl;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.javax.el.ArrayELResolver;
import org.activiti.javax.el.BeanELResolver;
......@@ -23,7 +24,6 @@ import org.activiti.javax.el.ExpressionFactory;
import org.activiti.javax.el.ListELResolver;
import org.activiti.javax.el.MapELResolver;
import org.activiti.javax.el.ValueExpression;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/FixedValue.java
浏览文件 @ 70e50b36
......@@ -14,7 +14,7 @@
package org.activiti.engine.impl.el;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateExecution;
/**
* Expression that always returns the same value when <code>getValue</code> is
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/JuelExpression.java
浏览文件 @ 70e50b36
......@@ -14,13 +14,13 @@
package org.activiti.engine.impl.el;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
import org.activiti.javax.el.ELContext;
import org.activiti.javax.el.ELException;
import org.activiti.javax.el.MethodNotFoundException;
import org.activiti.javax.el.PropertyNotFoundException;
import org.activiti.javax.el.ValueExpression;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/UelExpressionCondition.java
浏览文件 @ 70e50b36
......@@ -14,8 +14,8 @@
package org.activiti.engine.impl.el;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.bpmn.Condition;
import org.activiti.pvm.delegate.DelegateExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/ActivityInstanceEndHandler.java
浏览文件 @ 70e50b36
......@@ -17,6 +17,8 @@ import java.util.Date;
import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.impl.HistoricActivityInstanceQueryImpl;
import org.activiti.engine.impl.Page;
......@@ -25,8 +27,6 @@ import org.activiti.engine.impl.history.HistoricActivityInstanceEntity;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/ActivityInstanceStartHandler.java
浏览文件 @ 70e50b36
......@@ -13,13 +13,13 @@
package org.activiti.engine.impl.history.handler;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.cfg.IdGenerator;
import org.activiti.engine.impl.history.HistoricActivityInstanceEntity;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/HistoryParseListener.java
浏览文件 @ 70e50b36
......@@ -13,14 +13,14 @@
package org.activiti.engine.impl.history.handler;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.bpmn.parser.BpmnParseListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.util.xml.Element;
import org.activiti.engine.impl.variable.VariableDeclaration;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/ProcessInstanceEndHandler.java
浏览文件 @ 70e50b36
......@@ -15,11 +15,11 @@ package org.activiti.engine.impl.history.handler;
import java.util.Date;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.history.HistoricProcessInstanceEntity;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/ProcessInstanceStartHandler.java
浏览文件 @ 70e50b36
......@@ -13,12 +13,12 @@
package org.activiti.engine.impl.history.handler;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.impl.history.HistoricProcessInstanceEntity;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.event.EventListenerExecution;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/interceptor/LogInterceptor.java
浏览文件 @ 70e50b36
......@@ -15,7 +15,7 @@ package org.activiti.engine.impl.interceptor;
import java.util.logging.Logger;
import org.activiti.pvm.impl.util.ClassNameUtil;
import org.activiti.engine.impl.util.ClassNameUtil;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerExecuteNestedActivityJobHandler.java
浏览文件 @ 70e50b36
......@@ -17,8 +17,8 @@ import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.pvm.impl.process.ActivityImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/ProcessDefinitionBuilder.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/ProcessDefinitionBuilder.java
浏览文件 @ 70e50b36
......@@ -11,20 +11,19 @@
* limitations under the License.
*/
package org.activiti.pvm;
package org.activiti.engine.impl.pvm;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.ProcessElementImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
import org.activiti.pvm.process.PvmProcessDefinition;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ProcessElementImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/process/PvmActivity.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmActivity.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.process;
package org.activiti.engine.impl.pvm;
import java.util.List;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/PvmException.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmException.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm;
package org.activiti.engine.impl.pvm;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/runtime/PvmExecution.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmExecution.java
浏览文件 @ 70e50b36
......@@ -11,11 +11,10 @@
* limitations under the License.
*/
package org.activiti.pvm.runtime;
package org.activiti.engine.impl.pvm;
import java.util.Map;
import org.activiti.pvm.process.PvmActivity;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/process/PvmProcessDefinition.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmProcessDefinition.java
浏览文件 @ 70e50b36
......@@ -11,9 +11,8 @@
* limitations under the License.
*/
package org.activiti.pvm.process;
package org.activiti.engine.impl.pvm;
import org.activiti.pvm.runtime.PvmProcessInstance;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/process/PvmProcessElement.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmProcessElement.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.process;
package org.activiti.engine.impl.pvm;
import java.io.Serializable;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/runtime/PvmProcessInstance.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmProcessInstance.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.runtime;
package org.activiti.engine.impl.pvm;
import java.util.List;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/process/PvmScope.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmScope.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.process;
package org.activiti.engine.impl.pvm;
import java.util.List;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/process/PvmTransition.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/PvmTransition.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.process;
package org.activiti.engine.impl.pvm;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/process/ActivityImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/process/ActivityImpl.java
浏览文件 @ 70e50b36
......@@ -11,17 +11,17 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.process;
package org.activiti.engine.impl.pvm.process;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.process.PvmActivity;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.impl.pvm.PvmActivity;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.PvmTransition;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/process/ProcessDefinitionImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/process/ProcessDefinitionImpl.java
浏览文件 @ 70e50b36
......@@ -11,14 +11,14 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.process;
package org.activiti.engine.impl.pvm.process;
import java.util.ArrayList;
import java.util.List;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.pvm.process.PvmProcessDefinition;
import org.activiti.pvm.runtime.PvmProcessInstance;
import org.activiti.engine.impl.pvm.PvmProcessDefinition;
import org.activiti.engine.impl.pvm.PvmProcessInstance;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/process/ProcessElementImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/process/ProcessElementImpl.java
浏览文件 @ 70e50b36
......@@ -11,13 +11,13 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.process;
package org.activiti.engine.impl.pvm.process;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.activiti.pvm.process.PvmProcessElement;
import org.activiti.engine.impl.pvm.PvmProcessElement;
/** common properties for process definition, activity and transition
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/process/ScopeImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/process/ScopeImpl.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.process;
package org.activiti.engine.impl.pvm.process;
import java.util.ArrayList;
import java.util.Collections;
......@@ -19,9 +19,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.process.PvmScope;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.PvmScope;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/process/TransitionImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/process/TransitionImpl.java
浏览文件 @ 70e50b36
......@@ -11,14 +11,14 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.process;
package org.activiti.engine.impl.pvm.process;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.PvmTransition;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AbstractEventAtomicOperation.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AbstractEventAtomicOperation.java
浏览文件 @ 70e50b36
......@@ -11,13 +11,13 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperation.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperation.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationActivityEnd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationActivityEnd.java
浏览文件 @ 70e50b36
......@@ -11,13 +11,13 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.CompositeActivityBehavior;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.CompositeActivityBehavior;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationActivityExecute.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationActivityExecute.java
浏览文件 @ 70e50b36
......@@ -10,13 +10,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.logging.Logger;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationActivityStart.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationActivityStart.java
浏览文件 @ 70e50b36
......@@ -11,10 +11,10 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationDeleteCascade.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationDeleteCascade.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationDeleteCascadeFireActivityEnd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationDeleteCascadeFireActivityEnd.java
浏览文件 @ 70e50b36
......@@ -11,11 +11,11 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationProcessEnd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationProcessEnd.java
浏览文件 @ 70e50b36
......@@ -11,11 +11,11 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.activity.SubProcessActivityBehavior;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.delegate.SubProcessActivityBehavior;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationProcessStart.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationProcessStart.java
浏览文件 @ 70e50b36
......@@ -11,14 +11,14 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationProcessStartInitial.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationProcessStartInitial.java
浏览文件 @ 70e50b36
......@@ -11,14 +11,14 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationTransitionCreateScope.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationTransitionCreateScope.java
浏览文件 @ 70e50b36
......@@ -10,11 +10,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.logging.Logger;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationTransitionDestroyScope.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationTransitionDestroyScope.java
浏览文件 @ 70e50b36
......@@ -10,14 +10,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
import java.util.logging.Logger;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationTransitionNotifyListenerEnd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationTransitionNotifyListenerEnd.java
浏览文件 @ 70e50b36
......@@ -10,10 +10,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationTransitionNotifyListenerStart.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationTransitionNotifyListenerStart.java
浏览文件 @ 70e50b36
......@@ -10,12 +10,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/AtomicOperationTransitionNotifyListenerTake.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationTransitionNotifyListenerTake.java
浏览文件 @ 70e50b36
......@@ -10,16 +10,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.util.List;
import java.util.logging.Logger;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.event.EventListener;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
import org.activiti.engine.delegate.EventListener;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/ExecutionImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/ExecutionImpl.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import java.io.Serializable;
import java.util.ArrayList;
......@@ -20,19 +20,19 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.pvm.PvmException;
import org.activiti.pvm.activity.ActivityExecution;
import org.activiti.pvm.activity.SignallableActivityBehavior;
import org.activiti.pvm.event.EventListenerExecution;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.TransitionImpl;
import org.activiti.pvm.process.PvmActivity;
import org.activiti.pvm.process.PvmProcessDefinition;
import org.activiti.pvm.process.PvmProcessElement;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.pvm.runtime.PvmExecution;
import org.activiti.pvm.runtime.PvmProcessInstance;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.delegate.EventListenerExecution;
import org.activiti.engine.delegate.SignallableActivityBehavior;
import org.activiti.engine.impl.pvm.PvmActivity;
import org.activiti.engine.impl.pvm.PvmException;
import org.activiti.engine.impl.pvm.PvmExecution;
import org.activiti.engine.impl.pvm.PvmProcessDefinition;
import org.activiti.engine.impl.pvm.PvmProcessElement;
import org.activiti.engine.impl.pvm.PvmProcessInstance;
import org.activiti.engine.impl.pvm.PvmTransition;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.TransitionImpl;
/**
* @author Tom Baeyens
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/runtime/OutgoingExecution.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/OutgoingExecution.java
浏览文件 @ 70e50b36
......@@ -11,9 +11,9 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.runtime;
package org.activiti.engine.impl.pvm.runtime;
import org.activiti.pvm.process.PvmTransition;
import org.activiti.engine.impl.pvm.PvmTransition;
/**
*
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/repository/ProcessDefinitionEntity.java
浏览文件 @ 70e50b36
......@@ -22,12 +22,12 @@ import org.activiti.engine.impl.form.StartFormHandler;
import org.activiti.engine.impl.history.HistoricProcessInstanceEntity;
import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
import org.activiti.engine.impl.runtime.ExecutionEntity;
import org.activiti.engine.impl.runtime.VariableMap;
import org.activiti.engine.impl.task.TaskDefinition;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/runtime/ExecutionEntity.java
浏览文件 @ 70e50b36
......@@ -33,18 +33,18 @@ import org.activiti.engine.impl.history.HistoricActivityInstanceEntity;
import org.activiti.engine.impl.history.HistoricProcessInstanceEntity;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl;
import org.activiti.engine.impl.pvm.PvmProcessDefinition;
import org.activiti.engine.impl.pvm.PvmProcessInstance;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
import org.activiti.engine.impl.pvm.process.ScopeImpl;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
import org.activiti.engine.impl.task.TaskEntity;
import org.activiti.engine.impl.variable.VariableDeclaration;
import org.activiti.engine.runtime.Execution;
import org.activiti.engine.runtime.Job;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.javax.el.ELContext;
import org.activiti.pvm.impl.process.ActivityImpl;
import org.activiti.pvm.impl.process.ProcessDefinitionImpl;
import org.activiti.pvm.impl.process.ScopeImpl;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.pvm.process.PvmProcessDefinition;
import org.activiti.pvm.runtime.PvmProcessInstance;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/scripting/ExecutionBindings.java
浏览文件 @ 70e50b36
......@@ -21,7 +21,7 @@ import java.util.Set;
import javax.script.Bindings;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/scripting/ScriptCondition.java
浏览文件 @ 70e50b36
......@@ -13,9 +13,9 @@
package org.activiti.engine.impl.scripting;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.bpmn.Condition;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.pvm.delegate.DelegateExecution;
/**
* @author Tom Baeyens
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/scripting/ScriptingEngines.java
浏览文件 @ 70e50b36
......@@ -22,8 +22,8 @@ import javax.script.ScriptException;
import javax.script.SimpleBindings;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.delegate.DelegateExecution;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
/**
* @author Tom Baeyens
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/task/TaskEntity.java
浏览文件 @ 70e50b36
......@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.cfg.RepositorySession;
import org.activiti.engine.impl.db.PersistentObject;
import org.activiti.engine.impl.interceptor.CommandContext;
......@@ -31,7 +32,6 @@ import org.activiti.engine.impl.runtime.VariableMap;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.engine.task.IdentityLinkType;
import org.activiti.engine.task.Task;
import org.activiti.pvm.delegate.DelegateExecution;
/**
* @author Tom Baeyens
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/ActivitiInternalTestCase.java
浏览文件 @ 70e50b36
......@@ -39,9 +39,8 @@ import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.jobexecutor.JobExecutor;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.engine.impl.util.ReflectUtil;
import org.activiti.engine.impl.util.LogUtil.ThreadLogMode;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.pvm.impl.util.LogUtil.ThreadLogMode;
import org.activiti.pvm.test.PvmTestCase;
import org.junit.Assert;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/test/PvmTestCase.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/PvmTestCase.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.test;
package org.activiti.engine.impl.test;
import java.util.logging.Level;
import java.util.logging.Logger;
......@@ -19,9 +19,9 @@ import java.util.logging.Logger;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.activiti.pvm.impl.util.ClassNameUtil;
import org.activiti.pvm.impl.util.LogUtil;
import org.activiti.pvm.impl.util.LogUtil.ThreadLogMode;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.engine.impl.util.LogUtil;
import org.activiti.engine.impl.util.LogUtil.ThreadLogMode;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/TestHelper.java
浏览文件 @ 70e50b36
......@@ -31,10 +31,10 @@ import org.activiti.engine.impl.ProcessEngineImpl;
import org.activiti.engine.impl.bpmn.deployer.BpmnDeployer;
import org.activiti.engine.impl.db.DbSqlSessionFactory;
import org.activiti.engine.impl.jobexecutor.JobExecutor;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.engine.repository.DeploymentBuilder;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.test.Deployment;
import org.activiti.pvm.impl.util.ClassNameUtil;
/**
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/util/ClassNameUtil.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/ClassNameUtil.java
浏览文件 @ 70e50b36
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.pvm.impl.util;
package org.activiti.engine.impl.util;
import java.util.HashMap;
import java.util.Map;
......
modules/activiti-pvm/src/main/java/org/activiti/pvm/impl/util/LogUtil.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/LogUtil.java
浏览文件 @ 70e50b36
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.pvm.impl.util;
package org.activiti.engine.impl.util;
import java.io.InputStream;
import java.io.PrintWriter;
......@@ -25,7 +25,7 @@ import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;
import org.activiti.pvm.PvmException;
import org.activiti.engine.impl.pvm.PvmException;
/**
* @author Tom Baeyens
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/variable/VariableDeclaration.java
浏览文件 @ 70e50b36
......@@ -16,7 +16,7 @@ import java.io.Serializable;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.el.Expression;
import org.activiti.pvm.impl.runtime.ExecutionImpl;
import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
/**
......
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/webservice/WebServiceActivityBehaviorTest.java
浏览文件 @ 70e50b36
......@@ -18,6 +18,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.bpmn.ItemDefinition;
import org.activiti.engine.impl.bpmn.Message;
import org.activiti.engine.impl.bpmn.Operation;
......@@ -27,7 +28,6 @@ import org.activiti.engine.impl.transformer.Transformer;
import org.activiti.engine.impl.webservice.SyncWebServiceClient;
import org.activiti.engine.impl.webservice.WSOperation;
import org.activiti.engine.impl.webservice.WSService;
import org.activiti.pvm.activity.ActivityExecution;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
......
modules/activiti-engine/src/test/java/org/activiti/engine/test/concurrency/CompetingSignalsTest.java
浏览文件 @ 70e50b36
......@@ -16,11 +16,11 @@ package org.activiti.engine.test.concurrency;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiOptimisticLockingException;
import org.activiti.engine.delegate.ActivityBehavior;
import org.activiti.engine.delegate.ActivityExecution;
import org.activiti.engine.impl.test.ActivitiInternalTestCase;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.test.Deployment;
import org.activiti.pvm.activity.ActivityBehavior;
import org.activiti.pvm.activity.ActivityExecution;
/**
......
modules/activiti-pvm/pom.xml 已删除 100644 → 0
浏览文件 @ 06aae939
此差异已折叠。
pom.xml
浏览文件 @ 70e50b36
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或