You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/11/06 12:00:18 UTC
syncope git commit: Upgrading Activiti
Repository: syncope
Updated Branches:
refs/heads/master eec662457 -> 03b341e11
Upgrading Activiti
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/03b341e1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/03b341e1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/03b341e1
Branch: refs/heads/master
Commit: 03b341e11b03bc20fa12c09b0bc03caf68f54c14
Parents: eec6624
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 6 12:00:05 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 6 12:00:05 2015 +0100
----------------------------------------------------------------------
.../core/workflow/activiti/spring/DomainProcessEngine.java | 6 ++++++
pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/03b341e1/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/spring/DomainProcessEngine.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/spring/DomainProcessEngine.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/spring/DomainProcessEngine.java
index 83619c7..48eeb5c 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/spring/DomainProcessEngine.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/spring/DomainProcessEngine.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.workflow.activiti.spring;
import java.util.Collections;
import java.util.Map;
+import org.activiti.engine.DynamicBpmnService;
import org.activiti.engine.FormService;
import org.activiti.engine.HistoryService;
import org.activiti.engine.IdentityService;
@@ -99,4 +100,9 @@ public class DomainProcessEngine implements ProcessEngine {
return engines.get(AuthContextUtils.getDomain()).getProcessEngineConfiguration();
}
+ @Override
+ public DynamicBpmnService getDynamicBpmnService() {
+ return engines.get(AuthContextUtils.getDomain()).getDynamicBpmnService();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/03b341e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a82b427..5be90c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,7 +347,7 @@ under the License.
<groovy.version>2.4.5</groovy.version>
- <activiti.version>5.18.0</activiti.version>
+ <activiti.version>5.19.0</activiti.version>
<slf4j.version>1.7.12</slf4j.version>
<log4j.version>2.4.1</log4j.version>