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 2018/04/05 15:25:09 UTC
[1/2] syncope git commit: Upgrading Spring and Spring Security
Repository: syncope
Updated Branches:
refs/heads/master 51c60a7a1 -> 0418b4578
Upgrading Spring and Spring Security
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0418b457
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0418b457
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0418b457
Branch: refs/heads/master
Commit: 0418b4578388227f92d2e86a9c50b4a267d53465
Parents: a227c9e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Apr 5 17:24:50 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Apr 5 17:24:57 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0418b457/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b98c6b9..55c38f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,8 +370,8 @@ under the License.
<jackson.version>2.9.5</jackson.version>
- <spring.version>5.0.4.RELEASE</spring.version>
- <spring-security.version>5.0.3.RELEASE</spring-security.version>
+ <spring.version>5.0.5.RELEASE</spring.version>
+ <spring-security.version>5.0.4.RELEASE</spring-security.version>
<openjpa.version>3.0.0-SNAPSHOT</openjpa.version>
<hikaricp.version>3.0.0</hikaricp.version>
[2/2] syncope git commit: Upgrading to Flowable 6.3.0 (and its new
Modeler)
Posted by il...@apache.org.
Upgrading to Flowable 6.3.0 (and its new Modeler)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a227c9ea
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a227c9ea
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a227c9ea
Branch: refs/heads/master
Commit: a227c9ea61d8c3f549133e8ee5719bb080d529ce
Parents: 51c60a7
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Apr 5 16:54:15 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Apr 5 17:24:57 2018 +0200
----------------------------------------------------------------------
archetype/pom.xml | 1 +
.../archetype-resources/console/pom.xml | 31 +++-
fit/console-reference/pom.xml | 31 +++-
.../src/main/resources/app-cfg.js | 36 ++--
.../src/main/resources/toolbar.js | 181 +++++++++++++++++++
.../src/main/resources/url-config.js | 50 +++--
.../syncope/installer/files/ConsolePom.java | 42 ++++-
pom.xml | 2 +-
8 files changed, 314 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 87fe06f..c4639be 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -240,6 +240,7 @@ under the License.
<include>save-model.html</include>
<include>app-cfg.js</include>
<include>url-config.js</include>
+ <include>toolbar.js</include>
</includes>
</resource>
<resource>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/archetype/src/main/resources/archetype-resources/console/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml
index da2018f..401387e 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -167,7 +167,12 @@ under the License.
<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}"/>
+ 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}">
@@ -176,19 +181,41 @@ under the License.
</patternset>
</unzip>
+ <move todir="${flowable-modeler.directory}">
+ <fileset dir="${flowable-modeler.directory}/WEB-INF/classes/static/">
+ <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();"/>
-
+
<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"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index bbd431d..c13b264 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -151,7 +151,12 @@ under the License.
<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}"/>
+ 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}">
@@ -160,19 +165,41 @@ under the License.
</patternset>
</unzip>
+ <move todir="${flowable-modeler.directory}">
+ <fileset dir="${flowable-modeler.directory}/WEB-INF/classes/static/">
+ <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();"/>
-
+
<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"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/src/main/resources/app-cfg.js
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/app-cfg.js b/fit/console-reference/src/main/resources/app-cfg.js
index 4c73c9c..15ec23a 100644
--- a/fit/console-reference/src/main/resources/app-cfg.js
+++ b/fit/console-reference/src/main/resources/app-cfg.js
@@ -1,20 +1,16 @@
-/*
- * 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
+/* Copyright 2005-2015 Alfresco Software, Ltd.
*
- * 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.
+ * Licensed 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.
*/
'use strict';
@@ -22,8 +18,8 @@
var FLOWABLE = FLOWABLE || {};
FLOWABLE.CONFIG = {
- 'onPremise': true,
- 'contextRoot': window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler')) + '/flowable-modeler',
- 'webContextRoot': window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler') + '/flowable-modeler'),
- 'datesLocalization': false
+ 'onPremise' : true,
+ 'contextRoot': window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler')) + '/flowable-modeler',
+ 'webContextRoot': window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler') + '/flowable-modeler'),
+ 'datesLocalization' : false
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/src/main/resources/toolbar.js
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/toolbar.js b/fit/console-reference/src/main/resources/toolbar.js
new file mode 100644
index 0000000..920718c
--- /dev/null
+++ b/fit/console-reference/src/main/resources/toolbar.js
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ */
+'use strict';
+
+var FLOWABLE = FLOWABLE || {};
+FLOWABLE.TOOLBAR_CONFIG = {
+ "items" : [
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.SAVE",
+ "cssClass" : "editor-icon editor-icon-save",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.saveModel"
+ },
+ {
+ "type" : "separator",
+ "title" : "",
+ "cssClass" : "toolbar-separator"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.CUT",
+ "cssClass" : "editor-icon editor-icon-cut",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.cut",
+ "enabled" : false,
+ "enabledAction" : "element"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.COPY",
+ "cssClass" : "editor-icon editor-icon-copy",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.copy",
+ "enabled" : false,
+ "enabledAction" : "element"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.PASTE",
+ "cssClass" : "editor-icon editor-icon-paste",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.paste",
+ "enabled" : false
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.DELETE",
+ "cssClass" : "editor-icon editor-icon-delete",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.deleteItem",
+ "enabled" : false,
+ "enabledAction" : "element"
+ },
+ {
+ "type" : "separator",
+ "title" : "TOOLBAR.ACTION.SAVE",
+ "cssClass" : "toolbar-separator"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.REDO",
+ "cssClass" : "editor-icon editor-icon-redo",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.redo",
+ "enabled" : false
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.UNDO",
+ "cssClass" : "editor-icon editor-icon-undo",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.undo",
+ "enabled" : false
+ },
+ {
+ "type" : "separator",
+ "title" : "TOOLBAR.ACTION.SAVE",
+ "cssClass" : "toolbar-separator"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ALIGNVERTICAL",
+ "cssClass" : "editor-icon editor-icon-align-vertical",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.alignVertical",
+ "enabled" : false,
+ "enabledAction" : "element",
+ "disableInForm" : true,
+ "minSelectionCount" : 2
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ALIGNHORIZONTAL",
+ "cssClass" : "editor-icon editor-icon-align-horizontal",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.alignHorizontal",
+ "enabledAction" : "element",
+ "enabled" : false,
+ "disableInForm" : true,
+ "minSelectionCount" : 2
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.SAMESIZE",
+ "cssClass" : "editor-icon editor-icon-same-size",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.sameSize",
+ "enabledAction" : "element",
+ "enabled" : false,
+ "disableInForm" : true,
+ "minSelectionCount" : 2
+ },
+ {
+ "type" : "separator",
+ "title" : "TOOLBAR.ACTION.SAVE",
+ "cssClass" : "toolbar-separator",
+ "disableInForm" : true
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ZOOMIN",
+ "cssClass" : "editor-icon editor-icon-zoom-in",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.zoomIn"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ZOOMOUT",
+ "cssClass" : "editor-icon editor-icon-zoom-out",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.zoomOut"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ZOOMACTUAL",
+ "cssClass" : "editor-icon editor-icon-zoom-actual",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.zoomActual"
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.ZOOMFIT",
+ "cssClass" : "editor-icon editor-icon-zoom-fit",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.zoomFit"
+ },
+ {
+ "type" : "separator",
+ "title" : "TOOLBAR.ACTION.SAVE",
+ "cssClass" : "toolbar-separator",
+ "disableInForm" : true
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.BENDPOINT.ADD",
+ "cssClass" : "editor-icon editor-icon-bendpoint-add",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.addBendPoint",
+ "id" : "add-bendpoint-button",
+ "disableInForm" : true
+ },
+ {
+ "type" : "button",
+ "title" : "TOOLBAR.ACTION.BENDPOINT.REMOVE",
+ "cssClass" : "editor-icon editor-icon-bendpoint-remove",
+ "action" : "FLOWABLE.TOOLBAR.ACTIONS.removeBendPoint",
+ "id" : "remove-bendpoint-button",
+ "disableInForm" : true
+ },
+ {
+ "type" : "separator",
+ "title": "",
+ "cssClass" : "toolbar-separator",
+ "disableInForm" : true
+ }
+ ],
+
+ "secondaryItems" : []
+};
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/src/main/resources/url-config.js
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/url-config.js b/fit/console-reference/src/main/resources/url-config.js
index 10d4cd4..6bf8979 100644
--- a/fit/console-reference/src/main/resources/url-config.js
+++ b/fit/console-reference/src/main/resources/url-config.js
@@ -1,41 +1,39 @@
-/*
- * 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
+/* Licensed 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
+ * 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.
+ * 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.
*/
var FLOWABLE = FLOWABLE || {};
FLOWABLE.URL = {
- getModel: function (modelId) {
+ getModel: function(modelId) {
return window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler'))
+ "/workflowDefGET?modelId=" + modelId;
- },
+ },
- getStencilSet: function () {
+ getStencilSet: function() {
return window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler'))
+ "/flowable-modeler/stencilset_bpmn.json";
- },
+ },
+
+ getCmmnStencilSet: function() {
+ return FLOWABLE.CONFIG.contextRoot + '/app/rest/stencil-sets/cmmneditor?version=' + Date.now();
+ },
- putModel: function (modelId) {
+ putModel: function(modelId) {
return window.location.toString().substr(0, window.location.toString().indexOf('/flowable-modeler'))
+ "/workflowDefPUT?modelId=" + modelId;
- },
-
- validateModel: function () {
- return FLOWABLE.CONFIG.contextRoot + '/app/rest/model/validate';
- }
-};
+ },
+
+ validateModel: function(){
+ return FLOWABLE.CONFIG.contextRoot + '/app/rest/model/validate';
+ }
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/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 e93ee36..f5944b0 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
@@ -45,29 +45,53 @@ public final class ConsolePom {
+ " <target>\n"
+ " <unzip src=\"${settings.localRepository}/org/flowable/flowable-ui-modeler-app/"
+ "${flowable.version}/flowable-ui-modeler-app-${flowable.version}.war\" \n"
- + " dest=\"${flowable-modeler.directory}\"/>\n"
+ + " dest=\"${flowable-modeler.directory}\">\n" + " <patternset>\n"
+ + " <include name=\"WEB-INF/classes/static/**\"/>\n"
+ + " <include name=\"WEB-INF/lib/flowable-ui-modeler-logic-${flowable.version}.jar\"/>\n"
+ + " </patternset>\n" + " </unzip>\n" + " \n"
+ " <unzip src=\"${flowable-modeler.directory}/WEB-INF/lib/"
+ "flowable-ui-modeler-logic-${flowable.version}.jar\"\n"
- + " dest=\"${flowable-modeler.directory}\">\n"
- + " <patternset>\n"
- + " <include name=\"stencilset_bpmn.json\"/>\n"
- + " </patternset>\n"
+ + " dest=\"${flowable-modeler.directory}\">\n" + " <patternset>\n"
+ + " <include name=\"stencilset_bpmn.json\"/>\n" + " </patternset>\n"
+ " </unzip>\n" + " \n"
+ + " <move todir=\"${flowable-modeler.directory}\">\n"
+ + " <fileset dir=\"${flowable-modeler.directory}/WEB-INF/classes/static/\">\n"
+ + " <include name=\"**\"/>\n" + " </fileset>\n"
+ + " </move>\n"
+ + " <delete dir=\"${flowable-modeler.directory}/WEB-INF\"/>\n"
+ + " \n"
+ " <replace file=\"${flowable-modeler.directory}/index.html\"\n"
+ " token=\"</head>\"\n"
- + " value=\"<script type="text/javascript">"
- + "window.onunload = refreshParent; function refreshParent() { window.opener.location.reload(); }"
- + "</script></head>\"/>\n"
+ + " value=\"<script type="text/javascript">window.onunload = "
+ + "refreshParent; function refreshParent() { window.opener.location.reload(); }</script></head>"
+ + "\"/>\n"
+ + " <replace file=\"${flowable-modeler.directory}/index.html\"\n"
+ + " token=\" ng-click="backToLanding()"\"\n"
+ + " value=\" disabled="disabled"\"/>\n"
+ + " <replace file=\"${flowable-modeler.directory}/index.html\"\n"
+ + " token=\"<ul class="nav navbar-nav" id="main-nav"\"\n"
+ + " value=\"<ul class="nav navbar-nav" id="main-nav" "
+ + "style="display: none;"\"/>\n"
+ + " <replace file=\"${flowable-modeler.directory}/index.html\"\n"
+ + " token=\"<div class="pull-right\"\n"
+ + " value=\"<div style="display: none;" class="pull-right\"/>\n"
+ + " <replace file=\"${flowable-modeler.directory}/editor-app/editor.html\"\n"
+ + " token=\"<div class="btn-group pull-right"\"\n"
+ + " value=\"<div style="display: none;" class="btn-group "
+ + "pull-right"\"/>\n"
+ " <replace file=\"${flowable-modeler.directory}/editor-app/configuration/"
+ "toolbar-default-actions.js\"\n"
+ " token=\"$location.path('/processes');\"\n"
- + " value=\"window.close();\"/>\n" + "\n"
+ + " value=\"window.close();\"/>\n" + " \n"
+ " <copy file=\"${basedir}/src/main/resources/app-cfg.js\" \n"
+ " todir=\"${flowable-modeler.directory}/scripts\"\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/toolbar.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\"/>"
http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c6901d..b98c6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,7 +385,7 @@ under the License.
<groovy.version>3.0.0-alpha-1</groovy.version>
- <flowable.version>6.2.1</flowable.version>
+ <flowable.version>6.3.0</flowable.version>
<camel.version>2.21.0</camel.version>