Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

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

提交 c09e3e1c 编写于 作者: J Joram Barrez
浏览文件
操作

Passing the processEngineConfigurationImpl to the entity/data managers on... 

Passing the processEngineConfigurationImpl to the entity/data managers on instantiation instead of relying on the Context lookup.
上级 d158ca41
隐藏空白更改
内联 并排
Showing with 286 addition and 187 deletion
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
浏览文件 @ c09e3e1c
......@@ -994,68 +994,68 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
// Data managers ///////////////////////////////////////////////////////////
protected void initDataManagers() {
attachmentDataManager = new AttachmentDataManagerImpl();
byteArrayDataManager = new ByteArrayDataManagerImpl();
commentDataManager = new CommentDataManagerImpl();
deploymentDataManager = new DeploymentDataManagerImpl();
eventLogEntryDataManager = new EventLogEntryDataManagerImpl();
eventSubscriptionDataManager = new EventSubscriptionDataManagerImpl();
executionDataManager = new ExecutionDataManagerImpl();
groupDataManager = new GroupDataManagerImpl();
historicActivityInstanceDataManager = new HistoricActivityInstanceDataManagerImpl();
historicDetailDataManager = new HistoricDetailDataManagerImpl();
historicIdentityLinkDataManager = new HistoricIdentityLinkDataManagerImpl();
historicProcessInstanceDataManager = new HistoricProcessInstanceDataManagerImpl();
historicTaskInstanceDataManager = new HistoricTaskInstanceDataManagerImpl();
historicVariableInstanceDataManager = new HistoricVariableInstanceDataManagerImpl();
identityInfoDataManager = new IdentityInfoDataManagerImpl();
identityLinkDataManager = new IdentityLinkDataManagerImpl();
jobDataManager = new JobDataManagerImpl();
membershipDataManager = new MembershipDataManagerImpl();
modelDataManager = new ModelDataManagerImpl();
processDefinitionDataManager = new ProcessDefinitionDataManagerImpl();
propertyDataManager = new PropertyDataManagerImpl();
resourceDataManager = new ResourceDataManagerImpl();
taskDataManager = new TaskDataManagerImpl();
userDataManager = new UserDataManagerImpl();
variableInstanceDataManager = new VariableInstanceDataManagerImpl();
attachmentDataManager = new AttachmentDataManagerImpl(this);
byteArrayDataManager = new ByteArrayDataManagerImpl(this);
commentDataManager = new CommentDataManagerImpl(this);
deploymentDataManager = new DeploymentDataManagerImpl(this);
eventLogEntryDataManager = new EventLogEntryDataManagerImpl(this);
eventSubscriptionDataManager = new EventSubscriptionDataManagerImpl(this);
executionDataManager = new ExecutionDataManagerImpl(this);
groupDataManager = new GroupDataManagerImpl(this);
historicActivityInstanceDataManager = new HistoricActivityInstanceDataManagerImpl(this);
historicDetailDataManager = new HistoricDetailDataManagerImpl(this);
historicIdentityLinkDataManager = new HistoricIdentityLinkDataManagerImpl(this);
historicProcessInstanceDataManager = new HistoricProcessInstanceDataManagerImpl(this);
historicTaskInstanceDataManager = new HistoricTaskInstanceDataManagerImpl(this);
historicVariableInstanceDataManager = new HistoricVariableInstanceDataManagerImpl(this);
identityInfoDataManager = new IdentityInfoDataManagerImpl(this);
identityLinkDataManager = new IdentityLinkDataManagerImpl(this);
jobDataManager = new JobDataManagerImpl(this);
membershipDataManager = new MembershipDataManagerImpl(this);
modelDataManager = new ModelDataManagerImpl(this);
processDefinitionDataManager = new ProcessDefinitionDataManagerImpl(this);
propertyDataManager = new PropertyDataManagerImpl(this);
resourceDataManager = new ResourceDataManagerImpl(this);
taskDataManager = new TaskDataManagerImpl(this);
userDataManager = new UserDataManagerImpl(this);
variableInstanceDataManager = new VariableInstanceDataManagerImpl(this);
}
// Entity managers //////////////////////////////////////////////////////////
protected void initEntityManagers() {
attachmentEntityManager = new AttachmentEntityManagerImpl(attachmentDataManager);
byteArrayEntityManager = new ByteArrayEntityManagerImpl(byteArrayDataManager);
commentEntityManager = new CommentEntityManagerImpl(commentDataManager);
deploymentEntityManager = new DeploymentEntityManagerImpl(deploymentDataManager);
eventLogEntryEntityManager = new EventLogEntryEntityManagerImpl(eventLogEntryDataManager);
eventSubscriptionEntityManager = new EventSubscriptionEntityManagerImpl(eventSubscriptionDataManager);
executionEntityManager = new ExecutionEntityManagerImpl(executionDataManager);
groupEntityManager = new GroupEntityManagerImpl(groupDataManager);
historicActivityInstanceEntityManager = new HistoricActivityInstanceEntityManagerImpl(historicActivityInstanceDataManager);
historicDetailEntityManager = new HistoricDetailEntityManagerImpl(historicDetailDataManager);
historicIdentityLinkEntityManager = new HistoricIdentityLinkEntityManagerImpl(historicIdentityLinkDataManager);
historicProcessInstanceEntityManager = new HistoricProcessInstanceEntityManagerImpl(historicProcessInstanceDataManager);
historicTaskInstanceEntityManager = new HistoricTaskInstanceEntityManagerImpl(historicTaskInstanceDataManager);
historicVariableInstanceEntityManager = new HistoricVariableInstanceEntityManagerImpl(historicVariableInstanceDataManager);
identityInfoEntityManager = new IdentityInfoEntityManagerImpl(identityInfoDataManager);
identityLinkEntityManager = new IdentityLinkEntityManagerImpl(identityLinkDataManager);
jobEntityManager = new JobEntityManagerImpl(jobDataManager);
membershipEntityManager = new MembershipEntityManagerImpl(membershipDataManager);
modelEntityManager = new ModelEntityManagerImpl(modelDataManager);
processDefinitionEntityManager = new ProcessDefinitionEntityManagerImpl(processDefinitionDataManager);
propertyEntityManager = new PropertyEntityManagerImpl(propertyDataManager);
resourceEntityManager = new ResourceEntityManagerImpl(resourceDataManager);
tableDataManager = new TableDataManagerImpl();
taskEntityManager = new TaskEntityManagerImpl(taskDataManager);
userEntityManager = new UserEntityManagerImpl(userDataManager);
variableInstanceEntityManager = new VariableInstanceEntityManagerImpl(variableInstanceDataManager);
attachmentEntityManager = new AttachmentEntityManagerImpl(this, attachmentDataManager);
byteArrayEntityManager = new ByteArrayEntityManagerImpl(this, byteArrayDataManager);
commentEntityManager = new CommentEntityManagerImpl(this, commentDataManager);
deploymentEntityManager = new DeploymentEntityManagerImpl(this, deploymentDataManager);
eventLogEntryEntityManager = new EventLogEntryEntityManagerImpl(this, eventLogEntryDataManager);
eventSubscriptionEntityManager = new EventSubscriptionEntityManagerImpl(this, eventSubscriptionDataManager);
executionEntityManager = new ExecutionEntityManagerImpl(this, executionDataManager);
groupEntityManager = new GroupEntityManagerImpl(this, groupDataManager);
historicActivityInstanceEntityManager = new HistoricActivityInstanceEntityManagerImpl(this, historicActivityInstanceDataManager);
historicDetailEntityManager = new HistoricDetailEntityManagerImpl(this, historicDetailDataManager);
historicIdentityLinkEntityManager = new HistoricIdentityLinkEntityManagerImpl(this, historicIdentityLinkDataManager);
historicProcessInstanceEntityManager = new HistoricProcessInstanceEntityManagerImpl(this, historicProcessInstanceDataManager);
historicTaskInstanceEntityManager = new HistoricTaskInstanceEntityManagerImpl(this, historicTaskInstanceDataManager);
historicVariableInstanceEntityManager = new HistoricVariableInstanceEntityManagerImpl(this, historicVariableInstanceDataManager);
identityInfoEntityManager = new IdentityInfoEntityManagerImpl(this, identityInfoDataManager);
identityLinkEntityManager = new IdentityLinkEntityManagerImpl(this, identityLinkDataManager);
jobEntityManager = new JobEntityManagerImpl(this, jobDataManager);
membershipEntityManager = new MembershipEntityManagerImpl(this, membershipDataManager);
modelEntityManager = new ModelEntityManagerImpl(this, modelDataManager);
processDefinitionEntityManager = new ProcessDefinitionEntityManagerImpl(this, processDefinitionDataManager);
propertyEntityManager = new PropertyEntityManagerImpl(this, propertyDataManager);
resourceEntityManager = new ResourceEntityManagerImpl(this, resourceDataManager);
tableDataManager = new TableDataManagerImpl(this);
taskEntityManager = new TaskEntityManagerImpl(this, taskDataManager);
userEntityManager = new UserEntityManagerImpl(this, userDataManager);
variableInstanceEntityManager = new VariableInstanceEntityManagerImpl(this, variableInstanceDataManager);
}
// History manager ///////////////////////////////////////////////////////////
protected void initHistoryManager() {
historyManager = new DefaultHistoryManager(historyLevel);
historyManager = new DefaultHistoryManager(this, historyLevel);
}
// session factories ////////////////////////////////////////////////////////
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java
浏览文件 @ c09e3e1c
......@@ -21,6 +21,7 @@ import java.util.Map;
import org.activiti.bpmn.model.FlowElement;
import org.activiti.bpmn.model.FlowNode;
import org.activiti.engine.impl.cfg.IdGenerator;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.form.TaskFormHandler;
import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.impl.persistence.AbstractManager;
......@@ -52,7 +53,8 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
private HistoryLevel historyLevel;
public DefaultHistoryManager(HistoryLevel historyLevel) {
public DefaultHistoryManager(ProcessEngineConfigurationImpl processEngineConfiguration, HistoryLevel historyLevel) {
super(processEngineConfiguration);
this.historyLevel = historyLevel;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/AbstractManager.java
浏览文件 @ c09e3e1c
......@@ -52,9 +52,11 @@ import org.activiti.engine.runtime.Clock;
*/
public abstract class AbstractManager {
// Deliberately private, so subclasses need to use the getters to make sure the lazy loading has happened
private ProcessEngineConfigurationImpl processEngineConfiguration;
protected ProcessEngineConfigurationImpl processEngineConfiguration;
public AbstractManager(ProcessEngineConfigurationImpl processEngineConfiguration) {
this.processEngineConfiguration = processEngineConfiguration;
}
// Command scoped
......@@ -69,9 +71,6 @@ public abstract class AbstractManager {
// Engine scoped
protected ProcessEngineConfigurationImpl getProcessEngineConfiguration() {
if (processEngineConfiguration == null) {
processEngineConfiguration = Context.getProcessEngineConfiguration();
}
return processEngineConfiguration;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AbstractEntityManager.java
浏览文件 @ c09e3e1c
......@@ -3,6 +3,7 @@ package org.activiti.engine.impl.persistence.entity;
import org.activiti.engine.delegate.event.ActivitiEventDispatcher;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.db.Entity;
import org.activiti.engine.impl.persistence.AbstractManager;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
......@@ -12,10 +13,16 @@ import org.activiti.engine.impl.persistence.entity.data.DataManager;
*/
public abstract class AbstractEntityManager<EntityImpl extends Entity> extends AbstractManager implements EntityManager<EntityImpl> {
public AbstractEntityManager(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
/*
* CRUD operations
*/
@Override
public EntityImpl findById(String entityId) {
return getDataManager().findById(entityId);
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AttachmentEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.AttachmentDataManager;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.task.Attachment;
......@@ -31,11 +32,8 @@ public class AttachmentEntityManagerImpl extends AbstractEntityManager<Attachmen
protected AttachmentDataManager attachmentDataManager;
public AttachmentEntityManagerImpl() {
}
public AttachmentEntityManagerImpl(AttachmentDataManager attachmentDataManager) {
public AttachmentEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, AttachmentDataManager attachmentDataManager) {
super(processEngineConfiguration);
this.attachmentDataManager = attachmentDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -13,6 +13,7 @@
package org.activiti.engine.impl.persistence.entity;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.ByteArrayDataManager;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
......@@ -25,11 +26,8 @@ public class ByteArrayEntityManagerImpl extends AbstractEntityManager<ByteArrayE
protected ByteArrayDataManager byteArrayDataManager;
public ByteArrayEntityManagerImpl() {
}
public ByteArrayEntityManagerImpl(ByteArrayDataManager byteArrayDataManager) {
public ByteArrayEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, ByteArrayDataManager byteArrayDataManager) {
super(processEngineConfiguration);
this.byteArrayDataManager = byteArrayDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.List;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.CommentDataManager;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.task.Comment;
......@@ -31,11 +32,8 @@ public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntit
protected CommentDataManager commentDataManager;
public CommentEntityManagerImpl() {
}
public CommentEntityManagerImpl(CommentDataManager commentDataManager) {
public CommentEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, CommentDataManager commentDataManager) {
super(processEngineConfiguration);
this.commentDataManager = commentDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -26,6 +26,7 @@ import org.activiti.engine.impl.DeploymentQueryImpl;
import org.activiti.engine.impl.ModelQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessDefinitionQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.jobexecutor.TimerEventHandler;
import org.activiti.engine.impl.jobexecutor.TimerStartEventJobHandler;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
......@@ -46,11 +47,8 @@ public class DeploymentEntityManagerImpl extends AbstractEntityManager<Deploymen
protected DeploymentDataManager deploymentDataManager;
public DeploymentEntityManagerImpl() {
}
public DeploymentEntityManagerImpl(DeploymentDataManager deploymentDataManager) {
public DeploymentEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, DeploymentDataManager deploymentDataManager) {
super(processEngineConfiguration);
this.deploymentDataManager = deploymentDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventLogEntryEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -16,6 +16,7 @@ package org.activiti.engine.impl.persistence.entity;
import java.util.List;
import org.activiti.engine.event.EventLogEntry;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.EventLogEntryDataManager;
......@@ -26,11 +27,8 @@ public class EventLogEntryEntityManagerImpl extends AbstractEntityManager<EventL
protected EventLogEntryDataManager eventLogEntryDataManager;
public EventLogEntryEntityManagerImpl() {
}
public EventLogEntryEntityManagerImpl(EventLogEntryDataManager eventLogEntryDataManager) {
public EventLogEntryEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, EventLogEntryDataManager eventLogEntryDataManager) {
super(processEngineConfiguration);
this.eventLogEntryDataManager = eventLogEntryDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -25,6 +25,7 @@ import org.activiti.engine.ActivitiException;
import org.activiti.engine.ProcessEngineConfiguration;
import org.activiti.engine.impl.EventSubscriptionQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.event.EventHandler;
import org.activiti.engine.impl.jobexecutor.ProcessEventJobHandler;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
......@@ -38,11 +39,8 @@ public class EventSubscriptionEntityManagerImpl extends AbstractEntityManager<Ev
protected EventSubscriptionDataManager eventSubscriptionDataManager;
public EventSubscriptionEntityManagerImpl() {
}
public EventSubscriptionEntityManagerImpl(EventSubscriptionDataManager eventSubscriptionDataManager) {
public EventSubscriptionEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, EventSubscriptionDataManager eventSubscriptionDataManager) {
super(processEngineConfiguration);
this.eventSubscriptionDataManager = eventSubscriptionDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -27,6 +27,7 @@ import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.ExecutionQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.ExecutionDataManager;
......@@ -49,11 +50,8 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
protected ExecutionDataManager executionDataManager;
public ExecutionEntityManagerImpl() {
}
public ExecutionEntityManagerImpl(ExecutionDataManager executionDataManager) {
public ExecutionEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, ExecutionDataManager executionDataManager) {
super(processEngineConfiguration);
this.executionDataManager = executionDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -22,6 +22,7 @@ import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.GroupQuery;
import org.activiti.engine.impl.GroupQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.GroupDataManager;
......@@ -34,11 +35,8 @@ public class GroupEntityManagerImpl extends AbstractEntityManager<GroupEntity> i
protected GroupDataManager groupDataManager;
public GroupEntityManagerImpl() {
}
public GroupEntityManagerImpl(GroupDataManager groupDataManager) {
public GroupEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, GroupDataManager groupDataManager) {
super(processEngineConfiguration);
this.groupDataManager = groupDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricActivityInstanceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.impl.HistoricActivityInstanceQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.history.HistoryLevel;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricActivityInstanceDataManager;
......@@ -31,11 +32,9 @@ public class HistoricActivityInstanceEntityManagerImpl extends AbstractEntityMan
protected HistoricActivityInstanceDataManager historicActivityInstanceDataManager;
public HistoricActivityInstanceEntityManagerImpl() {
}
public HistoricActivityInstanceEntityManagerImpl(HistoricActivityInstanceDataManager historicActivityInstanceDataManager) {
public HistoricActivityInstanceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricActivityInstanceDataManager historicActivityInstanceDataManager) {
super(processEngineConfiguration);
this.historicActivityInstanceDataManager = historicActivityInstanceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricDetailEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricDetail;
import org.activiti.engine.impl.HistoricDetailQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.history.HistoryLevel;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricDetailDataManager;
......@@ -31,11 +32,8 @@ public class HistoricDetailEntityManagerImpl extends AbstractEntityManager<Histo
protected HistoricDetailDataManager historicDetailDataManager;
public HistoricDetailEntityManagerImpl() {
}
public HistoricDetailEntityManagerImpl(HistoricDetailDataManager historicDetailDataManager) {
public HistoricDetailEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricDetailDataManager historicDetailDataManager) {
super(processEngineConfiguration);
this.historicDetailDataManager = historicDetailDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricIdentityLinkEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.persistence.entity;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricIdentityLinkDataManager;
......@@ -26,11 +27,9 @@ public class HistoricIdentityLinkEntityManagerImpl extends AbstractEntityManager
protected HistoricIdentityLinkDataManager historicIdentityLinkDataManager;
public HistoricIdentityLinkEntityManagerImpl() {
}
public HistoricIdentityLinkEntityManagerImpl(HistoricIdentityLinkDataManager historicIdentityLinkDataManager) {
public HistoricIdentityLinkEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricIdentityLinkDataManager historicIdentityLinkDataManager) {
super(processEngineConfiguration);
this.historicIdentityLinkDataManager = historicIdentityLinkDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricProcessInstanceDataManager;
......@@ -30,11 +31,8 @@ public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityMana
protected HistoricProcessInstanceDataManager historicProcessInstanceDataManager;
public HistoricProcessInstanceEntityManagerImpl() {
}
public HistoricProcessInstanceEntityManagerImpl(HistoricProcessInstanceDataManager historicProcessInstanceDataManager) {
public HistoricProcessInstanceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricProcessInstanceDataManager historicProcessInstanceDataManager) {
super(processEngineConfiguration);
this.historicProcessInstanceDataManager = historicProcessInstanceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -20,6 +20,7 @@ import java.util.Map;
import org.activiti.engine.compatibility.Activiti5CompatibilityHandler;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.HistoricTaskInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.history.HistoryLevel;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricTaskInstanceDataManager;
......@@ -33,11 +34,8 @@ public class HistoricTaskInstanceEntityManagerImpl extends AbstractEntityManager
protected HistoricTaskInstanceDataManager historicTaskInstanceDataManager;
public HistoricTaskInstanceEntityManagerImpl() {
}
public HistoricTaskInstanceEntityManagerImpl(HistoricTaskInstanceDataManager historicTaskInstanceDataManager) {
public HistoricTaskInstanceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricTaskInstanceDataManager historicTaskInstanceDataManager) {
super(processEngineConfiguration);
this.historicTaskInstanceDataManager = historicTaskInstanceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricVariableInstanceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -20,6 +20,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricVariableInstance;
import org.activiti.engine.impl.HistoricVariableInstanceQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.history.HistoryLevel;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.HistoricVariableInstanceDataManager;
......@@ -32,11 +33,8 @@ public class HistoricVariableInstanceEntityManagerImpl extends AbstractEntityMan
protected HistoricVariableInstanceDataManager historicVariableInstanceDataManager;
public HistoricVariableInstanceEntityManagerImpl() {
}
public HistoricVariableInstanceEntityManagerImpl(HistoricVariableInstanceDataManager historicVariableInstanceDataManager) {
public HistoricVariableInstanceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, HistoricVariableInstanceDataManager historicVariableInstanceDataManager) {
super(processEngineConfiguration);
this.historicVariableInstanceDataManager = historicVariableInstanceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityInfoEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.IdentityInfoDataManager;
......@@ -30,11 +31,8 @@ public class IdentityInfoEntityManagerImpl extends AbstractEntityManager<Identit
protected IdentityInfoDataManager identityInfoDataManager;
public IdentityInfoEntityManagerImpl() {
}
public IdentityInfoEntityManagerImpl(IdentityInfoDataManager identityInfoDataManager) {
public IdentityInfoEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, IdentityInfoDataManager identityInfoDataManager) {
super(processEngineConfiguration);
this.identityInfoDataManager = identityInfoDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.List;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.IdentityLinkDataManager;
import org.activiti.engine.task.IdentityLinkType;
......@@ -32,11 +33,8 @@ public class IdentityLinkEntityManagerImpl extends AbstractEntityManager<Identit
protected IdentityLinkDataManager identityLinkDataManager;
public IdentityLinkEntityManagerImpl() {
}
public IdentityLinkEntityManagerImpl(IdentityLinkDataManager identityLinkDataManager) {
public IdentityLinkEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, IdentityLinkDataManager identityLinkDataManager) {
super(processEngineConfiguration);
this.identityLinkDataManager = identityLinkDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -59,11 +59,8 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
protected JobDataManager jobDataManager;
public JobEntityManagerImpl() {
}
public JobEntityManagerImpl(JobDataManager jobDataManager) {
public JobEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, JobDataManager jobDataManager) {
super(processEngineConfiguration);
this.jobDataManager = jobDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MembershipEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.persistence.entity;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.MembershipDataManager;
......@@ -26,11 +27,8 @@ public class MembershipEntityManagerImpl extends AbstractEntityManager<Membershi
protected MembershipDataManager membershipDataManager;
public MembershipEntityManagerImpl() {
}
public MembershipEntityManagerImpl(MembershipDataManager membershipDataManager) {
public MembershipEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, MembershipDataManager membershipDataManager) {
super(processEngineConfiguration);
this.membershipDataManager = membershipDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.impl.ModelQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.ModelDataManager;
import org.activiti.engine.repository.Model;
......@@ -30,11 +31,8 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
protected ModelDataManager modelDataManager;
public ModelEntityManagerImpl() {
}
public ModelEntityManagerImpl(ModelDataManager modelDataManager) {
public ModelEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, ModelDataManager modelDataManager) {
super(processEngineConfiguration);
this.modelDataManager = modelDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.ProcessEngineConfiguration;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessDefinitionQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.ProcessDefinitionDataManager;
import org.activiti.engine.repository.ProcessDefinition;
......@@ -33,11 +34,8 @@ public class ProcessDefinitionEntityManagerImpl extends AbstractEntityManager<Pr
protected ProcessDefinitionDataManager processDefinitionDataManager;
public ProcessDefinitionEntityManagerImpl() {
}
public ProcessDefinitionEntityManagerImpl(ProcessDefinitionDataManager processDefinitionDataManager) {
public ProcessDefinitionEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, ProcessDefinitionDataManager processDefinitionDataManager) {
super(processEngineConfiguration);
this.processDefinitionDataManager = processDefinitionDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.persistence.entity;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.PropertyDataManager;
......@@ -26,11 +27,8 @@ public class PropertyEntityManagerImpl extends AbstractEntityManager<PropertyEnt
protected PropertyDataManager propertyDataManager;
public PropertyEntityManagerImpl() {
}
public PropertyEntityManagerImpl(PropertyDataManager propertyDataManager) {
public PropertyEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, PropertyDataManager propertyDataManager) {
super(processEngineConfiguration);
this.propertyDataManager = propertyDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.persistence.entity;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.ResourceDataManager;
......@@ -26,11 +27,8 @@ public class ResourceEntityManagerImpl extends AbstractEntityManager<ResourceEnt
protected ResourceDataManager resourceDataManager;
public ResourceEntityManagerImpl() {
}
public ResourceEntityManagerImpl(ResourceDataManager resourceDataManager) {
public ResourceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, ResourceDataManager resourceDataManager) {
super(processEngineConfiguration);
this.resourceDataManager = resourceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TableDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -34,6 +34,7 @@ import org.activiti.engine.history.HistoricVariableUpdate;
import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.User;
import org.activiti.engine.impl.TablePageQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.db.DbSqlSession;
import org.activiti.engine.impl.db.Entity;
import org.activiti.engine.impl.persistence.AbstractManager;
......@@ -56,6 +57,10 @@ import org.slf4j.LoggerFactory;
*/
public class TableDataManagerImpl extends AbstractManager implements TableDataManager {
public TableDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
private static Logger log = LoggerFactory.getLogger(TableDataManagerImpl.class);
public static Map<Class<?>, String> apiTypeToTableNameMap = new HashMap<Class<?>, String>();
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -25,6 +25,7 @@ import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.TaskQueryImpl;
import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.TaskDataManager;
import org.activiti.engine.impl.util.Activiti5Util;
......@@ -38,11 +39,8 @@ public class TaskEntityManagerImpl extends AbstractEntityManager<TaskEntity> imp
protected TaskDataManager taskDataManager;
public TaskEntityManagerImpl() {
}
public TaskEntityManagerImpl(TaskDataManager taskDataManager) {
public TaskEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, TaskDataManager taskDataManager) {
super(processEngineConfiguration);
this.taskDataManager = taskDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -23,6 +23,7 @@ import org.activiti.engine.identity.User;
import org.activiti.engine.identity.UserQuery;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.UserQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.UserDataManager;
......@@ -35,11 +36,8 @@ public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> imp
protected UserDataManager userDataManager;
public UserEntityManagerImpl() {
}
public UserEntityManagerImpl(UserDataManager userDataManager) {
public UserEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, UserDataManager userDataManager) {
super(processEngineConfiguration);
this.userDataManager = userDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntityManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.delegate.event.ActivitiEventType;
import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.data.DataManager;
import org.activiti.engine.impl.persistence.entity.data.VariableInstanceDataManager;
import org.activiti.engine.impl.variable.VariableType;
......@@ -32,11 +33,8 @@ public class VariableInstanceEntityManagerImpl extends AbstractEntityManager<Var
protected VariableInstanceDataManager variableInstanceDataManager;
public VariableInstanceEntityManagerImpl() {
}
public VariableInstanceEntityManagerImpl(VariableInstanceDataManager variableInstanceDataManager) {
public VariableInstanceEntityManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration, VariableInstanceDataManager variableInstanceDataManager) {
super(processEngineConfiguration);
this.variableInstanceDataManager = variableInstanceDataManager;
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/AbstractDataManager.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.db.DbSqlSession;
import org.activiti.engine.impl.db.Entity;
import org.activiti.engine.impl.persistence.AbstractManager;
......@@ -30,6 +31,10 @@ import org.activiti.engine.impl.persistence.cache.EntityCache;
*/
public abstract class AbstractDataManager<EntityImpl extends Entity> extends AbstractManager implements DataManager<EntityImpl> {
public AbstractDataManager(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
public abstract Class<? extends EntityImpl> getManagedEntityClass();
public List<Class<? extends EntityImpl>> getManagedEntitySubClasses() {
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/AttachmentDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -14,6 +14,7 @@ package org.activiti.engine.impl.persistence.entity.data;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.AttachmentEntity;
import org.activiti.engine.impl.persistence.entity.AttachmentEntityImpl;
......@@ -23,6 +24,10 @@ import org.activiti.engine.impl.persistence.entity.AttachmentEntityImpl;
*/
public class AttachmentDataManagerImpl extends AbstractDataManager<AttachmentEntity> implements AttachmentDataManager {
public AttachmentDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends AttachmentEntity> getManagedEntityClass() {
return AttachmentEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/ByteArrayDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -12,6 +12,7 @@
*/
package org.activiti.engine.impl.persistence.entity.data;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ByteArrayEntity;
import org.activiti.engine.impl.persistence.entity.ByteArrayEntityImpl;
......@@ -20,6 +21,10 @@ import org.activiti.engine.impl.persistence.entity.ByteArrayEntityImpl;
*/
public class ByteArrayDataManagerImpl extends AbstractDataManager<ByteArrayEntity> implements ByteArrayDataManager {
public ByteArrayDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public ByteArrayEntity create() {
return new ByteArrayEntityImpl();
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/CommentDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.CommentEntity;
import org.activiti.engine.impl.persistence.entity.CommentEntityImpl;
import org.activiti.engine.task.Comment;
......@@ -26,6 +27,10 @@ import org.activiti.engine.task.Event;
*/
public class CommentDataManagerImpl extends AbstractDataManager<CommentEntity> implements CommentDataManager {
public CommentDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends CommentEntity> getManagedEntityClass() {
return CommentEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/DeploymentDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -17,6 +17,7 @@ import java.util.Map;
import org.activiti.engine.impl.DeploymentQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.DeploymentEntity;
import org.activiti.engine.impl.persistence.entity.DeploymentEntityImpl;
import org.activiti.engine.repository.Deployment;
......@@ -26,6 +27,10 @@ import org.activiti.engine.repository.Deployment;
*/
public class DeploymentDataManagerImpl extends AbstractDataManager<DeploymentEntity> implements DeploymentDataManager {
public DeploymentDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends DeploymentEntity> getManagedEntityClass() {
return DeploymentEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/EventLogEntryDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -17,6 +17,7 @@ import java.util.List;
import java.util.Map;
import org.activiti.engine.event.EventLogEntry;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.EventLogEntryEntity;
import org.activiti.engine.impl.persistence.entity.EventLogEntryEntityImpl;
......@@ -25,6 +26,10 @@ import org.activiti.engine.impl.persistence.entity.EventLogEntryEntityImpl;
*/
public class EventLogEntryDataManagerImpl extends AbstractDataManager<EventLogEntryEntity> implements EventLogEntryDataManager {
public EventLogEntryDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends EventLogEntryEntity> getManagedEntityClass() {
return EventLogEntryEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/EventSubscriptionDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -20,6 +20,7 @@ import java.util.Map;
import org.activiti.engine.ProcessEngineConfiguration;
import org.activiti.engine.impl.EventSubscriptionQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.CompensateEventSubscriptionEntity;
import org.activiti.engine.impl.persistence.entity.CompensateEventSubscriptionEntityImpl;
......@@ -45,6 +46,10 @@ public class EventSubscriptionDataManagerImpl extends AbstractDataManager<EventS
ENTITY_SUBCLASSES.add(CompensateEventSubscriptionEntityImpl.class);
}
public EventSubscriptionDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends EventSubscriptionEntity> getManagedEntityClass() {
return EventSubscriptionEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/ExecutionDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -23,6 +23,7 @@ import org.activiti.engine.ActivitiOptimisticLockingException;
import org.activiti.engine.impl.ExecutionQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.activiti.engine.impl.persistence.entity.ExecutionEntityImpl;
......@@ -34,6 +35,10 @@ import org.activiti.engine.runtime.ProcessInstance;
*/
public class ExecutionDataManagerImpl extends AbstractDataManager<ExecutionEntity> implements ExecutionDataManager {
public ExecutionDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends ExecutionEntity> getManagedEntityClass() {
return ExecutionEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/GroupDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.identity.Group;
import org.activiti.engine.impl.GroupQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.GroupEntity;
import org.activiti.engine.impl.persistence.entity.GroupEntityImpl;
......@@ -26,6 +27,10 @@ import org.activiti.engine.impl.persistence.entity.GroupEntityImpl;
*/
public class GroupDataManagerImpl extends AbstractDataManager<GroupEntity> implements GroupDataManager {
public GroupDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends GroupEntity> getManagedEntityClass() {
return GroupEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricActivityInstanceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.impl.HistoricActivityInstanceQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.HistoricActivityInstanceEntity;
import org.activiti.engine.impl.persistence.entity.HistoricActivityInstanceEntityImpl;
......@@ -28,6 +29,10 @@ import org.activiti.engine.impl.persistence.entity.HistoricActivityInstanceEntit
*/
public class HistoricActivityInstanceDataManagerImpl extends AbstractDataManager<HistoricActivityInstanceEntity> implements HistoricActivityInstanceDataManager {
public HistoricActivityInstanceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricActivityInstanceEntity> getManagedEntityClass() {
return HistoricActivityInstanceEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricDetailDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricDetail;
import org.activiti.engine.impl.HistoricDetailQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.HistoricDetailAssignmentEntity;
import org.activiti.engine.impl.persistence.entity.HistoricDetailAssignmentEntityImpl;
import org.activiti.engine.impl.persistence.entity.HistoricDetailEntity;
......@@ -34,6 +35,10 @@ import org.activiti.engine.impl.persistence.entity.HistoricFormPropertyEntityImp
*/
public class HistoricDetailDataManagerImpl extends AbstractDataManager<HistoricDetailEntity> implements HistoricDetailDataManager {
public HistoricDetailDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricDetailEntity> getManagedEntityClass() {
return HistoricDetailEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricIdentityLinkDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -14,6 +14,7 @@ package org.activiti.engine.impl.persistence.entity.data;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.HistoricIdentityLinkEntity;
import org.activiti.engine.impl.persistence.entity.HistoricIdentityLinkEntityImpl;
......@@ -23,6 +24,10 @@ import org.activiti.engine.impl.persistence.entity.HistoricIdentityLinkEntityImp
*/
public class HistoricIdentityLinkDataManagerImpl extends AbstractDataManager<HistoricIdentityLinkEntity> implements HistoricIdentityLinkDataManager {
public HistoricIdentityLinkDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricIdentityLinkEntity> getManagedEntityClass() {
return HistoricIdentityLinkEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricProcessInstanceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.activiti.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
import org.activiti.engine.impl.persistence.entity.HistoricProcessInstanceEntityImpl;
......@@ -27,6 +28,10 @@ import org.activiti.engine.impl.persistence.entity.HistoricProcessInstanceEntity
*/
public class HistoricProcessInstanceDataManagerImpl extends AbstractDataManager<HistoricProcessInstanceEntity> implements HistoricProcessInstanceDataManager {
public HistoricProcessInstanceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricProcessInstanceEntity> getManagedEntityClass() {
return HistoricProcessInstanceEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricTaskInstanceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.HistoricTaskInstanceQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.activiti.engine.impl.persistence.entity.HistoricTaskInstanceEntity;
import org.activiti.engine.impl.persistence.entity.HistoricTaskInstanceEntityImpl;
......@@ -28,6 +29,10 @@ import org.activiti.engine.impl.persistence.entity.TaskEntity;
*/
public class HistoricTaskInstanceDataManagerImpl extends AbstractDataManager<HistoricTaskInstanceEntity> implements HistoricTaskInstanceDataManager {
public HistoricTaskInstanceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricTaskInstanceEntity> getManagedEntityClass() {
return HistoricTaskInstanceEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/HistoricVariableInstanceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.Map;
import org.activiti.engine.history.HistoricVariableInstance;
import org.activiti.engine.impl.HistoricVariableInstanceQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.HistoricVariableInstanceEntity;
import org.activiti.engine.impl.persistence.entity.HistoricVariableInstanceEntityImpl;
......@@ -27,6 +28,10 @@ import org.activiti.engine.impl.persistence.entity.HistoricVariableInstanceEntit
*/
public class HistoricVariableInstanceDataManagerImpl extends AbstractDataManager<HistoricVariableInstanceEntity> implements HistoricVariableInstanceDataManager {
public HistoricVariableInstanceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends HistoricVariableInstanceEntity> getManagedEntityClass() {
return HistoricVariableInstanceEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/IdentityInfoDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
import org.activiti.engine.impl.persistence.entity.IdentityInfoEntityImpl;
......@@ -24,6 +25,10 @@ import org.activiti.engine.impl.persistence.entity.IdentityInfoEntityImpl;
*/
public class IdentityInfoDataManagerImpl extends AbstractDataManager<IdentityInfoEntity> implements IdentityInfoDataManager {
public IdentityInfoDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends IdentityInfoEntity> getManagedEntityClass() {
return IdentityInfoEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/IdentityLinkDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.IdentityLinkEntity;
import org.activiti.engine.impl.persistence.entity.IdentityLinkEntityImpl;
......@@ -25,6 +26,10 @@ import org.activiti.engine.impl.persistence.entity.IdentityLinkEntityImpl;
public class IdentityLinkDataManagerImpl extends AbstractDataManager<IdentityLinkEntity> implements IdentityLinkDataManager {
public IdentityLinkDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends IdentityLinkEntity> getManagedEntityClass() {
return IdentityLinkEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/JobDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -20,6 +20,7 @@ import java.util.Map;
import org.activiti.engine.impl.JobQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.JobEntity;
import org.activiti.engine.impl.persistence.entity.JobEntityImpl;
......@@ -34,6 +35,10 @@ import org.activiti.engine.runtime.Job;
*/
public class JobDataManagerImpl extends AbstractDataManager<JobEntity> implements JobDataManager {
public JobDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
protected static List<Class<? extends JobEntity>> ENTITY_SUBCLASSES = new ArrayList<Class<? extends JobEntity>>();
static {
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/MembershipDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.persistence.entity.data;
import java.util.HashMap;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.MembershipEntity;
import org.activiti.engine.impl.persistence.entity.MembershipEntityImpl;
......@@ -23,6 +24,10 @@ import org.activiti.engine.impl.persistence.entity.MembershipEntityImpl;
*/
public class MembershipDataManagerImpl extends AbstractDataManager<MembershipEntity> implements MembershipDataManager {
public MembershipDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends MembershipEntity> getManagedEntityClass() {
return MembershipEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/ModelDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -17,6 +17,7 @@ import java.util.Map;
import org.activiti.engine.impl.ModelQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ModelEntity;
import org.activiti.engine.impl.persistence.entity.ModelEntityImpl;
import org.activiti.engine.repository.Model;
......@@ -26,6 +27,10 @@ import org.activiti.engine.repository.Model;
*/
public class ModelDataManagerImpl extends AbstractDataManager<ModelEntity> implements ModelDataManager {
public ModelDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends ModelEntity> getManagedEntityClass() {
return ModelEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/ProcessDefinitionDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import java.util.Map;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.ProcessDefinitionQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntityImpl;
import org.activiti.engine.repository.ProcessDefinition;
......@@ -28,6 +29,10 @@ import org.activiti.engine.repository.ProcessDefinition;
*/
public class ProcessDefinitionDataManagerImpl extends AbstractDataManager<ProcessDefinitionEntity> implements ProcessDefinitionDataManager {
public ProcessDefinitionDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends ProcessDefinitionEntity> getManagedEntityClass() {
return ProcessDefinitionEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/PropertyDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -14,6 +14,7 @@ package org.activiti.engine.impl.persistence.entity.data;
import java.util.List;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.PropertyEntity;
import org.activiti.engine.impl.persistence.entity.PropertyEntityImpl;
......@@ -22,6 +23,10 @@ import org.activiti.engine.impl.persistence.entity.PropertyEntityImpl;
*/
public class PropertyDataManagerImpl extends AbstractDataManager<PropertyEntity> implements PropertyDataManager {
public PropertyDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends PropertyEntity> getManagedEntityClass() {
return PropertyEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/ResourceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.ResourceEntity;
import org.activiti.engine.impl.persistence.entity.ResourceEntityImpl;
......@@ -24,6 +25,10 @@ import org.activiti.engine.impl.persistence.entity.ResourceEntityImpl;
*/
public class ResourceDataManagerImpl extends AbstractDataManager<ResourceEntity> implements ResourceDataManager {
public ResourceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends ResourceEntity> getManagedEntityClass() {
return ResourceEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/TaskDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.TaskQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.TaskEntity;
import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
......@@ -28,6 +29,10 @@ import org.activiti.engine.task.Task;
*/
public class TaskDataManagerImpl extends AbstractDataManager<TaskEntity> implements TaskDataManager {
public TaskDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends TaskEntity> getManagedEntityClass() {
return TaskEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/UserDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -19,6 +19,7 @@ import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.User;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.UserQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.entity.UserEntity;
import org.activiti.engine.impl.persistence.entity.UserEntityImpl;
......@@ -27,6 +28,10 @@ import org.activiti.engine.impl.persistence.entity.UserEntityImpl;
*/
public class UserDataManagerImpl extends AbstractDataManager<UserEntity> implements UserDataManager {
public UserDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends UserEntity> getManagedEntityClass() {
return UserEntityImpl.class;
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/data/VariableInstanceDataManagerImpl.java
浏览文件 @ c09e3e1c
......@@ -17,6 +17,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.persistence.CachedEntityMatcher;
import org.activiti.engine.impl.persistence.entity.VariableInstanceEntity;
import org.activiti.engine.impl.persistence.entity.VariableInstanceEntityImpl;
......@@ -26,6 +27,10 @@ import org.activiti.engine.impl.persistence.entity.VariableInstanceEntityImpl;
*/
public class VariableInstanceDataManagerImpl extends AbstractDataManager<VariableInstanceEntity> implements VariableInstanceDataManager {
public VariableInstanceDataManagerImpl(ProcessEngineConfigurationImpl processEngineConfiguration) {
super(processEngineConfiguration);
}
@Override
public Class<? extends VariableInstanceEntity> getManagedEntityClass() {
return VariableInstanceEntityImpl.class;
......
modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPConfigurator.java
浏览文件 @ c09e3e1c
......@@ -87,7 +87,7 @@ public class LDAPConfigurator extends AbstractProcessEngineConfigurator {
public void configure(ProcessEngineConfigurationImpl processEngineConfiguration) {
// User
processEngineConfiguration.setUserEntityManager(new LDAPUserManager(this));
processEngineConfiguration.setUserEntityManager(new LDAPUserManager(processEngineConfiguration, this));
// Groups
LDAPGroupCache ldapGroupCache = null;
......@@ -100,9 +100,9 @@ public class LDAPConfigurator extends AbstractProcessEngineConfigurator {
LDAPGroupManager ldapGroupManager = null;
if (ldapGroupCache == null) {
ldapGroupManager = new LDAPGroupManager(this);
ldapGroupManager = new LDAPGroupManager(processEngineConfiguration, this);
} else {
ldapGroupManager = new LDAPGroupManager(this, ldapGroupCache);
ldapGroupManager = new LDAPGroupManager(processEngineConfiguration, this, ldapGroupCache);
}
processEngineConfiguration.setGroupEntityManager(ldapGroupManager);
}
......
modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java
浏览文件 @ c09e3e1c
......@@ -28,6 +28,7 @@ import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.GroupQuery;
import org.activiti.engine.impl.GroupQueryImpl;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.persistence.AbstractManager;
import org.activiti.engine.impl.persistence.entity.GroupEntity;
......@@ -46,11 +47,13 @@ public class LDAPGroupManager extends AbstractManager implements GroupEntityMana
protected LDAPConfigurator ldapConfigurator;
protected LDAPGroupCache ldapGroupCache;
public LDAPGroupManager(LDAPConfigurator ldapConfigurator) {
public LDAPGroupManager(ProcessEngineConfigurationImpl processEngineConfiguration, LDAPConfigurator ldapConfigurator) {
super(processEngineConfiguration);
this.ldapConfigurator = ldapConfigurator;
}
public LDAPGroupManager(LDAPConfigurator ldapConfigurator, LDAPGroupCache ldapGroupCache) {
public LDAPGroupManager(ProcessEngineConfigurationImpl processEngineConfiguration, LDAPConfigurator ldapConfigurator, LDAPGroupCache ldapGroupCache) {
super(processEngineConfiguration);
this.ldapConfigurator = ldapConfigurator;
this.ldapGroupCache = ldapGroupCache;
}
......
modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java
浏览文件 @ c09e3e1c
......@@ -30,6 +30,7 @@ import org.activiti.engine.identity.User;
import org.activiti.engine.identity.UserQuery;
import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.UserQueryImpl;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.persistence.AbstractManager;
import org.activiti.engine.impl.persistence.entity.UserEntity;
......@@ -52,7 +53,8 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
protected LDAPConfigurator ldapConfigurator;
public LDAPUserManager(LDAPConfigurator ldapConfigurator) {
public LDAPUserManager(ProcessEngineConfigurationImpl processEngineConfiguration, LDAPConfigurator ldapConfigurator) {
super(processEngineConfiguration);
this.ldapConfigurator = ldapConfigurator;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或