syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/2] syncope git commit: Other small fixes
Date Thu, 13 Apr 2017 11:47:36 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 911eeda8e -> 9b87a2e2e
  refs/heads/master dfcec0dae -> ed3d3c572


Other small fixes


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9b87a2e2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9b87a2e2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9b87a2e2

Branch: refs/heads/2_0_X
Commit: 9b87a2e2e9f87a148cd37d30710d9e5b622d57ba
Parents: 911eeda
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Apr 13 13:47:21 2017 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Apr 13 13:47:21 2017 +0200

----------------------------------------------------------------------
 .../resources/archetype-resources/console/pom.xml |  3 ---
 .../resources/archetype-resources/enduser/pom.xml |  6 +++---
 .../resources/AbstractWorkflowResource.java       |  2 +-
 fit/console-reference/pom.xml                     | 18 +++++++++++++-----
 .../src/main/resources/url-config.js              |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/9b87a2e2/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 81fc817..465f61c 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -187,9 +187,6 @@ ORYX.CONFIG.ROOT_PATH = BASE_PATH + &quot;/activiti-modeler/editor-app/editor/&q
                     <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
                              token="ORYX.Editor.createByUrl(modelUrl);"
                              value="modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot;
+ modelId; ORYX.Editor.createByUrl(modelUrl);" />
-                    <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
-                             token="ORYX.Editor.createByUrl = function(modelUrl){"
-                             value="modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot;
+ modelId; ORYX.Editor.createByUrl = function(modelUrl){" />               
                     <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js"
                              token="window.location.href = &quot;./&quot;;"
                              value="window.close();"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/9b87a2e2/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 4a4edab..35d7aa7 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -247,9 +247,9 @@ under the License.
                           todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"

                           overwrite="true"/>
                     
-                    <copy file="${project.build.directory}/test-classes/customForm" 
-                                todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"

-                                overwrite="true"/>
+                    <copy file="${project.build.directory}/test-classes/customForm..json"

+                          todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"

+                          overwrite="true"/>
                   </target>
                 </configuration>
                 <goals>

http://git-wip-us.apache.org/repos/asf/syncope/blob/9b87a2e2/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
index 53bc669..2998644 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
@@ -40,7 +40,7 @@ abstract class AbstractWorkflowResource extends AbstractResource {
         final StringValue modelId =
                 attributes.getRequest().getQueryParameters().getParameterValue(Constants.MODEL_ID_PARAM);
 
-        WorkflowDefinitionTO workflowDefinition = modelId == null ? null
+        WorkflowDefinitionTO workflowDefinition = modelId == null || modelId.isNull() ? null
                 : IterableUtils.find(restClient.getDefinitions(), new Predicate<WorkflowDefinitionTO>()
{
 
                     @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/9b87a2e2/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index ec549e6..b5ae489 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -155,11 +155,19 @@ under the License.
                 <copy todir="${activiti-modeler.directory}/editor-app">
                   <fileset dir="${project.build.directory}/activiti-webapp-explorer2/editor-app"
/>                  
                 </copy>
-                <replaceregexp file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
match="ORYX.CONFIG.ROOT_PATH =.*&quot;editor/&quot;; //TODO: Remove last slash!!"
replace="BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket'));
ORYX.CONFIG.ROOT_PATH = BASE_PATH + &quot;/activiti-modeler/editor-app/editor/&quot;;"
byline="true" />
-                <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
token="new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now(),
{" value="new Ajax.Request(window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler'))
+ &quot;/activiti-modeler/stencilset.json&quot;, {" />
-                <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
token="ORYX.Editor.createByUrl(modelUrl);" value="modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot;
+ modelId; ORYX.Editor.createByUrl(modelUrl);" />
-                <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
token="ORYX.Editor.createByUrl = function(modelUrl){" value="modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot;
+ modelId; ORYX.Editor.createByUrl = function(modelUrl){" />                
-                <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js"
token="window.location.href = &quot;./&quot;;" value="window.close();" />
+                <replaceregexp file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
+                               match="ORYX.CONFIG.ROOT_PATH =.*&quot;editor/&quot;;
//TODO: Remove last slash!!"
+                               replace="BASE_PATH = window.location.toString().substr(0,
window.location.toString().indexOf('/wicket')); ORYX.CONFIG.ROOT_PATH = BASE_PATH + &quot;/activiti-modeler/editor-app/editor/&quot;;"
+                               byline="true" />
+                <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
+                         token="new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version='
+ Date.now(), {"
+                         value="new Ajax.Request(window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler'))
+ &quot;/activiti-modeler/stencilset.json&quot;, {" />
+                <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js"
+                         token="ORYX.Editor.createByUrl = function(modelUrl){"
+                         value="modelUrl = BASE_PATH + &quot;/workflowDefGET?modelId=&quot;
+ modelId; ORYX.Editor.createByUrl = function(modelUrl){" />                
+                <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js"
+                         token="window.location.href = &quot;./&quot;;"
+                         value="window.close();" />
                                                
                 <copy file="${basedir}/src/main/resources/url-config.js" todir="${activiti-modeler.directory}/editor-app/configuration"
overwrite="true" />
                 <copy file="${basedir}/src/main/resources/save-model.html" todir="${activiti-modeler.directory}/editor-app/popups"
overwrite="true" />

http://git-wip-us.apache.org/repos/asf/syncope/blob/9b87a2e2/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 8019a6e..cb22a08 100644
--- a/fit/console-reference/src/main/resources/url-config.js
+++ b/fit/console-reference/src/main/resources/url-config.js
@@ -29,6 +29,6 @@ KISBPM.URL = {
   },
   putModel: function (modelId) {
     return window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler'))

-            + "/workflowDefPUT?modelId" + modelId;
+            + "/workflowDefPUT?modelId=" + modelId;
   }
 };


Mime
View raw message