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:48 UTC
[syncope] branch 2_1_X updated: Upgrading Flowable
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new bbe1325 Upgrading Flowable
bbe1325 is described below
commit bbe1325723be4491a22d1bbf75dea9f9a5a878fc
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Oct 13 12:51:31 2020 +0200
Upgrading Flowable
---
ext/flowable/client-console/pom.xml | 53 +++++++++++-----------
.../support/DomainProcessEngineFactoryBean.java | 6 +--
.../support/SyncopeIdmIdentityService.java | 6 ++-
.../src/main/resources/workflowFlowableContext.xml | 7 ++-
pom.xml | 10 ++--
5 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/ext/flowable/client-console/pom.xml b/ext/flowable/client-console/pom.xml
index aa407a0..3b39679 100644
--- a/ext/flowable/client-console/pom.xml
+++ b/ext/flowable/client-console/pom.xml
@@ -60,11 +60,15 @@ under the License.
<artifactId>syncope-client-console</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<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,39 +85,34 @@ 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" />
+ <include name="stencilset_bpmn.json"/>
</patternset>
</unzip>
<move todir="${flowable-modeler.directory}">
- <fileset dir="${flowable-modeler.directory}/WEB-INF/classes/static/">
- <include name="**" />
+ <fileset dir="${flowable-modeler.directory}/static/modeler">
+ <include name="**"/>
</fileset>
</move>
- <delete dir="${flowable-modeler.directory}/WEB-INF" />
-
- <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;"" />
- <replace file="${flowable-modeler.directory}/index.html" token="<div class="pull-right" value="<div style="display: none;" class="pull-right" />
- <replace file="${flowable-modeler.directory}/editor-app/editor.html" token="<div class="btn-group pull-right"" value="<div style="display: none;" class="btn-group pull-right"" />
- <replace file="${flowable-modeler.directory}/editor-app/configuration/toolbar-default-actions.js" token="$location.path('/processes');" value="window.close();" />
+ <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;""/>
+ <replace file="${flowable-modeler.directory}/index.html" token="<div class="pull-right" value="<div style="display: none;" class="pull-right"/>
+ <replace file="${flowable-modeler.directory}/editor-app/editor.html" token="<div class="btn-group pull-right"" value="<div style="display: none;" class="btn-group pull-right""/>
+ <replace file="${flowable-modeler.directory}/editor-app/configuration/toolbar-default-actions.js" token="$location.path('/processes');" value="window.close();"/>
- <copy file="${basedir}/src/main/resources/app-cfg.js" todir="${flowable-modeler.directory}/scripts" overwrite="true" />
- <copy file="${basedir}/src/main/resources/url-config.js" todir="${flowable-modeler.directory}/editor-app/configuration" overwrite="true" />
- <copy file="${basedir}/src/main/resources/toolbar.js" todir="${flowable-modeler.directory}/editor-app/configuration" overwrite="true" />
- <copy file="${basedir}/src/main/resources/save-model.html" todir="${flowable-modeler.directory}/editor-app/popups" overwrite="true" />
+ <copy file="${basedir}/src/main/resources/app-cfg.js" todir="${flowable-modeler.directory}/scripts" overwrite="true"/>
+ <copy file="${basedir}/src/main/resources/url-config.js" todir="${flowable-modeler.directory}/editor-app/configuration" overwrite="true"/>
+ <copy file="${basedir}/src/main/resources/toolbar.js" todir="${flowable-modeler.directory}/editor-app/configuration" overwrite="true"/>
+ <copy file="${basedir}/src/main/resources/save-model.html" todir="${flowable-modeler.directory}/editor-app/popups" overwrite="true"/>
- <patch patchfile="${basedir}/src/main/resources/dropdown.diff" dir="${flowable-modeler.directory}" strip="1" />
+ <patch patchfile="${basedir}/src/main/resources/dropdown.diff" dir="${flowable-modeler.directory}" strip="1"/>
</target>
</configuration>
<goals>
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 a330a1f..f4037d0 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
@@ -79,9 +79,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(Arrays.asList(new DropdownFormType(null)));
@@ -112,5 +111,4 @@ public class DomainProcessEngineFactoryBean
engine.close();
}
}
-
}
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/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
index bbc6eb2..619fef9 100644
--- a/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
+++ b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
@@ -30,9 +30,12 @@ under the License.
<property name="fallback" value="classpath:userWorkflow.bpmn20.xml"/>
</bean>
- <bean id="syncopeIdmIdentityService" class="org.apache.syncope.core.flowable.support.SyncopeIdmIdentityService"/>
<bean id="syncopeIdmEngineConfiguration" class="org.flowable.idm.spring.SpringIdmEngineConfiguration">
- <property name="idmIdentityService" ref="syncopeIdmIdentityService"/>
+ <property name="idmIdentityService">
+ <bean class="org.apache.syncope.core.flowable.support.SyncopeIdmIdentityService">
+ <constructor-arg ref="syncopeIdmEngineConfiguration"/>
+ </bean>
+ </property>
</bean>
<bean id="syncopeIdmEngineConfigurator" class="org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator">
<property name="idmEngineConfiguration" ref="syncopeIdmEngineConfiguration"/>
diff --git a/pom.xml b/pom.xml
index d4cdd4d..f5c6dcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,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>2.24.2</camel.version>
@@ -1257,9 +1257,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 -->