syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/8] syncope git commit: [SYNCOPE-1054] Replacing Activiti with Flowable - still 5.x
Date Mon, 28 Aug 2017 09:13:16 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 1fe2d6937 -> 7098ca9f6


http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java b/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
index 57a1bd3..ac46abb 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
@@ -20,11 +20,11 @@ package org.apache.syncope.installer.files;
 
 public final class ConsolePom {
 
-    public static final String ACTIVITI_PLACEHOLDER = "</dependencies>";
+    public static final String FLOWABLE_PLACEHOLDER = "</dependencies>";
 
-    public static final String ACTIVITI_CONTENT_TO_ADD = "<dependency>\n"
-            + "          <groupId>org.activiti</groupId>\n"
-            + "          <artifactId>activiti-webapp-explorer2</artifactId>\n"
+    public static final String FLOWABLE_CONTENT_TO_ADD = "<dependency>\n"
+            + "          <groupId>org.flowable</groupId>\n"
+            + "          <artifactId>flowable-webapp-explorer2</artifactId>\n"
             + "          <type>war</type>\n"
             + "          <scope>test</scope>\n"
             + "        </dependency>\n"
@@ -39,59 +39,46 @@ public final class ConsolePom {
             + "            <inherited>true</inherited>\n"
             + "            <executions>\n"
             + "              <execution>\n"
-            + "                <id>setupActivitiModeler</id>\n"
+            + "                <id>setupFlowableModeler</id>\n"
             + "                <phase>process-resources</phase>\n"
             + "                <configuration>\n"
             + "                  <target>\n"
-            + "                    <unzip src=\"${settings.localRepository}/org/activiti/activiti-webapp-explorer2/"
-            + "${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war\" \n"
-            + "                           dest=\"${project.build.directory}/activiti-webapp-explorer2\" />\n"
-            + "                \n"
-            + "                    <mkdir dir=\"${activiti-modeler.directory}\" />\n"
-            + "                    <copy file=\"${project.build.directory}/activiti-webapp-explorer2/modeler.html\" \n"
-            + "                          todir=\"${activiti-modeler.directory}\" />\n"
-            + "                    <replace file=\"${activiti-modeler.directory}/modeler.html\"\n"
-            + "                             token=\"&lt;/head&gt;\"\n"
-            + "                             value=\"&lt;script type=&quot;text/javascript&quot;&gt;window.onunload = "
-            + "refreshParent; function refreshParent() { window.opener.location.reload(); }&lt;/script&gt;&lt;/head&gt;"
-            + "\"/>\n"
-            + "                    <copy file=\"${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/"
+            + "                <unzip src=\"${settings.localRepository}/org/flowable/flowable-webapp-explorer2/"
+            + "${flowable.version}/flowable-webapp-explorer2-${flowable.version}.war\" \n"
+            + "                       dest=\"${project.build.directory}/flowable-webapp-explorer2\"/>\n"
+            + "                \n" + "                <mkdir dir=\"${flowable-modeler.directory}\"/>\n"
+            + "                <copy file=\"${project.build.directory}/flowable-webapp-explorer2/modeler.html\" \n"
+            + "                      todir=\"${flowable-modeler.directory}\"/>\n"
+            + "                <replace file=\"${flowable-modeler.directory}/modeler.html\"\n"
+            + "                         token=\"&lt;/head&gt;\"\n"
+            + "                         value=\"&lt;script type=&quot;text/javascript&quot;&gt;window.onunload = "
+            + "refreshParent; function refreshParent() { window.opener.location.reload(); }&lt;"
+            + "/script&gt;&lt;/head&gt;\"/>\n"
+            + "                <copy file=\"${project.build.directory}/flowable-webapp-explorer2/WEB-INF/classes/"
             + "stencilset.json\" \n"
-            + "                          todir=\"${activiti-modeler.directory}\" />\n" + "\n"
-            + "                    <mkdir dir=\"${activiti-modeler.directory}/editor-app\" />\n"
-            + "                    <copy todir=\"${activiti-modeler.directory}/editor-app\">\n"
-            + "                      <fileset dir=\"${project.build.directory}/activiti-webapp-explorer2/editor-app\""
-            + "/>\n"
-            + "                    </copy>\n"
-            + "                    <replaceregexp file=\"${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
-            + "\"\n"
-            + "                                   match=\"ORYX.CONFIG.ROOT_PATH =.*&quot;editor/&quot;; //TODO:"
-            + " Remove last slash!!\"\n"
-            + "                                   replace=\"BASE_PATH = window.location.toString().substr(0, "
-            + "window.location.toString().indexOf(&#39;/wicket&#39;));\n"
-            + "ORYX.CONFIG.ROOT_PATH = BASE_PATH + &quot;/activiti-modeler/editor-app/editor/&quot;;\"\n"
-            + "                                   byline=\"true\"/>\n"
-            + "                    <replace file=\"${activiti-modeler.directory}/editor-app/editor/oryx.debug.js\"\n"
-            + "                             token=\"new Ajax.Request(ACTIVITI.CONFIG.contextRoot + &#39;/editor/"
-            + "stencilset?version=&#39; + Date.now(), {\"\n"
-            + "                             value=\"new Ajax.Request(window.location.toString().substr(0,"
-            + " window.location.toString().indexOf(&#39;/activiti-modeler&#39;)) + &quot;/activiti-modeler/"
-            + "stencilset.json&quot;, {\"/>\n"
-            + "                    <replace file=\"${activiti-modeler.directory}/editor-app/editor/oryx.debug.js\"\n"
-            + "                             token=\"ORYX.Editor.createByUrl(modelUrl);\"\n"
-            + "                             value=\"modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot; "
-            + "+ this.modelId; ORYX.Editor.createByUrl(modelUrl);\" />\n"
-            + "                    <replace file=\"${activiti-modeler.directory}/editor-app/configuration/"
+            + "                      todir=\"${flowable-modeler.directory}\"/>\n" + "\n"
+            + "                <mkdir dir=\"${flowable-modeler.directory}/editor-app\"/>\n"
+            + "                <copy todir=\"${flowable-modeler.directory}/editor-app\">\n"
+            + "                  <fileset dir=\"${project.build.directory}/flowable-webapp-explorer2/editor-app\"/>\n"
+            + "                </copy>\n"
+            + "                <replace file=\"${flowable-modeler.directory}/editor-app/editor/oryx.debug.js\"\n"
+            + "                         token=\"return this.changeDifference !== 0 || (this.facade.getModelMetaData()"
+            + "['new'] &amp;&amp; this.facade.getCanvas().getChildShapes().size() &gt; 0);\"\n"
+            + "                         value=\"return this.changeDifference !== 0 \n"
+            + "              || (typeof this.facade.getModelMetaData() != 'undefined' \n"
+            + "              &amp;&amp; this.facade.getModelMetaData()['new'] &amp;&amp; this.facade.getCanvas()."
+            + "getChildShapes().size() &gt; 0);\"/>\n"
+            + "                <replace file=\"${flowable-modeler.directory}/editor-app/configuration/"
             + "toolbar-default-actions.js\"\n"
-            + "                             token=\"window.location.href = &quot;./&quot;;\"\n"
-            + "                             value=\"window.close();\"/>\n"
+            + "                         token=\"window.location.href = &quot;./&quot;;\"\n"
+            + "                         value=\"window.close();\"/>\n"
             + "                                               \n"
-            + "                    <copy file=\"${basedir}/src/main/resources/url-config.js\" \n"
-            + "                          todir=\"${activiti-modeler.directory}/editor-app/configuration\"\n"
-            + "                          overwrite=\"true\" />\n"
-            + "                    <copy file=\"${basedir}/src/main/resources/save-model.html\" \n"
-            + "                          todir=\"${activiti-modeler.directory}/editor-app/popups\"\n"
-            + "                          overwrite=\"true\" />\n"
+            + "                <copy file=\"${basedir}/src/main/resources/url-config.js\" \n"
+            + "                      todir=\"${flowable-modeler.directory}/editor-app/configuration\"\n"
+            + "                      overwrite=\"true\"/>\n"
+            + "                <copy file=\"${basedir}/src/main/resources/save-model.html\" \n"
+            + "                      todir=\"${flowable-modeler.directory}/editor-app/popups\"\n"
+            + "                      overwrite=\"true\"/>\n"
             + "                  </target>\n"
             + "                </configuration>\n"
             + "                <goals>\n"

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
index 029fad1..faeb5af 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
@@ -29,11 +29,11 @@ public final class CorePom {
             + "    </dependency>\n"
             + "  </dependencies>\n";
 
-    public static final String ACTIVITI_PLACEHOLDER = "</dependencies>";
+    public static final String FLOWABLE_PLACEHOLDER = "</dependencies>";
 
-    public static final String ACTIVITI_CONTENT_TO_ADD = "    <dependency>\n"
+    public static final String FLOWABLE_CONTENT_TO_ADD = "    <dependency>\n"
             + "      <groupId>org.apache.syncope.core</groupId>\n"
-            + "      <artifactId>syncope-core-workflow-activiti</artifactId>\n"
+            + "      <artifactId>syncope-core-workflow-flowable</artifactId>\n"
             + "    </dependency>\n"
             + "  </dependencies>\n";
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
index 8115b2b..b18d2de 100644
--- a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
+++ b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
@@ -55,7 +55,7 @@ public class ArchetypeProcess extends BaseProcess {
         final String proxyPwd = args[16];
         final boolean mavenProxyAutoconf = Boolean.valueOf(args[17]);
         final boolean swagger = Boolean.valueOf(args[18]);
-        final boolean activiti = Boolean.valueOf(args[19]);
+        final boolean flowable = Boolean.valueOf(args[19]);
         final String jwsKey = args[20];
 
         setSyncopeInstallDir(installPath, artifactId);
@@ -124,7 +124,7 @@ public class ArchetypeProcess extends BaseProcess {
         fileSystemUtils.createDirectory(bundlesDirectory);
         fileSystemUtils.createDirectory(modelerDirectory);
 
-        if (activiti) {
+        if (flowable) {
             File pomFile = new File(
                     syncopeInstallDir
                     + File.separator
@@ -134,7 +134,7 @@ public class ArchetypeProcess extends BaseProcess {
             String contentPomFile = fileSystemUtils.readFile(pomFile);
             fileSystemUtils.writeToFile(
                     pomFile,
-                    contentPomFile.replace(CorePom.ACTIVITI_PLACEHOLDER, CorePom.ACTIVITI_CONTENT_TO_ADD));
+                    contentPomFile.replace(CorePom.FLOWABLE_PLACEHOLDER, CorePom.FLOWABLE_CONTENT_TO_ADD));
 
             fileSystemUtils.copyFileFromResources("/workflow.properties",
                     syncopeInstallDir + PROPERTIES.getProperty("workflowPropertiesFile"), handler);
@@ -148,7 +148,7 @@ public class ArchetypeProcess extends BaseProcess {
             contentPomFile = fileSystemUtils.readFile(pomFile);
             fileSystemUtils.writeToFile(
                     pomFile,
-                    contentPomFile.replace(ConsolePom.ACTIVITI_PLACEHOLDER, ConsolePom.ACTIVITI_CONTENT_TO_ADD).
+                    contentPomFile.replace(ConsolePom.FLOWABLE_PLACEHOLDER, ConsolePom.FLOWABLE_CONTENT_TO_ADD).
                             replace(ConsolePom.MODELER_PLACEHOLDER, ConsolePom.MODELER_CONTENT_TO_ADD));
         }
 
@@ -156,7 +156,7 @@ public class ArchetypeProcess extends BaseProcess {
         syncopeProperties.setProperty("conf.directory", confDirectory);
         syncopeProperties.setProperty("log.directory", logsDirectory);
         syncopeProperties.setProperty("bundles.directory", bundlesDirectory);
-        syncopeProperties.setProperty("activiti-modeler.directory", modelerDirectory);
+        syncopeProperties.setProperty("flowable-modeler.directory", modelerDirectory);
         mavenUtils.mvnCleanPackageWithProperties(
                 installPath + File.separator + artifactId, syncopeProperties, customMavenProxySettings);
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
index 63668cf..954c8e7 100644
--- a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
+++ b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
@@ -229,7 +229,7 @@ public final class ContainerProcess extends BaseProcess {
         mvnProperties.setProperty("conf.directory", confDirectory);
         mvnProperties.setProperty("log.directory", logsDirectory);
         mvnProperties.setProperty("bundles.directory", bundlesDirectory);
-        mvnProperties.setProperty("activiti-modeler.directory", modelerDirectory);
+        mvnProperties.setProperty("flowable-modeler.directory", modelerDirectory);
         mavenUtils.mvnCleanPackageWithProperties(
                 installPath + File.separator + artifactId, mvnProperties, customMavenProxySettings);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml b/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
index 9ea24b4..2bbde9b 100644
--- a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
+++ b/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
@@ -45,7 +45,7 @@ under the License.
       <arg>$mvn.proxy.pwd</arg><!-- 16 -->
       <arg>$mvn.proxy.autoconf</arg><!-- 17 -->
       <arg>$options.swagger</arg><!-- 18 -->
-      <arg>$options.activiti.workflow.adapter</arg><!-- 19 -->
+      <arg>$options.flowable.workflow.adapter</arg><!-- 19 -->
       <arg>$mvn.jws.key</arg><!-- 20 -->
     </executeclass>
   </job>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index 45f9042..9b31ad3 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -70,8 +70,8 @@ under the License.
       <value>true</value>
     </condition>
     
-    <condition type="variable" id="options.choice.activiti">
-      <name>options.activiti.workflow.adapter</name>
+    <condition type="variable" id="options.choice.flowable">
+      <name>options.flowable.workflow.adapter</name>
       <value>true</value>
     </condition>
     

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/resources/izpack/userInputLang.xml_eng
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/userInputLang.xml_eng b/installer/src/main/resources/izpack/userInputLang.xml_eng
index 59b543d..2bf1e2c 100644
--- a/installer/src/main/resources/izpack/userInputLang.xml_eng
+++ b/installer/src/main/resources/izpack/userInputLang.xml_eng
@@ -32,7 +32,7 @@ under the License.
   <str id="archetype.mvn.conf.directory" txt="Conf directory name:"/>
   <str id="archetype.mvn.log.directory" txt="Log directory name:"/>
   <str id="archetype.mvn.bundle.directory" txt="Bundle directory name:"/>
-  <str id="archetype.mvn.modeler.directory" txt="Activity modeler directory name:"/>
+  <str id="archetype.mvn.modeler.directory" txt="Flowable modeler directory name:"/>
   <str id="mvn.syncope.version.id" txt="Syncope Version:"/>
   <str id="mvn.syncope.admin.password.id" txt="Admin Password:"/>
   <str id="mvn.proxy.id" txt="Use Proxy Server:"/>
@@ -44,7 +44,7 @@ under the License.
   <str id="mvn.proxy.pwd.id" txt="Proxy Password (if required):"/>
   
   <str id="options.swagger.id" txt="Swagger"/>
-  <str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/>
+  <str id="options.flowable.workflow.adapter.id" txt="Flowable workflow adapter"/>
   
   <str id="persistence.jdbc.url" txt="Database JDBC url:"/>
   <str id="persistence.db.user" txt="Username:"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/resources/izpack/userInputLang.xml_ita
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/userInputLang.xml_ita b/installer/src/main/resources/izpack/userInputLang.xml_ita
index f719ffc..1cbad84 100644
--- a/installer/src/main/resources/izpack/userInputLang.xml_ita
+++ b/installer/src/main/resources/izpack/userInputLang.xml_ita
@@ -32,7 +32,7 @@ under the License.
   <str id="archetype.mvn.conf.directory" txt="Conf directory name:"/>
   <str id="archetype.mvn.log.directory" txt="Log directory name:"/>
   <str id="archetype.mvn.bundle.directory" txt="Bundle directory name:"/>
-  <str id="archetype.mvn.modeler.directory" txt="Activity modeler directory name:"/>
+  <str id="archetype.mvn.modeler.directory" txt="Flowable modeler directory name:"/>
   <str id="mvn.syncope.version.id" txt="Syncope Version:"/>
   <str id="mvn.syncope.admin.password.id" txt="Admin Password:"/>
   <str id="mvn.proxy.id" txt="Usa un Server Proxy:"/>
@@ -44,7 +44,7 @@ under the License.
   <str id="mvn.proxy.pwd.id" txt="Proxy Password (se richiesta):"/>
   
   <str id="options.swagger.id" txt="Swagger"/>
-  <str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/>
+  <str id="options.flowable.workflow.adapter.id" txt="Flowable workflow adapter"/>
   
   <str id="persistence.jdbc.url" txt="Database JDBC url:"/>
   <str id="persistence.db.user" txt="Username:"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/installer/src/main/resources/izpack/userInputSpec.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/userInputSpec.xml b/installer/src/main/resources/izpack/userInputSpec.xml
index 51a4b42..b55cb5b 100644
--- a/installer/src/main/resources/izpack/userInputSpec.xml
+++ b/installer/src/main/resources/izpack/userInputSpec.xml
@@ -118,11 +118,11 @@ under the License.
     <field type="check" variable="options.swagger">
       <spec id="options.swagger.id" true="true" false="false" set="false"/>
     </field>
-    <field type="check" variable="options.activiti.workflow.adapter">
-      <spec id="options.activiti.workflow.adapter.id" true="true" false="false" set="true"/>
+    <field type="check" variable="options.flowable.workflow.adapter">
+      <spec id="options.flowable.workflow.adapter.id" true="true" false="false" set="true"/>
     </field>
     <field type="space"/>
-    <field type="dir" variable="mvn.modeler.directory" conditionid="options.choice.activiti">
+    <field type="dir" variable="mvn.modeler.directory" conditionid="options.choice.flowable">
       <spec id="archetype.mvn.modeler.directory" size="20" set="/var/tmp/syncope/modeler" mustExist="false" create="true"/>
     </field>
   </panel>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 57e38c9..9663766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@ under the License.
 
     <groovy.version>2.4.12</groovy.version>
 
-    <activiti.version>5.22.0</activiti.version>
+    <flowable.version>5.23.0</flowable.version>
 
     <camel.version>2.19.2</camel.version>	
 
@@ -412,7 +412,7 @@ under the License.
     <bundles.directory>${project.build.directory}/bundles</bundles.directory>
     <connid.location>file:${bundles.directory}/</connid.location>
     <log.directory>${project.build.directory}/log</log.directory>
-    <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
+    <flowable-modeler.directory>${project.build.directory}/flowable-modeler</flowable-modeler.directory>    
 
     <swagger-core.version>1.5.16</swagger-core.version>    
     <swagger-ui.version>2.2.10</swagger-ui.version>
@@ -1057,12 +1057,11 @@ under the License.
         <version>1.9.1</version>
       </dependency>
 
-      <!-- Activiti -->
+      <!-- Flowable -->
       <dependency>
-        <groupId>org.activiti</groupId>
-        <artifactId>activiti-engine</artifactId>
-        <version>${activiti.version}</version>
-        <!-- Using geronimo-* for this -->
+        <groupId>org.flowable</groupId>
+        <artifactId>flowable-engine</artifactId>
+        <version>${flowable.version}</version>
         <exclusions>
           <exclusion>
             <groupId>javax.activation</groupId>
@@ -1079,9 +1078,9 @@ under the License.
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.activiti</groupId>
-        <artifactId>activiti-spring</artifactId>
-        <version>${activiti.version}</version>
+        <groupId>org.flowable</groupId>
+        <artifactId>flowable-spring</artifactId>
+        <version>${flowable.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-dbcp</groupId>
@@ -1094,17 +1093,17 @@ under the License.
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.activiti</groupId>
-        <artifactId>activiti-json-converter</artifactId>
-        <version>${activiti.version}</version>
+        <groupId>org.flowable</groupId>
+        <artifactId>flowable-json-converter</artifactId>
+        <version>${flowable.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.activiti</groupId>
-        <artifactId>activiti-webapp-explorer2</artifactId>
-        <version>${activiti.version}</version>
+        <groupId>org.flowable</groupId>
+        <artifactId>flowable-webapp-explorer2</artifactId>
+        <version>${flowable.version}</version>
         <type>war</type>
       </dependency>
-      <!-- /Activiti -->
+      <!-- /Flowable -->
 
       <!-- Wicket -->
       <dependency>
@@ -2172,7 +2171,7 @@ under the License.
             <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
             <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
             <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
-            <link>http://activiti.org/javadocs/</link>
+            <link>http://www.flowable.org/docs/javadocs/</link>
             <link>http://www.flowable.org/docs/javadocs/</link>
             <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
             <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/getting-started/introduction.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/introduction.adoc b/src/main/asciidoc/getting-started/introduction.adoc
index a9f3c66..d9fe3d1 100644
--- a/src/main/asciidoc/getting-started/introduction.adoc
+++ b/src/main/asciidoc/getting-started/introduction.adoc
@@ -116,9 +116,8 @@ point for defining and enforcing the consistency and transformations between int
 all-Java implementation can be extended for this purpose. In addition, an http://camel.apache.org/[Apache Camel^]-based 
 implementation is also available as an extension, which brings all the power of runtime changes and adaptation.
  * *_Workflow_*  is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred engine
-from a provided list - including one based on http://www.activiti.org/[Activiti BPM^] and another based on
-http://www.flowable.org/[Flowable^], the reference open source http://www.bpmn.org/[BPMN 2.0^] implementations - or
-define new, custom ones. 
+from a provided list - including one based on http://www.flowable.org/[Flowable^], the reference open source
+http://www.bpmn.org/[BPMN 2.0^] implementations - or define new, custom ones. 
  * *_Persistence_* manages all data (users, groups, attributes, resources, ...) at a high level 
 using a standard https://en.wikipedia.org/wiki/Java_Persistence_API[JPA 2.0^] approach. The data is persisted to an underlying 
 database, referred to as *_Internal Storage_*. Consistency is ensured via the comprehensive

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/architecture/core.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/architecture/core.adoc b/src/main/asciidoc/reference-guide/architecture/core.adoc
index 5767d93..0da554a 100644
--- a/src/main/asciidoc/reference-guide/architecture/core.adoc
+++ b/src/main/asciidoc/reference-guide/architecture/core.adoc
@@ -73,14 +73,14 @@ In addition, an http://camel.apache.org/[Apache Camel^]-based implementation is
 
 The Workflow layer is responsible for managing the internal lifecycle of Users, Groups and Any Objects.
 
-Besides the default engine, another engine is available based on http://www.activiti.org/[Activiti BPM^], the 
+Besides the default engine, another engine is available based on http://www.flowable.org/[Flowable^], the 
 reference open source http://www.bpmn.org/[BPMN 2.0^] implementation. It enables advanced features such
 as approval management and new statuses definitions. An optional web-based GUI editor is also available.
 
 [.text-center]
-image::userWorkflow.png[title="Default Activiti user workflow",alt="Default Activiti user workflow"] 
+image::userWorkflow.png[title="Default Flowable user workflow",alt="Default Flowable user workflow"] 
 
-Besides Activiti, new workflow engines - possibly integrating with third-party tools as 
+Besides Flowable, new workflow engines - possibly integrating with third-party tools as 
 https://camunda.org/[Camunda^] or http://jbpm.jboss.org/[jBPM^], can be written and plugged into specific deployments.
 
 ==== Persistence

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/concepts/notifications.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/notifications.adoc b/src/main/asciidoc/reference-guide/concepts/notifications.adoc
index 149f590..d1c69ae 100644
--- a/src/main/asciidoc/reference-guide/concepts/notifications.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/notifications.adoc
@@ -95,7 +95,7 @@ successful execution of the event identified by the `unexpected identification`
 [NOTE]
 ====
 Custom events can be used to trigger notifications from non-predefined joint points, as BPMN `userTask`
-instances within the <<activiti-user-workflow-adapter>>, <<propagationactions>>, <<pushactions>>, <<pullactions>> or
+instances within the <<flowable-user-workflow-adapter>>, <<propagationactions>>, <<pushactions>>, <<pullactions>> or
 other custom code.
 ====
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/concepts/tasks.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/tasks.adoc b/src/main/asciidoc/reference-guide/concepts/tasks.adoc
index 070090b..3cc4f80 100644
--- a/src/main/asciidoc/reference-guide/concepts/tasks.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/tasks.adoc
@@ -194,7 +194,7 @@ Custom tasks are ideal for implementing periodic checks or clean-up operations,
 components; some examples:
 
 * move users from "pending delete" to "deleted" status 15 days after they reached the "pending delete" status (requires
-interaction with <<activiti-user-workflow-adapter>>)
+interaction with <<flowable-user-workflow-adapter>>)
 * send out notification e-mails to users whose password is about to expire on an Identity Store
 * disable all users not logging into the system for the past 6 months
 ====

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/concepts/workflow.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/workflow.adoc b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
index d1e98c2..9792343 100644
--- a/src/main/asciidoc/reference-guide/concepts/workflow.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
@@ -75,49 +75,49 @@ Custom adapters can be provided by implementing the related interfaces, also as
 https://camunda.org/[Camunda^] or http://jbpm.jboss.org/[jBPM^].
 ====
 
-==== Activiti User Workflow Adapter
+==== Flowable User Workflow Adapter
 
-An advanced adapter is provided for Users, based on http://www.activiti.org/[Activiti BPM^], one of reference open
+An advanced adapter is provided for Users, based on http://www.flowable.org/[Flowable^], one of reference open
 source http://www.bpmn.org/[BPMN 2.0^] implementations.
 
 The
 ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java[ActivitiUserWorkflowAdapter^]
+https://github.com/apache/syncope/blob/syncope-{docVersion}/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java[FlowableUserWorkflowAdapter^]
 endif::[]
 ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/blob/master/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java[ActivitiUserWorkflowAdapter^]
+https://github.com/apache/syncope/blob/master/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java[FlowableUserWorkflowAdapter^]
 endif::[]
 is bootstrapped from
 ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml[userWorkflow.bpmn20.xml^]
+https://github.com/apache/syncope/blob/syncope-{docVersion}/core/workflow-flowable/src/main/resources/userWorkflow.bpmn20.xml[userWorkflow.bpmn20.xml^]
 endif::[]
 ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/blob/master/core/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml[userWorkflow.bpmn20.xml^]
+https://github.com/apache/syncope/blob/master/core/workflow-flowable/src/main/resources/userWorkflow.bpmn20.xml[userWorkflow.bpmn20.xml^]
 endif::[]
 and presents several advantages and more features, if compared to the default user adapter:
 
 . Besides mandatory statuses, which are modeled as BPMN `userTask` instances, more can be freely added
 at runtime, provided that adequate transitions and conditions are also inserted; more details about available BPMN
-constructs are available in the http://www.activiti.org/userguide/index.html#bpmnConstructs[Activiti User Guide^]. +
+constructs are available in the http://www.flowable.org/docs/userguide/index.html#bpmnConstructs[Flowable User Guide^]. +
 Additional statuses and transitions allow the internal processes of Apache Syncope to better adapt to suit organizational flows.
 . Custom logic can be injected into the workflow process by providing BPMN `serviceTask` instances.
-. http://www.activiti.org/userguide/index.html#forms[Activiti forms^] are used for implementing <<approval,approval>>.
-. The http://www.activiti.org/userguide/index.html#activitiModeler[Activiti Modeler^] can be enabled in the
+. http://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^] are used for implementing <<approval,approval>>.
+. The http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^] can be enabled in the
 <<admin-console,admin console>>, thus allowing web-based graphical modeling of the workflow definition.
 
 [.text-center]
-image::userWorkflow.png[title="Default Activiti user workflow",alt="Default Activiti user workflow"] 
+image::userWorkflow.png[title="Default Flowable user workflow",alt="Default Flowable user workflow"] 
 
 ===== Approval
 
-Every transition in the Activiti user workflow definition can be subjected to approval.
+Every transition in the Flowable user workflow definition can be subjected to approval.
 
 The underlying idea is that some kind of self-modifications (group memberships, external resource assignments, ...)
 might not be allowed to 'plain' Users, as there could be conditions which require management approval.
 Managers could also be asked to complete the information provided before the requested operation is finished.
 
 In order to define an approval form, a dedicated BPMN `userTask` needs to be defined, following the rules established
-for http://www.activiti.org/userguide/index.html#forms[Activiti forms^].
+for http://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^].
 
 [NOTE]
 .What is required for administrators to manage approval?
@@ -132,7 +132,7 @@ The following conditions must be met, for an User `U` to act as administrator fo
 .. `USER_READ`
 . The BPMN `userTask` must either indicate `U` among `candidateUsers` or at least one of the groups assigned to `U`
 among `candidateGroups`, as required by
-http://www.activiti.org/userguide/index.html#bpmnUserTaskUserAssignmentExtension[Activiti's task assignment rules^]
+http://www.flowable.org/docs/userguide/index.html#bpmnUserTaskUserAssignmentExtension[Flowable's task assignment rules^]
 
 The special super-user `admin` is entitled to manage all approvals, even those not specifying any
 `candidateUsers` or `candidateGroups`.
@@ -142,18 +142,18 @@ The special super-user `admin` is entitled to manage all approvals, even those n
 .Approving self-registration
 ====
 The snippet below shows how to define an approval form in XML; the same operation can be performed via the
-http://www.activiti.org/userguide/index.html#activitiModeler[Activiti Modeler^].
+http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^].
 
 [source,xml]
 ----
 <userTask id="createApproval" name="Create approval"
-          activiti:candidateGroups="managingDirector" activiti:formKey="createApproval"> // <1>
+          flowable:candidateGroups="managingDirector" flowable:formKey="createApproval"> // <1>
   <extensionElements>
-    <activiti:formProperty id="username" name="Username" type="string"
+    <flowable:formProperty id="username" name="Username" type="string"
                            expression="${user.username}" writable="false"/> // <2>
-    <activiti:formProperty id="approve" name="Approve?" type="boolean"
+    <flowable:formProperty id="approve" name="Approve?" type="boolean"
                            variable="approve" required="true"/> // <3>
-    <activiti:formProperty id="rejectReason" name="Reason for rejecting" type="string"
+    <flowable:formProperty id="rejectReason" name="Reason for rejecting" type="string"
                            variable="rejectReason"/>
   </extensionElements>
 </userTask>
@@ -215,8 +215,8 @@ The delegated administrator for approving recertifications can be configured by
 [source,xml]
 ----
 <userTask id="recertificationRequest" name="Recertification Request"
-          activiti:formKey="recertify"
-          activiti:candidateGroups="managingDirector">
+          flowable:formKey="recertify"
+          flowable:candidateGroups="managingDirector">
 ----
 ====
 
@@ -225,15 +225,7 @@ The delegated administrator for approving recertifications can be configured by
 [source,xml]
 ----
 <userTask id="recertificationRequest" name="Recertification Request"
-          activiti:formKey="recertify"
-          activiti:candidateUser="${user.lastRecertificator}">
+          flowable:formKey="recertify"
+          flowable:candidateUser="${user.lastRecertificator}">
 ----
 ====
-
-==== Flowable User Workflow Adapter
-
-Starting with Apache Syncope 2.0.3, another advanced adapter is provided for Users, based on
-http://www.flowable.org/[Flowable^], one of reference open source http://www.bpmn.org/[BPMN 2.0^] implementations.
-
-Since Flowable was http://www.flowable.org/blog/2016/10/12/flowable-and-activiti.html[forked from Activiti BPM^],
-everything stated <<activiti-user-workflow-adapter,above>> about Activiti BPM can be applied.

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index 07c4384..b7c9b57 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -271,7 +271,7 @@ Please also note that the actual list of Spring context files to include might d
 ====
 
 [discrete]
-===== Select the <<activiti-user-workflow-adapter>>
+===== Select the <<flowable-user-workflow-adapter>>
 
 Add the following dependency to `core/pom.xml`:
 
@@ -279,7 +279,7 @@ Add the following dependency to `core/pom.xml`:
 ----
 <dependency>
   <groupId>org.apache.syncope.core</groupId>
-  <artifactId>syncope-core-workflow-activiti</artifactId>
+  <artifactId>syncope-core-workflow-flowable</artifactId>
   <version>${syncope.version}</version>
 </dependency>
 ----

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/activitimodeler.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/activitimodeler.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/activitimodeler.adoc
deleted file mode 100644
index 6ff9696..0000000
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/activitimodeler.adoc
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-==== Enable the Activiti Modeler
-
-Due to licensing issues - see
-https://issues.apache.org/jira/browse/SYNCOPE-439?focusedCommentId=13829896&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13829896[this comment^]
-for more information - it is not possible to embed the
-http://www.activiti.org/components.html#modeler[Activiti Modeler^], which provides a powerful graphical web editing
-interface for Activiti BPM, into any Apache Syncope artifact; thus, some manual steps are required to enable it on a
-working Apache Syncope deployment, for use with the admin console.
-
-[WARNING]
-This procedure requires Apache Maven since it is using a fake project to perform all of the required setup tasks.
-
-First of all, generate a new Maven project as described in the
-ifeval::["{backend}" == "html5"]
-http://syncope.apache.org/docs/getting-started.html[Apache Syncope Getting Started Guide,]
-endif::[]
-ifeval::["{backend}" == "pdf"]
-http://syncope.apache.org/docs/getting-started.pdf[Apache Syncope Getting Started Guide,]
-endif::[]
-then build via
-
-....
-mvn -P all clean install
-....
-
-At this point, copy the `console/target/activiti-modeler/` directory in the desired location of the host where the
-admin console is deployed, then set the value of `activitiModelerDirectory` with this path in the `console.properties`
-file.

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/flowablemodeler.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/flowablemodeler.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/flowablemodeler.adoc
new file mode 100644
index 0000000..f7ff238
--- /dev/null
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/flowablemodeler.adoc
@@ -0,0 +1,46 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+==== Enable the Flowable Modeler
+
+Due to licensing issues - see
+https://issues.apache.org/jira/browse/SYNCOPE-439?focusedCommentId=13829896&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13829896[this comment^]
+for more information - it is not possible to embed the
+http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^], which provides a powerful
+graphical web editing interface for Flowable, into any Apache Syncope artifact; thus, some manual steps are required to enable it on a
+working Apache Syncope deployment, for use with the Admin Console.
+
+[WARNING]
+This procedure requires Apache Maven since it is using a fake project to perform all of the required setup tasks.
+
+First of all, generate a new Maven project as described in the
+ifeval::["{backend}" == "html5"]
+http://syncope.apache.org/docs/getting-started.html[Apache Syncope Getting Started Guide,]
+endif::[]
+ifeval::["{backend}" == "pdf"]
+http://syncope.apache.org/docs/getting-started.pdf[Apache Syncope Getting Started Guide,]
+endif::[]
+then build via
+
+....
+mvn -P all clean install
+....
+
+At this point, copy the `console/target/flowable-modeler/` directory in the desired location of the host where the
+admin console is deployed, then set the value of `flowableModelerDirectory` with this path in the `console.properties`
+file.

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/systemadministration.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/systemadministration.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/systemadministration.adoc
index 2c12884..64d817e 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/systemadministration.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/systemadministration.adoc
@@ -66,7 +66,7 @@ include::configureconnidlocations.adoc[]
 
 include::importexport.adoc[]
 
-include::activitimodeler.adoc[]
+include::flowablemodeler.adoc[]
 
 include::connectorbundles.adoc[]
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/site/xdoc/architecture.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/architecture.xml b/src/site/xdoc/architecture.xml
index 48bf196..97ed7a7 100644
--- a/src/site/xdoc/architecture.xml
+++ b/src/site/xdoc/architecture.xml
@@ -93,7 +93,7 @@ under the License.
               <em>Workflow</em>
             </strong> is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred 
             engine from a provided list - including the one based on 
-            <a target="_blank" href="http://www.activiti.org/">Activiti BPM</a>, the reference open source
+            <a target="_blank" href="http://www.flowable.org/">Flowable BPM</a>, the reference open source
             <a target="_blank" href="http://www.bpmn.org/">BPMN 2.0</a> implementation - or define new, custom ones.
           </p>
         </li>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index 91da18b..2c63fcd 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -99,7 +99,7 @@ under the License.
         in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>
         but console) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
         <source>$ mvn -Pdebug,all</source>
-        or, without Activiti and Camel support
+        or, without Flowable and Camel support
         <source>$ mvn -Pdebug</source>
 
         <p>
@@ -113,7 +113,7 @@ under the License.
         As with Debug, but with <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a> features enabled.
         <source>$ export REBEL_HOME=/opt/jrebel
 $ mvn -Pjrebel,all</source>
-        or, without Activiti and Camel support
+        or, without Flowable and Camel support
         <source>$ export REBEL_HOME=/opt/jrebel
 $ mvn -Pjrebel</source>
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index ff7aad2..5c692a2 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -1057,7 +1057,7 @@ This is licensed under the CDDL 1.0, see above.
 
 ==
 
-For Activiti BPM Platform (http://www.activiti.org/):
+For Flowable (http://www.flowable.org/):
 This is licensed under the AL 2.0, see above.
 
 ==

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 30d9b93..9c0c916 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -192,7 +192,7 @@ Copyright 2011-2016 Tirasa S.r.l. All rights reserved.
 
 ==
 
-This product includes software developed by the Activiti BPM Platform project.
+This product includes software developed by the Flowable project.
 
 ==
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/7098ca9f/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index e045bf1..5c60662 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -78,7 +78,7 @@ under the License.
   <build>
 
     <plugins>
-      <!-- Adds Activiti test content -->
+      <!-- Adds Flowable test content -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xml-maven-plugin</artifactId>
@@ -99,7 +99,7 @@ under the License.
                 <include>domains/MasterContent.xml</include>
               </includes>
               <outputDir>${project.build.directory}/classes/core</outputDir>
-              <stylesheet>${basedir}/../fit/core-reference/src/test/resources/addActivitiToContent.xsl</stylesheet>
+              <stylesheet>${basedir}/../fit/core-reference/src/test/resources/addFlowableToContent.xsl</stylesheet>
               <outputProperties>
                 <outputProperty>
                   <name>indent</name>


Mime
View raw message