Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

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

提交 39885ee8 编写于 作者: T tombaeyens
浏览文件
操作

ACT-60 moving engine stuff from org.activiti.impl into org.activiti.engine.impl packages

上级 e10a436f
展开全部 隐藏空白更改
内联 并排
Showing with 142 addition and 1345 deletion
modules/activiti-engine-test-api/src/test/java/org/activiti/test/jobexecutor/JobExecutorCmdExceptionTest.java
浏览文件 @ 39885ee8
......@@ -4,7 +4,7 @@
package org.activiti.test.jobexecutor;
import org.activiti.engine.impl.ProcessEngineImpl;
import org.activiti.impl.cmd.DeleteJobsCmd;
import org.activiti.engine.impl.cmd.DeleteJobsCmd;
import org.activiti.impl.interceptor.Command;
import org.activiti.impl.interceptor.CommandContext;
import org.activiti.impl.interceptor.CommandExecutor;
......
modules/activiti-engine-test-cfg/src/test/resources/org/activiti/test/cfg/spring/SpringTest-context.xml
浏览文件 @ 39885ee8
......@@ -16,7 +16,7 @@
</property>
</bean>
<bean id="processEngine" class="org.activiti.impl.cfg.spring.ProcessEngineFactoryBean">
<bean id="processEngine" class="org.activiti.engine.impl.cfg.spring.ProcessEngineFactoryBean">
<property name="dataBaseName" value="${database}" />
<property name="dataSource" ref="dataSource" />
<property name="transactionManager" ref="transactionManager" />
......
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineBuilder.java
浏览文件 @ 39885ee8
......@@ -16,7 +16,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
/**
* builds a process engine based on a couple of simple properties.
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/IdentityServiceImpl.java
浏览文件 @ 39885ee8
......@@ -17,17 +17,17 @@ import java.util.List;
import org.activiti.engine.IdentityService;
import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.User;
import org.activiti.impl.cmd.CheckPassword;
import org.activiti.impl.cmd.CreateMembershipCmd;
import org.activiti.impl.cmd.DeleteGroupCmd;
import org.activiti.impl.cmd.DeleteMembershipCmd;
import org.activiti.impl.cmd.DeleteUserCmd;
import org.activiti.impl.cmd.FindGroupCmd;
import org.activiti.impl.cmd.FindGroupsByUserCmd;
import org.activiti.impl.cmd.FindUserCmd;
import org.activiti.impl.cmd.FindUsersByGroupCmd;
import org.activiti.impl.cmd.SaveGroupCmd;
import org.activiti.impl.cmd.SaveUserCmd;
import org.activiti.engine.impl.cmd.CheckPassword;
import org.activiti.engine.impl.cmd.CreateMembershipCmd;
import org.activiti.engine.impl.cmd.DeleteGroupCmd;
import org.activiti.engine.impl.cmd.DeleteMembershipCmd;
import org.activiti.engine.impl.cmd.DeleteUserCmd;
import org.activiti.engine.impl.cmd.FindGroupCmd;
import org.activiti.engine.impl.cmd.FindGroupsByUserCmd;
import org.activiti.engine.impl.cmd.FindUserCmd;
import org.activiti.engine.impl.cmd.FindUsersByGroupCmd;
import org.activiti.engine.impl.cmd.SaveGroupCmd;
import org.activiti.engine.impl.cmd.SaveUserCmd;
import org.activiti.impl.identity.GroupImpl;
import org.activiti.impl.identity.UserImpl;
import org.activiti.impl.interceptor.CommandExecutor;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ManagementServiceImpl.java
浏览文件 @ 39885ee8
......@@ -18,8 +18,8 @@ import org.activiti.engine.JobQuery;
import org.activiti.engine.ManagementService;
import org.activiti.engine.TableMetaData;
import org.activiti.engine.TablePageQuery;
import org.activiti.impl.cmd.GetTableCountCmd;
import org.activiti.impl.cmd.GetTableMetaDataCmd;
import org.activiti.engine.impl.cmd.GetTableCountCmd;
import org.activiti.engine.impl.cmd.GetTableMetaDataCmd;
import org.activiti.impl.interceptor.CommandExecutor;
import org.activiti.impl.job.JobQueryImpl;
import org.activiti.impl.query.TablePageQueryImpl;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessEngineImpl.java
浏览文件 @ 39885ee8
......@@ -22,8 +22,8 @@ import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessService;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.TaskService;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.persistence.db.DbSqlSessionFactory;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.jobexecutor.JobExecutor;
import org.activiti.impl.persistence.PersistenceSessionFactory;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessServiceImpl.java
浏览文件 @ 39885ee8
......@@ -19,15 +19,15 @@ import org.activiti.engine.Execution;
import org.activiti.engine.ProcessInstance;
import org.activiti.engine.ProcessInstanceQuery;
import org.activiti.engine.ProcessService;
import org.activiti.impl.cmd.DeleteProcessInstanceCmd;
import org.activiti.impl.cmd.FindExecutionCmd;
import org.activiti.impl.cmd.FindExecutionInActivityCmd;
import org.activiti.impl.cmd.FindProcessInstanceCmd;
import org.activiti.impl.cmd.GetExecutionVariableCmd;
import org.activiti.impl.cmd.GetExecutionVariablesCmd;
import org.activiti.impl.cmd.SendEventCmd;
import org.activiti.impl.cmd.SetExecutionVariablesCmd;
import org.activiti.impl.cmd.StartProcessInstanceCmd;
import org.activiti.engine.impl.cmd.DeleteProcessInstanceCmd;
import org.activiti.engine.impl.cmd.FindExecutionCmd;
import org.activiti.engine.impl.cmd.FindExecutionInActivityCmd;
import org.activiti.engine.impl.cmd.FindProcessInstanceCmd;
import org.activiti.engine.impl.cmd.GetExecutionVariableCmd;
import org.activiti.engine.impl.cmd.GetExecutionVariablesCmd;
import org.activiti.engine.impl.cmd.SendEventCmd;
import org.activiti.engine.impl.cmd.SetExecutionVariablesCmd;
import org.activiti.engine.impl.cmd.StartProcessInstanceCmd;
import org.activiti.impl.execution.ProcessInstanceQueryImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/RepositoryServiceImpl.java
浏览文件 @ 39885ee8
......@@ -20,15 +20,15 @@ import org.activiti.engine.Deployment;
import org.activiti.engine.DeploymentBuilder;
import org.activiti.engine.ProcessDefinition;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.impl.cmd.DeleteDeploymentCmd;
import org.activiti.engine.impl.cmd.DeployCmd;
import org.activiti.engine.impl.cmd.FindDeploymentResourcesCmd;
import org.activiti.engine.impl.cmd.FindDeploymentsCmd;
import org.activiti.engine.impl.cmd.FindProcessDefinitionCmd;
import org.activiti.engine.impl.cmd.FindProcessDefinitionsCmd;
import org.activiti.engine.impl.cmd.GetDeploymentResourceCmd;
import org.activiti.engine.impl.cmd.GetFormCmd;
import org.activiti.engine.impl.persistence.repository.DeploymentBuilderImpl;
import org.activiti.impl.cmd.DeleteDeploymentCmd;
import org.activiti.impl.cmd.DeployCmd;
import org.activiti.impl.cmd.FindDeploymentResourcesCmd;
import org.activiti.impl.cmd.FindDeploymentsCmd;
import org.activiti.impl.cmd.FindProcessDefinitionCmd;
import org.activiti.impl.cmd.FindProcessDefinitionsCmd;
import org.activiti.impl.cmd.GetDeploymentResourceCmd;
import org.activiti.impl.cmd.GetFormCmd;
/**
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ServiceImpl.java
浏览文件 @ 39885ee8
......@@ -12,8 +12,8 @@
*/
package org.activiti.engine.impl;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.interceptor.CommandExecutor;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskServiceImpl.java
浏览文件 @ 39885ee8
......@@ -19,14 +19,14 @@ import org.activiti.engine.Page;
import org.activiti.engine.Task;
import org.activiti.engine.TaskQuery;
import org.activiti.engine.TaskService;
import org.activiti.impl.cmd.AddTaskInvolvementCmd;
import org.activiti.impl.cmd.ClaimTaskCmd;
import org.activiti.impl.cmd.CompleteTaskCmd;
import org.activiti.impl.cmd.DeleteTaskCmd;
import org.activiti.impl.cmd.FindSingleTaskCmd;
import org.activiti.impl.cmd.GetFormCmd;
import org.activiti.impl.cmd.SaveTaskCmd;
import org.activiti.impl.cmd.SetTaskPriorityCmd;
import org.activiti.engine.impl.cmd.AddTaskInvolvementCmd;
import org.activiti.engine.impl.cmd.ClaimTaskCmd;
import org.activiti.engine.impl.cmd.CompleteTaskCmd;
import org.activiti.engine.impl.cmd.DeleteTaskCmd;
import org.activiti.engine.impl.cmd.FindSingleTaskCmd;
import org.activiti.engine.impl.cmd.GetFormCmd;
import org.activiti.engine.impl.cmd.SaveTaskCmd;
import org.activiti.engine.impl.cmd.SetTaskPriorityCmd;
import org.activiti.impl.interceptor.CommandExecutor;
import org.activiti.impl.task.TaskImpl;
import org.activiti.impl.task.TaskInvolvementType;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/deployer/BpmnDeployer.java
浏览文件 @ 39885ee8
......@@ -20,13 +20,13 @@ import java.util.logging.Logger;
import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.engine.impl.bpmn.parser.BpmnParser;
import org.activiti.engine.impl.calendar.BusinessCalendarManager;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.persistence.repository.Deployer;
import org.activiti.engine.impl.persistence.repository.DeploymentEntity;
import org.activiti.engine.impl.persistence.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.persistence.repository.ResourceEntity;
import org.activiti.impl.calendar.BusinessCalendarManager;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.el.ExpressionManager;
import org.activiti.impl.scripting.ScriptingEngines;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
浏览文件 @ 39885ee8
......@@ -39,10 +39,10 @@ import org.activiti.engine.impl.bpmn.ServiceInvocationActivityBehaviour;
import org.activiti.engine.impl.bpmn.SubProcessActivity;
import org.activiti.engine.impl.bpmn.TaskActivity;
import org.activiti.engine.impl.bpmn.UserTaskActivity;
import org.activiti.engine.impl.calendar.BusinessCalendar;
import org.activiti.engine.impl.calendar.BusinessCalendarManager;
import org.activiti.engine.impl.calendar.DurationBusinessCalendar;
import org.activiti.engine.impl.persistence.repository.ProcessDefinitionEntity;
import org.activiti.impl.calendar.BusinessCalendar;
import org.activiti.impl.calendar.BusinessCalendarManager;
import org.activiti.impl.calendar.DurationBusinessCalendar;
import org.activiti.impl.definition.ActivityImpl;
import org.activiti.impl.definition.FormReference;
import org.activiti.impl.definition.ProcessDefinitionImpl;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java
浏览文件 @ 39885ee8
......@@ -12,7 +12,7 @@
*/
package org.activiti.engine.impl.bpmn.parser;
import org.activiti.impl.calendar.BusinessCalendarManager;
import org.activiti.engine.impl.calendar.BusinessCalendarManager;
import org.activiti.impl.el.ExpressionManager;
import org.activiti.impl.scripting.ScriptingEngines;
import org.activiti.impl.xml.Parser;
......
modules/activiti-engine/src/main/java/org/activiti/impl/calendar/BusinessCalendar.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/BusinessCalendar.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.calendar;
package org.activiti.engine.impl.calendar;
import java.util.Date;
......
modules/activiti-engine/src/main/java/org/activiti/impl/calendar/BusinessCalendarManager.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/BusinessCalendarManager.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.calendar;
package org.activiti.engine.impl.calendar;
/**
......
modules/activiti-engine/src/main/java/org/activiti/impl/calendar/DefaultBusinessCalendar.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DefaultBusinessCalendar.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.calendar;
package org.activiti.engine.impl.calendar;
import java.util.Calendar;
import java.util.Date;
......
modules/activiti-engine/src/main/java/org/activiti/impl/calendar/DurationBusinessCalendar.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DurationBusinessCalendar.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.calendar;
package org.activiti.engine.impl.calendar;
import java.util.Calendar;
import java.util.Date;
......
modules/activiti-engine/src/main/java/org/activiti/impl/calendar/MapBusinessCalendarManager.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/MapBusinessCalendarManager.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.calendar;
package org.activiti.engine.impl.calendar;
import java.util.HashMap;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cfg/ProcessEngineConfiguration.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfiguration.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cfg;
package org.activiti.engine.impl.cfg;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -36,14 +36,14 @@ import org.activiti.engine.impl.ProcessServiceImpl;
import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.TaskServiceImpl;
import org.activiti.engine.impl.bpmn.deployer.BpmnDeployer;
import org.activiti.engine.impl.calendar.BusinessCalendarManager;
import org.activiti.engine.impl.calendar.DurationBusinessCalendar;
import org.activiti.engine.impl.calendar.MapBusinessCalendarManager;
import org.activiti.engine.impl.persistence.RepositorySession;
import org.activiti.engine.impl.persistence.db.DbRepositorySessionFactory;
import org.activiti.engine.impl.persistence.db.DbSqlSession;
import org.activiti.engine.impl.persistence.db.DbSqlSessionFactory;
import org.activiti.engine.impl.persistence.repository.Deployer;
import org.activiti.impl.calendar.BusinessCalendarManager;
import org.activiti.impl.calendar.DurationBusinessCalendar;
import org.activiti.impl.calendar.MapBusinessCalendarManager;
import org.activiti.impl.db.IdGenerator;
import org.activiti.impl.el.ExpressionManager;
import org.activiti.impl.event.DefaultProcessEventBus;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cfg/spring/ProcessEngineFactoryBean.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/spring/ProcessEngineFactoryBean.java
浏览文件 @ 39885ee8
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.impl.cfg.spring;
package org.activiti.engine.impl.cfg.spring;
import java.io.IOException;
import java.util.zip.ZipInputStream;
......@@ -26,7 +26,7 @@ import org.activiti.engine.IdentityService;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.impl.ProcessEngineImpl;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.db.IdGenerator;
import org.activiti.impl.interceptor.Command;
import org.activiti.impl.interceptor.CommandExecutor;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/AddTaskInvolvementCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddTaskInvolvementCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/CheckPassword.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CheckPassword.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.identity.UserImpl;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/ClaimTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ClaimTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/CmdVoid.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CmdVoid.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.Command;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/CompleteTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CompleteTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/CreateMembershipCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateMembershipCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.Command;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/CreateTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.Task;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteDeploymentCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteDeploymentCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteGroupCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteJobsCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobsCmd.java
浏览文件 @ 39885ee8
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.ArrayList;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteMembershipCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteMembershipCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.CommandContext;
import org.activiti.impl.persistence.PersistenceSession;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteProcessInstanceCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeleteUserCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.interceptor.CommandContext;
import org.activiti.impl.persistence.PersistenceSession;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/DeployCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Arrays;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindCandidateTasksCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindCandidateTasksCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.ArrayList;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindChildExecutionsCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindChildExecutionsCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindDeploymentResourcesCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindDeploymentResourcesCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindDeploymentsCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindDeploymentsCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindExecutionCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindExecutionCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.Execution;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindExecutionInActivityCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindExecutionInActivityCmd.java
浏览文件 @ 39885ee8
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.Execution;
import org.activiti.impl.execution.ExecutionImpl;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindGroupCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindGroupCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.identity.Group;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindGroupsByUserCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindGroupsByUserCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindProcessDefinitionCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindProcessDefinitionCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.definition.ProcessDefinitionImpl;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindProcessDefinitionsCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindProcessDefinitionsCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindProcessInstanceCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindProcessInstanceCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ProcessInstance;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindSingleTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindSingleTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.Task;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindTaskByAssigneeCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindTaskByAssigneeCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindUserCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindUserCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.identity.User;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/FindUsersByGroupCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindUsersByGroupCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.List;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetDeploymentResourceCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java
浏览文件 @ 39885ee8
......@@ -10,13 +10,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.activiti.engine.impl.persistence.repository.ResourceEntity;
import org.activiti.impl.bytes.ByteArrayImpl;
import org.activiti.engine.impl.persistence.runtime.ByteArrayImpl;
import org.activiti.impl.interceptor.Command;
import org.activiti.impl.interceptor.CommandContext;
import org.activiti.impl.persistence.PersistenceSession;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetExecutionVariableCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.db.execution.DbExecutionImpl;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetExecutionVariablesCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetFormCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetFormCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.persistence.RepositorySession;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetNextDbidBlockCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextDbidBlockCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.db.DbidBlock;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetTableCountCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTableCountCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/GetTableMetaDataCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTableMetaDataCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.TableMetaData;
import org.activiti.impl.interceptor.Command;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SaveGroupCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.impl.identity.GroupImpl;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SaveTaskCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveTaskCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.Task;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SaveUserCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.identity.User;
import org.activiti.impl.identity.UserImpl;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SendEventCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SendEventCmd.java
浏览文件 @ 39885ee8
......@@ -11,7 +11,7 @@
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.db.execution.DbExecutionImpl;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SetExecutionVariablesCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetExecutionVariablesCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/SetTaskPriorityCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetTaskPriorityCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.interceptor.CommandContext;
......
modules/activiti-engine/src/main/java/org/activiti/impl/cmd/StartProcessInstanceCmd.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/StartProcessInstanceCmd.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.cmd;
package org.activiti.engine.impl.cmd;
import java.util.Map;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/db/DbRepositorySessionFactory.java
浏览文件 @ 39885ee8
......@@ -17,10 +17,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.persistence.repository.Deployer;
import org.activiti.engine.impl.persistence.repository.ProcessDefinitionEntity;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.interceptor.SessionFactory;
import org.activiti.impl.tx.Session;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/db/DbSqlSessionFactory.java
浏览文件 @ 39885ee8
......@@ -26,9 +26,9 @@ import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.ActivitiWrongDbException;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.db.IdGenerator;
import org.activiti.impl.interceptor.SessionFactory;
import org.activiti.impl.persistence.IbatisPersistenceSessionFactory;
......
modules/activiti-engine/src/main/java/org/activiti/impl/bytes/ByteArrayImpl.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/runtime/ByteArrayImpl.java
浏览文件 @ 39885ee8
......@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bytes;
package org.activiti.engine.impl.persistence.runtime;
import java.io.Serializable;
......
modules/activiti-engine/src/main/java/org/activiti/engine/test/ProcessEngineImplTestCase.java
浏览文件 @ 39885ee8
......@@ -14,7 +14,7 @@
package org.activiti.engine.test;
import org.activiti.engine.impl.ProcessEngineImpl;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.util.LogUtil.ThreadLogMode;
......
modules/activiti-engine/src/main/java/org/activiti/impl/Jsonnable.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl;
import org.activiti.impl.json.JSONObject;
/**
* @author Tom Baeyens
*/
public interface Jsonnable {
JSONObject toJsonObject();
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/BoundaryTimerEventActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.ActivityExecution;
/**
* implementation of the boundary timer event logic.
*
* @author Joram Barrez
*/
public class BoundaryTimerEventActivity extends BpmnActivity {
protected boolean interrupting;
public void execute(ActivityExecution execution) throws Exception {
if (interrupting) {
leave(execution);
} else {
throw new ActivitiException("Non-interrupting boundary timer event not yet implemented");
}
}
public boolean isInterrupting() {
return interrupting;
}
public void setInterrupting(boolean interrupting) {
this.interrupting = interrupting;
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/BpmnActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.pvm.ActivityExecution;
import org.activiti.pvm.EventActivityBehavior;
/**
* superclass for all 'connectable' BPMN 2.0 process elements.
* This means that any subclass can be the source or target of a sequenceflow.
*
* Corresponds with the notion of the 'flownode' in BPMN 2.0.
*
* @author Joram Barrez
*/
public abstract class BpmnActivity implements EventActivityBehavior {
protected BpmnActivityBehavior bpmnActivityBehavior = new BpmnActivityBehavior();
/**
* Default behaviour: just leave the activity with no extra functionality.
*/
public void execute(ActivityExecution execution) throws Exception {
leave(execution);
}
/**
* Default way of leaving a BPMN 2.0 activity: evaluate the conditions on the
* outgoing sequence flow and take those that evaluate to true.
*/
protected void leave(ActivityExecution execution) {
bpmnActivityBehavior.performDefaultOutgoingBehavior(execution);
}
protected void leaveIgnoreConditions(ActivityExecution execution) {
bpmnActivityBehavior.performIgnoreConditionsOutgoingBehavior(execution);
}
public void event(ActivityExecution execution, Object event) throws Exception {
// Default behaviour: do nothing
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/BpmnActivityBehavior.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.impl.execution.ConcurrencyController;
import org.activiti.pvm.ActivityExecution;
import org.activiti.pvm.Transition;
/**
* helper class for implementing BPMN 2.0 activities, offering convience methods
* specific to BPMN 2.0.
*
* This class can be used by inheritance or aggregation.
*
* @author Joram Barrez
*/
public class BpmnActivityBehavior {
private static Logger log = Logger.getLogger(BpmnActivityBehavior.class.getName());
/**
* Performs the default outgoing BPMN 2.0 behavior, which is having parallel
* paths of executions for the outgoing sequence flow.
*
* More precisely: every sequence flow that has a condition which evaluates to
* true (or which doesn't have a condition), is selected for continuation
* of the process instance. If multiple sequencer flow are selected,
* multiple, parallel paths of executions are created.
*/
public void performDefaultOutgoingBehavior(ActivityExecution execution) {
performOutgoingBehavior(execution, true);
}
/**
* Performs the default outgoing BPMN 2.0 behavior (@see
* {@link #performDefaultOutgoingBehavior(ActivityExecution)}), but without
* checking the conditions on the outgoing sequence flow.
*
* This means that every outgoing sequence flow is selected for continuing the
* process instance, regardless of having a condition or not. In case of
* multiple outgoing sequence flow, multiple parallel paths of executions will
* be created.
*/
public void performIgnoreConditionsOutgoingBehavior(ActivityExecution execution) {
performOutgoingBehavior(execution, false);
}
/**
* Actual implementation of leaving an activity.
*/
protected void performOutgoingBehavior(ActivityExecution execution, boolean checkConditions) {
if (log.isLoggable(Level.FINE)) {
log.fine("Leaving activity '" + execution.getActivity().getId() + "'");
}
List<Transition> outgoingTransitions = execution.getOutgoingTransitions();
if (outgoingTransitions.size() == 1) {
execution.take(outgoingTransitions.get(0));
} else if (outgoingTransitions.size() > 1) {
ConcurrencyController concurrencyController = new ConcurrencyController(execution);
concurrencyController.inactivate();
List<ActivityExecution> joinedExecutions = new ArrayList<ActivityExecution>();
joinedExecutions.add(execution);
List<Transition> transitionsToTake = new ArrayList<Transition>();
for (Transition outgoingTransition: outgoingTransitions) {
if (outgoingTransition.getCondition() == null
|| !checkConditions
|| outgoingTransition.getCondition().evaluate(execution)) {
transitionsToTake.add(outgoingTransition);
}
}
concurrencyController.takeAll(transitionsToTake, joinedExecutions);
} else {
if (log.isLoggable(Level.FINE)) {
log.fine("No outgoing sequence flow found for " + execution.getActivity().getId()
+ ". Ending execution.");
}
execution.end();
}
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/BpmnDeployer.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
import org.activiti.engine.impl.persistence.repository.Deployer;
import org.activiti.engine.impl.persistence.repository.DeploymentEntity;
import org.activiti.engine.impl.persistence.repository.ProcessDefinitionEntity;
import org.activiti.engine.impl.persistence.repository.ResourceEntity;
import org.activiti.impl.bpmn.parser.BpmnParse;
import org.activiti.impl.bpmn.parser.BpmnParser;
import org.activiti.impl.calendar.BusinessCalendarManager;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.el.ExpressionManager;
import org.activiti.impl.scripting.ScriptingEngines;
/**
* @author Tom Baeyens
*/
public class BpmnDeployer implements Deployer, ProcessEngineConfigurationAware {
private static final Logger LOG = Logger.getLogger(BpmnDeployer.class.getName());;
public static final String BPMN_RESOURCE_SUFFIX = "bpmn20.xml";
protected ExpressionManager expressionManager;
protected ScriptingEngines scriptingEngines;
protected BusinessCalendarManager businessCalendarManager;
public void configurationCompleted(ProcessEngineConfiguration processEngineConfiguration) {
this.expressionManager = processEngineConfiguration.getExpressionManager();
this.scriptingEngines = processEngineConfiguration.getScriptingEngines();
this.businessCalendarManager = processEngineConfiguration.getBusinessCalendarManager();
}
public List<ProcessDefinitionEntity> deploy(DeploymentEntity deployment) {
List<ProcessDefinitionEntity> processDefinitions = new ArrayList<ProcessDefinitionEntity>();
Map<String, ResourceEntity> resources = deployment.getResources();
for (String resourceName : resources.keySet()) {
LOG.info("Processing resource " + resourceName);
if (resourceName.endsWith(BPMN_RESOURCE_SUFFIX)) {
ResourceEntity resource = resources.get(resourceName);
byte[] bytes = resource.getBytes();
ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
BpmnParse bpmnParse = new BpmnParser(expressionManager, scriptingEngines, businessCalendarManager)
.createParse()
.processDefinitionClass(ProcessDefinitionEntity.class)
.sourceInputStream(inputStream)
.execute();
processDefinitions.addAll(bpmnParse.getProcessDefinitions());
}
}
return processDefinitions;
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/BpmnInterface.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
/**
* An Interface defines a set of operations that are implemented by services
* external to the process.
*
* @author Joram Barrez
*/
public class BpmnInterface {
protected String id;
protected String name;
/**
* Mapping of the operations of this interface.
* The key of the map is the id of the operation, for easy retrieval.
*/
protected Map<String, Operation> operations = new HashMap<String, Operation>();
public BpmnInterface() {
}
public BpmnInterface(String id, String name) {
setId(id);
setName(name);
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public void addOperation(Operation operation) {
operations.put(operation.getId(), operation);
}
public Operation getOperation(String operationId) {
return operations.get(operationId);
}
public Collection<Operation> getOperations() {
return operations.values();
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/CallActivityBehaviour.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.engine.impl.persistence.RepositorySession;
import org.activiti.impl.definition.ProcessDefinitionImpl;
import org.activiti.impl.interceptor.CommandContext;
import org.activiti.impl.persistence.PersistenceSession;
import org.activiti.pvm.ActivityExecution;
import org.activiti.pvm.ObjectProcessInstance;
/**
* Implementation of the BPMN 2.0 call activity
* (limited currently to calling a subprocess and not (yet) a global task).
*
* @author Joram Barrez
*/
public class CallActivityBehaviour extends BpmnActivity {
protected String processDefinitonKey;
public CallActivityBehaviour(String processDefinitionKey) {
this.processDefinitonKey = processDefinitionKey;
}
public void execute(ActivityExecution execution) throws Exception {
RepositorySession repositorySession = CommandContext.getCurrent().getRepositorySession();
ProcessDefinitionImpl processDefinition = repositorySession.findDeployedLatestProcessDefinitionByKey(processDefinitonKey);
ObjectProcessInstance processInstance = execution.createSubProcessInstance(processDefinition);
processInstance.start();
}
public void event(ActivityExecution execution, Object event) throws Exception {
leave(execution);
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ExclusiveGatewayActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.pvm.ActivityExecution;
import org.activiti.pvm.Condition;
import org.activiti.pvm.Transition;
/**
* implementation of the Exclusive Gateway/XOR gateway/exclusive data=based gateway
* as defined in the BPMN specification.
*
* @author Joram Barrez
*/
public class ExclusiveGatewayActivity extends GatewayActivity {
private static Logger log = Logger.getLogger(ExclusiveGatewayActivity.class.getName());
/**
* The default behaviour of BPMN, taking every outgoing sequence flow
* (where the condition evaluates to true), is not valid for an exclusive
* gateway.
*
* Hence, this behaviour is overriden and replaced by the correct behavior:
* selecting the first sequence flow which condition evaluates to true
* (or which hasn't got a condition) and leaving the activity through that
* sequence flow.
*/
@Override
protected void leave(ActivityExecution execution) {
if (log.isLoggable(Level.FINE)) {
log.fine("Leaving activity '" + execution.getActivity().getId() + "'");
}
Transition outgoingSeqFlow = null;
Iterator<Transition> seqFlowIterator = execution.getOutgoingTransitions().iterator();
while (outgoingSeqFlow == null && seqFlowIterator.hasNext()) {
Transition seqFlow = seqFlowIterator.next();
Condition condition = seqFlow.getCondition();
if ( condition==null || condition.evaluate(execution) ) {
if (log.isLoggable(Level.FINE)) {
log.fine("Sequence flow '" + seqFlow.getId() + " '"
+ "selected as outgoing sequence flow.");
}
outgoingSeqFlow = seqFlow;
}
}
if (outgoingSeqFlow != null) {
execution.take(outgoingSeqFlow);
} else {
//No sequence flow could be found
throw new ActivitiException("No outgoing sequence flow of the exclusive gateway '"
+ execution.getActivity().getId() + "' could be selected for continuing the process");
}
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/GatewayActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
/**
* super class for all gateway activity implementations.
*
* @author Joram Barrez
*/
public abstract class GatewayActivity extends BpmnActivity {
// TODO: implement diverging/converging
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ManualTaskActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
/**
* Implementation of the BPMN 2.0 'manual task': a task that is external to the
* BPMS and to which there is no reference to IT systems whatsoever.
*
* Given this definition, this activity will behave simply as a pass-though step
* in the process.
*
* @author Joram Barrez
*/
public class ManualTaskActivity extends TaskActivity {
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/NoneEndEventActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.impl.definition.ActivityImpl;
import org.activiti.pvm.ActivityExecution;
/**
* @author Joram Barrez
*/
public class NoneEndEventActivity extends BpmnActivity {
public void execute(ActivityExecution execution) throws Exception {
// TODO: needs cleanup!
ActivityImpl currentActivity = (ActivityImpl) execution.getActivity();
ActivityImpl parentActivity = (ActivityImpl) currentActivity.getParentActivity();
if (parentActivity != null &&
parentActivity.getActivityBehavior() instanceof SubProcessActivity) {
// No need to end the execution, see ExecutionImpl.destroyScope
execution.setActivity(parentActivity);
leave(execution);
} else {
// Need to locally store the parent, since end() will remove the child-parent relation
ActivityExecution parent = execution.getParent();
execution.end();
// Special case for BPMN 2.0: when the parent is a process instance,
// but is not more active and has no children anymore
// Then the process instance cannot continue anymore:
//
// eg. start -> fork -> task1 -> end1
// -> task2 -> end2
if (parent != null
&& parent.isProcessInstance()
&& parent.getExecutions().isEmpty()
&& !parent.isActive()) {
parent.end();
}
}
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/NoneStartEventActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
/**
* implementation of the 'none start event': a start event that has no
* specific trigger but the programmatic one (processService.startProcessInstanceXXX()).
*
*
* @author Joram Barrez
*/
public class NoneStartEventActivity extends BpmnActivity {
// Nothing to see here.
// The default behaviour of the BpmnActivity is exactly what
// a none start event should be doing.
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/Operation.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
/**
* An Operation is part of an {@link BpmnInterface} and it defines Messages that are consumed and
* (optionally) produced when the Operation is called.
*
* @author Joram Barrez
*/
public class Operation {
protected String id;
protected String name;
/**
* The interface to which this operations belongs
*/
protected BpmnInterface bpmnInterface;
public Operation() {
}
public Operation(String id, String name, BpmnInterface bpmnInterface) {
setId(id);
setName(name);
setInterface(bpmnInterface);
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public BpmnInterface getInterface() {
return bpmnInterface;
}
public void setInterface(BpmnInterface bpmnInterface) {
this.bpmnInterface = bpmnInterface;
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ParallelGatewayActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.impl.execution.ConcurrencyController;
import org.activiti.pvm.Activity;
import org.activiti.pvm.ActivityExecution;
/**
* Implementation of the Parallel Gateway/AND gateway as definined in the BPMN
* 2.0 specification.
*
* The Parallel Gateway can be used for splitting a path of execution into
* multiple paths of executions (AND-split/fork behavior), one for every
* outgoing sequence flow.
*
* The Parallel Gateway can also be used for merging or joining paths of
* execution (AND-join). In this case, on every incoming sequence flow an
* execution needs to arrive, before leaving the Parallel Gateway (and
* potentially then doing the fork behavior in case of multiple outgoing
* sequence flow).
*
* Note that a Parallel Gateway having one incoming and multiple ougoing
* sequence flow, is the same as having multiple outgoing sequence flow on a
* given activity. However, a parallel gateway does NOT check conditions on the
* outgoing sequence flow.
*
* @author Joram Barrez
* @author Tom Baeyens
*/
public class ParallelGatewayActivity extends GatewayActivity {
private static Logger log = Logger.getLogger(ParallelGatewayActivity.class.getName());
public void execute(ActivityExecution execution) throws Exception {
Activity activity = execution.getActivity();
ConcurrencyController concurrencyController = new ConcurrencyController(execution);
concurrencyController.inactivate();
List<ActivityExecution> joinedExecutions = concurrencyController.findInactiveConcurrentExecutions(activity);
int nbrOfExecutionsToJoin = execution.getIncomingTransitions().size();
int nbrOfExecutionsJoined = joinedExecutions.size();
if (nbrOfExecutionsJoined==nbrOfExecutionsToJoin) {
log.fine("parallel gateway '"+activity.getId()+"' activates: "+nbrOfExecutionsJoined+" of "+nbrOfExecutionsToJoin+" joined");
concurrencyController.takeAll(execution.getOutgoingTransitions(), joinedExecutions);
} else if (log.isLoggable(Level.FINE)){
log.fine("parallel gateway '"+activity.getId()+"' does not activate: "+nbrOfExecutionsJoined+" of "+nbrOfExecutionsToJoin+" joined");
}
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ReceiveTaskActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.engine.ProcessService;
import org.activiti.pvm.ActivityExecution;
/**
* A receive task is a wait state that waits for the receival of some message.
*
* Currently, the only message that is supported is the external trigger,
* given by calling the {@link ProcessService#sendEvent(String)} operation.
*
* @author Joram Barrez
*/
public class ReceiveTaskActivity extends TaskActivity {
public void execute(ActivityExecution execution) throws Exception {
// Do nothing: waitstate behavior
}
public void event(ActivityExecution execution, Object event) throws Exception {
leave(execution);
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ScriptTaskActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.impl.execution.ExecutionImpl;
import org.activiti.impl.scripting.ScriptingEngines;
import org.activiti.pvm.ActivityExecution;
/**
* activity implementation of the BPMN 2.0 script task.
*
* @author Joram Barrez
*/
public class ScriptTaskActivity extends TaskActivity {
private final String script;
private final String language;
private final ScriptingEngines scriptingEngines;
public ScriptTaskActivity(ScriptingEngines scriptingEngines, String script, String language) {
this.scriptingEngines = scriptingEngines;
this.script = script;
this.language = language;
}
public void execute(ActivityExecution execution) throws Exception {
scriptingEngines.evaluate(script, language, (ExecutionImpl) execution);
leave(execution);
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/ServiceInvocationActivityBehaviour.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.el.ActivitiValueExpression;
import org.activiti.impl.execution.ExecutionImpl;
import org.activiti.impl.util.ReflectUtil;
import org.activiti.pvm.ActivityBehavior;
import org.activiti.pvm.ActivityExecution;
/**
* @author dsyer
*/
public class ServiceInvocationActivityBehaviour implements ActivityBehavior {
private final ActivitiValueExpression expression;
public ServiceInvocationActivityBehaviour(ActivitiValueExpression expression) {
this.expression = expression;
}
public void execute(ActivityExecution execution) throws Exception {
// FIXME: downcast
Object object = expression.getValue((ExecutionImpl) execution);
if (object instanceof String) {
String className = (String) object;
if (className != null) {
object = ReflectUtil.instantiate(className);
}
}
if (object instanceof ActivityBehavior) {
((ActivityBehavior) object).execute(execution);
} else {
throw new ActivitiException("Service " + object + " is used in a serviceTask, but does not" + " implement the "
+ ActivityBehavior.class.getCanonicalName() + " interface");
}
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/SubProcessActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.impl.definition.ActivityImpl;
import org.activiti.pvm.Activity;
import org.activiti.pvm.ActivityExecution;
/**
* Implementation of the BPMN 2.0 subprocess (formely know as 'embedded' subprocess):
* a subprocess defined within another process definition.
*
* @author Joram Barrez
*/
public class SubProcessActivity extends BpmnActivity {
public void execute(ActivityExecution execution) throws Exception {
Activity activity = execution.getActivity();
ActivityImpl initialActivity = ((ActivityImpl) activity).getInitial();
execution.setActivity(initialActivity);
initialActivity.getActivityBehavior().execute(execution);
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/TaskActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
/**
* Parent class for all BPMN 2.0 task types such as ServiceTask, ScriptTask, UserTask, etc.
*
* When used on its own, it behaves just as a pass-through activity.
*
* @author Joram Barrez
*/
public class TaskActivity extends BpmnActivity {
}
modules/activiti-engine/src/main/java/org/activiti/impl/bpmn/UserTaskActivity.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.bpmn;
import org.activiti.impl.el.ExpressionManager;
import org.activiti.impl.execution.ExecutionImpl;
import org.activiti.impl.task.TaskDefinition;
import org.activiti.impl.task.TaskImpl;
import org.activiti.pvm.ActivityExecution;
/**
* activity implementation for the user task.
*
* @author Joram Barrez
*/
public class UserTaskActivity extends TaskActivity {
private final TaskDefinition taskDefinition;
private final ExpressionManager expressionManager;
public UserTaskActivity(ExpressionManager expressionManager, TaskDefinition taskDefinition) {
this.expressionManager = expressionManager;
this.taskDefinition = taskDefinition;
}
public void execute(ActivityExecution execution) throws Exception {
TaskImpl task = TaskImpl.createAndInsert();
task.setExecution(execution);
if (taskDefinition.getName() != null) {
String name = evaluateExpression(taskDefinition.getName(), execution);
task.setName(name);
}
if (taskDefinition.getDescription() != null) {
String description = evaluateExpression(taskDefinition.getDescription(), execution);
task.setDescription(description);
}
handleAssignments(task, execution);
}
public void event(ActivityExecution execution, Object event) throws Exception {
leave(execution);
}
protected void handleAssignments(TaskImpl task, ActivityExecution execution) {
if (taskDefinition.getAssignee() != null) {
task.setAssignee(evaluateExpression(taskDefinition.getAssignee(), execution));
}
if (!taskDefinition.getCandidateGroupIds().isEmpty()) {
for (String groupId : taskDefinition.getCandidateGroupIds()) {
task.addCandidateGroup(evaluateExpression(groupId, execution));
}
}
if (!taskDefinition.getCandidateUserIds().isEmpty()) {
for (String userId : taskDefinition.getCandidateUserIds()) {
task.addCandidateUser(evaluateExpression(userId, execution));
}
}
}
protected String evaluateExpression(String expr, ActivityExecution execution) {
// FIXME: downcast
return (String) expressionManager.createValueExpression(expr).getValue((ExecutionImpl) execution);
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/db/Db.java 已删除 100644 → 0
浏览文件 @ e10a436f
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.activiti.impl.db;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.Statement;
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.ActivitiWrongDbException;
import org.activiti.engine.ProcessEngine;
import org.activiti.impl.util.IoUtil;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
/**
* Wrapper around various core SQL Database functions,
* such as creating and upgrading schemas.
* Note that this class is likely to undergo a lot of
* work as we move to supporting multiple databases,
* and again as we support cloud storage.
* @author Tom Baeyens
*/
public class Db {
private static Logger log = Logger.getLogger(Db.class.getName());
public static void dbSchemaCreate(SqlSessionFactory sqlSessionFactory) {
executeSchemaResource("create", sqlSessionFactory);
log.fine("activiti db schema creation successful");
}
public static void dbSchemaCheckVersion(SqlSessionFactory sqlSessionFactory) {
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); // Not quite sure if this is the right setting? We do want multiple updates to be batched for performance ...
boolean success = false;
try {
String dbVersion = (String) sqlSession.selectOne("selectDbSchemaVersion");
if (!ProcessEngine.VERSION.equals(dbVersion)) {
throw new ActivitiWrongDbException(ProcessEngine.VERSION, dbVersion);
}
success = true;
} catch(Exception e) {
String exceptionMessage = e.getMessage();
if ( (exceptionMessage.indexOf("Table")!=-1)
&& (exceptionMessage.indexOf("not found")!=-1)
) {
throw new ActivitiException("no activiti tables in db. set property 'db.schema.strategy' to value 'create-drop' in activiti.properties for automatic schema creation", e);
} else {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
} else {
throw new ActivitiException("couldn't get db schema version", e);
}
}
} finally {
if (success) {
sqlSession.commit(true);
} else {
sqlSession.rollback(true);
}
sqlSession.close();
}
log.fine("activiti db schema check successful");
}
public static void dbSchemaDrop(SqlSessionFactory sqlSessionFactory) {
executeSchemaResource("drop", sqlSessionFactory);
}
public static void executeSchemaResource(String operation, SqlSessionFactory sqlSessionFactory) {
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); // Not quite sure if this is the right setting? We do want multiple updates to be batched for performance ...
boolean success = false;
try {
Connection connection = sqlSession.getConnection();
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
String resource = "org/activiti/db/"+operation+"/activiti.h2."+operation+".sql";
InputStream inputStream = classLoader.getResourceAsStream(resource);
if (inputStream==null) {
throw new ActivitiException("resource '"+resource+"' is not available for creating the schema");
}
Exception exception = null;
byte[] bytes = IoUtil.readInputStream(inputStream, resource);
String ddlStatements = new String(bytes);
StringTokenizer tokenizer = new StringTokenizer(ddlStatements, ";");
while (tokenizer.hasMoreTokens()) {
String ddlStatement = tokenizer.nextToken().trim();
if (!ddlStatement.startsWith("#")) {
Statement jdbcStatement = connection.createStatement();
try {
log.fine("\n"+ddlStatement);
jdbcStatement.execute(ddlStatement);
jdbcStatement.close();
} catch (Exception e) {
if (exception==null) {
exception = e;
}
log.log(Level.SEVERE, "problem during schema "+operation+", statement '"+ddlStatement, e);
}
}
}
if (exception!=null) {
throw exception;
}
success = true;
} catch(Exception e) {
throw new ActivitiException("couldn't create db schema", e);
} finally {
if (success) {
sqlSession.commit(true);
} else {
sqlSession.rollback(true);
}
sqlSession.close();
}
log.fine("activiti db schema creation successful");
}
}
modules/activiti-engine/src/main/java/org/activiti/impl/db/IdGenerator.java
浏览文件 @ 39885ee8
......@@ -12,9 +12,9 @@
*/
package org.activiti.impl.db;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.cmd.GetNextDbidBlockCmd;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.cmd.GetNextDbidBlockCmd;
import org.activiti.impl.interceptor.CommandExecutor;
......
modules/activiti-engine/src/main/java/org/activiti/impl/definition/ActivityImpl.java
浏览文件 @ 39885ee8
......@@ -15,7 +15,7 @@ package org.activiti.impl.definition;
import java.util.ArrayList;
import java.util.List;
import org.activiti.impl.calendar.BusinessCalendar;
import org.activiti.engine.impl.calendar.BusinessCalendar;
import org.activiti.impl.timer.TimerDeclarationImpl;
import org.activiti.pvm.Activity;
import org.activiti.pvm.ActivityBehavior;
......
modules/activiti-engine/src/main/java/org/activiti/impl/definition/ScopeElementImpl.java
浏览文件 @ 39885ee8
......@@ -19,7 +19,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.impl.calendar.BusinessCalendar;
import org.activiti.engine.impl.calendar.BusinessCalendar;
import org.activiti.impl.timer.TimerDeclarationImpl;
import org.activiti.pvm.Listener;
......
modules/activiti-engine/src/main/java/org/activiti/impl/el/ExpressionManager.java
浏览文件 @ 39885ee8
......@@ -18,8 +18,8 @@ import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.execution.ExecutionImpl;
/**
......
modules/activiti-engine/src/main/java/org/activiti/impl/form/JuelFormEngine.java
浏览文件 @ 39885ee8
......@@ -17,7 +17,7 @@ import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.bytes.ByteArrayImpl;
import org.activiti.engine.impl.persistence.runtime.ByteArrayImpl;
import org.activiti.impl.repository.DeploymentImpl;
import org.activiti.impl.task.TaskImpl;
......
modules/activiti-engine/src/main/java/org/activiti/impl/history/HistoricDataServiceImpl.java
浏览文件 @ 39885ee8
......@@ -20,7 +20,7 @@ import org.activiti.engine.HistoricDataService;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.ServiceImpl;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.event.ActivityEndedEvent;
import org.activiti.impl.event.ActivityStartedEvent;
import org.activiti.impl.event.ProcessInstanceEndedEvent;
......
modules/activiti-engine/src/main/java/org/activiti/impl/interceptor/CommandContext.java
浏览文件 @ 39885ee8
......@@ -19,8 +19,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.persistence.RepositorySession;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.msg.MessageSession;
import org.activiti.impl.persistence.PersistenceSession;
import org.activiti.impl.timer.TimerSession;
......
modules/activiti-engine/src/main/java/org/activiti/impl/interceptor/CommandContextFactory.java
浏览文件 @ 39885ee8
......@@ -13,7 +13,7 @@
*/
package org.activiti.impl.interceptor;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
/**
......
modules/activiti-engine/src/main/java/org/activiti/impl/interceptor/DefaultCommandExecutor.java
浏览文件 @ 39885ee8
......@@ -19,9 +19,9 @@ import java.util.List;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.util.ClassNameUtil;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
/**
* @author Tom Baeyens
......
modules/activiti-engine/src/main/java/org/activiti/impl/jobexecutor/JobExecutor.java
浏览文件 @ 39885ee8
......@@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
import org.activiti.engine.ActivitiException;
import org.activiti.impl.cfg.ProcessEngineConfiguration;
import org.activiti.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.engine.impl.cfg.ProcessEngineConfiguration;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationAware;
import org.activiti.impl.interceptor.CommandExecutor;
import org.activiti.impl.job.JobHandlers;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或