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 2020/10/13 10:53:42 UTC
[syncope] branch master updated: Upgrading Flowable
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new df10880 Upgrading Flowable
df10880 is described below
commit df10880b60f7016dd61c2c89f0415a933aa5cc59
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Oct 13 12:03:42 2020 +0200
Upgrading Flowable
---
ext/flowable/client-console/pom.xml | 25 +++++++++++-----------
.../core/flowable/WorkflowFlowableContext.java | 8 +------
.../support/DomainProcessEngineFactoryBean.java | 6 ++----
.../support/SyncopeIdmIdentityService.java | 6 +++++-
pom.xml | 21 +++++++++++++++---
5 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/ext/flowable/client-console/pom.xml b/ext/flowable/client-console/pom.xml
index 73d3ee1..820b68d 100644
--- a/ext/flowable/client-console/pom.xml
+++ b/ext/flowable/client-console/pom.xml
@@ -63,8 +63,12 @@ under the License.
<dependency>
<groupId>org.flowable</groupId>
- <artifactId>flowable-ui-modeler-app</artifactId>
- <type>war</type>
+ <artifactId>flowable-ui-modeler-frontend</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.flowable</groupId>
+ <artifactId>flowable-ui-modeler-logic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -81,26 +85,21 @@ under the License.
<phase>process-resources</phase>
<configuration>
<target>
- <unzip src="${settings.localRepository}/org/flowable/flowable-ui-modeler-app/${flowable.version}/flowable-ui-modeler-app-${flowable.version}.war" dest="${flowable-modeler.directory}">
- <patternset>
- <include name="WEB-INF/classes/static/**"/>
- <include name="WEB-INF/lib/flowable-ui-modeler-logic-${flowable.version}.jar"/>
- </patternset>
- </unzip>
-
- <unzip src="${flowable-modeler.directory}/WEB-INF/lib/flowable-ui-modeler-logic-${flowable.version}.jar" dest="${flowable-modeler.directory}">
+ <unzip src="${settings.localRepository}/org/flowable/flowable-ui-modeler-frontend/${flowable.version}/flowable-ui-modeler-frontend-${flowable.version}.jar" dest="${flowable-modeler.directory}"/>
+
+ <unzip src="${settings.localRepository}/org/flowable/flowable-ui-modeler-logic/${flowable.version}/flowable-ui-modeler-logic-${flowable.version}.jar" dest="${flowable-modeler.directory}">
<patternset>
<include name="stencilset_bpmn.json"/>
</patternset>
</unzip>
<move todir="${flowable-modeler.directory}">
- <fileset dir="${flowable-modeler.directory}/WEB-INF/classes/static/">
+ <fileset dir="${flowable-modeler.directory}/static/modeler">
<include name="**"/>
</fileset>
</move>
- <delete dir="${flowable-modeler.directory}/WEB-INF"/>
-
+ <delete dir="${flowable-modeler.directory}/static"/>
+
<replace file="${flowable-modeler.directory}/index.html" token="</head>" value="<script type="text/javascript">window.onunload = refreshParent; function refreshParent() { window.opener.location.reload(); }</script></head>"/>
<replace file="${flowable-modeler.directory}/index.html" token=" ng-click="backToLanding()"" value=" disabled="disabled""/>
<replace file="${flowable-modeler.directory}/index.html" token="<ul class="nav navbar-nav" id="main-nav"" value="<ul class="nav navbar-nav" id="main-nav" style="display: none;""/>
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
index ac0ef5c..91f9055 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
@@ -57,15 +57,9 @@ public class WorkflowFlowableContext {
@ConditionalOnMissingBean
@Bean
- public SyncopeIdmIdentityService syncopeIdmIdentityService() {
- return new SyncopeIdmIdentityService();
- }
-
- @ConditionalOnMissingBean
- @Bean
public SpringIdmEngineConfiguration syncopeIdmEngineConfiguration() {
SpringIdmEngineConfiguration conf = new SpringIdmEngineConfiguration();
- conf.setIdmIdentityService(syncopeIdmIdentityService());
+ conf.setIdmIdentityService(new SyncopeIdmIdentityService(conf));
return conf;
}
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
index 1c7e01c..bcc9bbb 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
@@ -28,7 +28,6 @@ import org.apache.syncope.core.persistence.api.DomainHolder;
import org.apache.syncope.core.persistence.api.SyncopeCoreLoader;
import org.flowable.engine.ProcessEngine;
import org.flowable.common.engine.impl.cfg.SpringBeanFactoryProxyMap;
-import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
import org.flowable.engine.impl.util.EngineServiceUtil;
import org.flowable.idm.spring.SpringIdmEngineConfiguration;
import org.flowable.spring.SpringExpressionManager;
@@ -84,9 +83,8 @@ public class DomainProcessEngineFactoryBean
conf.setExpressionManager(new SpringExpressionManager(ctx, conf.getBeans()));
}
if (EngineServiceUtil.getIdmEngineConfiguration(conf) == null) {
- conf.addEngineConfiguration(
- EngineConfigurationConstants.KEY_IDM_ENGINE_CONFIG,
- ctx.getBean(SpringIdmEngineConfiguration.class));
+ SpringIdmEngineConfiguration spiec = ctx.getBean(SpringIdmEngineConfiguration.class);
+ conf.addEngineConfiguration(spiec.getEngineCfgKey(), spiec.getEngineScopeType(), spiec);
}
conf.setEnableSafeBpmnXml(true);
conf.setCustomFormTypes(List.of(new DropdownFormType(null)));
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeIdmIdentityService.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeIdmIdentityService.java
index 6b9c4f6..c8123e9 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeIdmIdentityService.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeIdmIdentityService.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.flowable.support;
import org.flowable.idm.api.GroupQuery;
import org.flowable.idm.api.UserQuery;
+import org.flowable.idm.engine.IdmEngineConfiguration;
import org.flowable.idm.engine.impl.IdmIdentityServiceImpl;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -31,6 +32,10 @@ public class SyncopeIdmIdentityService extends IdmIdentityServiceImpl implements
private ConfigurableApplicationContext ctx;
+ public SyncopeIdmIdentityService(final IdmEngineConfiguration idmEngineConfiguration) {
+ super(idmEngineConfiguration);
+ }
+
@Override
public void setApplicationContext(final ApplicationContext ctx) throws BeansException {
this.ctx = (ConfigurableApplicationContext) ctx;
@@ -47,5 +52,4 @@ public class SyncopeIdmIdentityService extends IdmIdentityServiceImpl implements
return (GroupQuery) ctx.getBeanFactory().
createBean(SyncopeGroupQueryImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_TYPE, false);
}
-
}
diff --git a/pom.xml b/pom.xml
index 800e0a7..e8f2b03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@ under the License.
<groovy.version>3.0.6</groovy.version>
- <flowable.version>6.5.0</flowable.version>
+ <flowable.version>6.6.0</flowable.version>
<camel.version>3.5.0</camel.version>
@@ -805,6 +805,12 @@ under the License.
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -833,6 +839,11 @@ under the License.
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${jackson.version}</version>
<exclusions>
@@ -1319,9 +1330,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.flowable</groupId>
- <artifactId>flowable-ui-modeler-app</artifactId>
+ <artifactId>flowable-ui-modeler-frontend</artifactId>
+ <version>${flowable.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.flowable</groupId>
+ <artifactId>flowable-ui-modeler-logic</artifactId>
<version>${flowable.version}</version>
- <type>war</type>
</dependency>
<!-- /Flowable -->