#113 move /src/app/models to /src/workflowengine/models

eouthwaite · eouthwaite · commit 4607276dc6a3 · 2017-09-22T18:55:53.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ eclipse/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5
 .DS_Store
 shtests/*-out.txt
 shtests/output.log
+.idea/*
diff --git a/rest-api/ext/process.xqy b/rest-api/ext/process.xqy
@@ -11,8 +11,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/process";
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
-import module namespace wfa="http://marklogic.com/workflow-actions" at "/app/models/workflow-actions.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
+import module namespace wfa="http://marklogic.com/workflow-actions" at "/workflowengine/models/workflow-actions.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processasset.xqy b/rest-api/ext/processasset.xqy
@@ -4,8 +4,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processasset";
 
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
-import module namespace wfi="http://marklogic.com/workflow-import" at "/app/models/workflow-import.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfi="http://marklogic.com/workflow-import" at "/workflowengine/models/workflow-import.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/rest-api/ext/processengine.xqy b/rest-api/ext/processengine.xqy
@@ -6,8 +6,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processengine";
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
-import module namespace wfadmin="http://marklogic.com/workflow-admin" at "/app/models/workflow-admin.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
+import module namespace wfadmin="http://marklogic.com/workflow-admin" at "/workflowengine/models/workflow-admin.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processinbox.xqy b/rest-api/ext/processinbox.xqy
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processinbox";
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processmodel.xqy b/rest-api/ext/processmodel.xqy
@@ -4,8 +4,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processmodel";
 
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
-import module namespace wfi="http://marklogic.com/workflow-import" at "/app/models/workflow-import.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfi="http://marklogic.com/workflow-import" at "/workflowengine/models/workflow-import.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/rest-api/ext/processqueue.xqy b/rest-api/ext/processqueue.xqy
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processqueue";
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processroleinbox.xqy b/rest-api/ext/processroleinbox.xqy
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processroleinbox"
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processsearch.xqy b/rest-api/ext/processsearch.xqy
@@ -4,14 +4,14 @@ xquery version "1.0-ml";
 (: process.xqy - Start a new, or modify an existing, MarkLogic Workflow process
  :
  :)
- 
+
 module namespace ext = "http://marklogic.com/rest-api/resource/processsearch";
 
 (: import module namespace config = "http://marklogic.com/roxy/config" at "/app/config/config.xqy"; :)
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/rest-api/ext/processsubscription.xqy b/rest-api/ext/processsubscription.xqy
@@ -7,7 +7,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processsubscripti
 import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace roxy = "http://marklogic.com/roxy";
 declare namespace wf="http://marklogic.com/workflow";
diff --git a/src/workflowengine/actions/endEvent.xqy b/src/workflowengine/actions/endEvent.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/exclusiveGateway.xqy b/src/workflowengine/actions/exclusiveGateway.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/fork.xqy b/src/workflowengine/actions/fork.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/actions/genericComplete.xqy b/src/workflowengine/actions/genericComplete.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/actions/mlNodeReplace.xqy b/src/workflowengine/actions/mlNodeReplace.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/restart.xqy b/src/workflowengine/actions/restart.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/actions/scriptTask.xqy b/src/workflowengine/actions/scriptTask.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace error="http://marklogic.com/xdmp/error";
diff --git a/src/workflowengine/actions/sendTask.xqy b/src/workflowengine/actions/sendTask.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/startEvent.xqy b/src/workflowengine/actions/startEvent.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace p="http://marklogic.com/cpf/pipelines";
diff --git a/src/workflowengine/actions/task.xqy b/src/workflowengine/actions/task.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/userTask.xqy b/src/workflowengine/actions/userTask.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 
diff --git a/src/workflowengine/actions/workflowInitialSelection.xqy b/src/workflowengine/actions/workflowInitialSelection.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/conditions/hasEntered.xqy b/src/workflowengine/conditions/hasEntered.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/conditions/hasRendezvoused.xqy b/src/workflowengine/conditions/hasRendezvoused.xqy
@@ -3,7 +3,7 @@ xquery version "1.0-ml";
    all child processes have rendezvoused, and if so, continues to the next state :)
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/conditions/isComplete.xqy b/src/workflowengine/conditions/isComplete.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare namespace wf="http://marklogic.com/workflow";
 declare namespace prop = "http://marklogic.com/xdmp/property";
diff --git a/src/workflowengine/models/alert-action-process.xqy b/src/workflowengine/models/alert-action-process.xqy
@@ -11,7 +11,7 @@ import module namespace alert = "http://marklogic.com/xdmp/alert" at "/MarkLogic
 declare namespace wf = "http://marklogic.com/workflow";
 import module namespace sem = "http://marklogic.com/semantics" at "/MarkLogic/semantics.xqy";
 
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 declare variable $alert:config-uri as xs:string external;
 declare variable $alert:doc as node() external;
diff --git a/src/workflowengine/models/lib-alerts.xqy b/src/workflowengine/models/lib-alerts.xqy
@@ -23,7 +23,7 @@ declare function ss:add-alert($shortname as xs:string,$query as schema-element(c
 declare function ss:do-create-config($shortname as xs:string) as xs:string {
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/workflowengine/models/lib-alerts.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:shortname as xs:string external;' ||
     'ah:create-config($my:shortname)',
@@ -35,7 +35,7 @@ declare function ss:do-create-config($shortname as xs:string) as xs:string {
 declare function ss:do-create-rule($alert-name as xs:string,$query as cts:query,$options as element()*) {
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/workflowengine/models/lib-alerts.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:alert-name as xs:string external;' ||
     'declare variable $my:query as cts:query external;' ||
@@ -49,7 +49,7 @@ declare function ss:do-create-rule($alert-name as xs:string,$query as cts:query,
 declare function ss:do-create-action($alert-name as xs:string,$alert-module as xs:string,$db as xs:unsignedLong,$options as element()*) {
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/workflowengine/models/lib-alerts.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:alert-name as xs:string external;' ||
     'declare variable $my:alert-module as xs:string external;' ||
diff --git a/src/workflowengine/models/lib-search-subscribe.xqy b/src/workflowengine/models/lib-search-subscribe.xqy
@@ -274,7 +274,7 @@ declare function ss:do-create-config($shortname as xs:string) as xs:string {
   return
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/app/models/lib-search-subscribe.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/workflowengine/models/lib-search-subscribe.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:shortname as xs:string external;' ||
     'ah:create-config($my:shortname)',
@@ -286,7 +286,7 @@ declare function ss:do-create-config($shortname as xs:string) as xs:string {
 declare function ss:do-create-rule($alert-name as xs:string,$query as cts:query,$options as element()*) as empty-sequence() {
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/app/models/lib-search-subscribe.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/workflowengine/models/lib-search-subscribe.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:alert-name as xs:string external;' ||
     'declare variable $my:query as cts:query external;' ||
@@ -300,7 +300,7 @@ declare function ss:do-create-rule($alert-name as xs:string,$query as cts:query,
 declare function ss:do-create-action($alert-name as xs:string,$alert-module as xs:string,$dbname as xs:string?,$options as element()*) {
   xdmp:eval(
     'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/app/models/lib-search-subscribe.xqy";' ||
+    'import module namespace ah = "http://marklogic.com/search/subscribe" at "/workflowengine/models/lib-search-subscribe.xqy";' ||
     'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
     'declare variable $my:alert-name as xs:string external;' ||
     'declare variable $my:alert-module as xs:string external;' ||
diff --git a/src/workflowengine/models/lib-stack.xqy b/src/workflowengine/models/lib-stack.xqy
diff --git a/src/workflowengine/models/workflow-actions.xqy b/src/workflowengine/models/workflow-actions.xqy
@@ -2,7 +2,7 @@ xquery version "1.0-ml";
 
 module namespace m="http://marklogic.com/workflow-actions";
 
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
 
 declare namespace prop = "http://marklogic.com/xdmp/property";
@@ -51,8 +51,8 @@ declare function complete-userTask($processId as xs:string,$data as node()*,$att
 
 (: INTERNAL METHODS :)
 declare function update-generic($processId as xs:string,$data as node()*,$attachments as node()*) as node()? {
-  let $_ := xdmp:log("In wfa:update-generic")     
-  
+  let $_ := xdmp:log("In wfa:update-generic")
+
 	let $previous-data := fn:doc(wfu:getProcessUri($processId))/wf:process/wf:data
 	let $previous-attach := fn:doc(wfu:getProcessUri($processId))/wf:process/wf:attachments
 
@@ -62,9 +62,9 @@ declare function update-generic($processId as xs:string,$data as node()*,$attach
         element wf:data {
           ($previous-data/* except $data/(let $qname := fn:node-name(.) return $previous-data/*[fn:node-name(.) eq $qname])),
           $data
-        } 
+        }
       ),
-      xdmp:node-replace(fn:doc(wfu:getProcessUri($processId))/wf:process/wf:attachments, 
+      xdmp:node-replace(fn:doc(wfu:getProcessUri($processId))/wf:process/wf:attachments,
       	(: Keep previous data if not newly sent and add new elements :)
         element wf:attachments {
           ($previous-attach/* except $previous-attach/*[@name eq $attachments/@name]),
diff --git a/src/workflowengine/models/workflow-admin.xqy b/src/workflowengine/models/workflow-admin.xqy
@@ -2,7 +2,7 @@ xquery version "1.0-ml";
 
 module namespace m="http://marklogic.com/workflow-admin";
 
-import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
+import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
 
 import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
 
diff --git a/src/workflowengine/models/workflow-import.xqy b/src/workflowengine/models/workflow-import.xqy
diff --git a/src/workflowengine/models/workflow-util.xqy b/src/workflowengine/models/workflow-util.xqy
