Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit 09d14c6

Browse files
authored
Merge pull request #117 from marklogic-community/feature-113
Feature 113
2 parents 7f89779 + e8bdae8 commit 09d14c6

35 files changed

+59
-59
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ eclipse/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5
44
.DS_Store
55
shtests/*-out.txt
66
shtests/output.log
7+
.idea/*

CONTRIBUTING.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,11 @@ equivalent to our .editorconfig file.
105105
#### Test your code (pre-release mainly)
106106

107107
We are working hard to improve MarkLogic Workflow's testing. If you add new actions
108-
in process models then please write unit tests in the shtests directory.
109-
When finished, verify that the self-test works.
108+
in process models then please write unit tests using the [Roxy framework](https://github.com/marklogic-community/roxy/wiki/Unit-Testing).
110109

111-
```sh
112-
$ cd shtests
113-
$ ./all.sh
114-
```
110+
The default location for the test interface is http://localhost:8042/test/ - note that tests e2e-rest-process-json and e2e-rest-process-xml will attempt to create a user (**test-workflow-user**) during setup and remove it during the teardown phase.
111+
112+
When finished, verify that the self-test works.
115113

116114
Make sure that all tests pass. Please, do not submit patches that fail.
117115

documentation/INSTALL.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ To install via roxy, within the roxy directory, edit the properties file for the
55
./ml local bootstrap
66
./ml local deploy modules
77
./ml local deploy cpf
8-
# ./ml local deploy content
8+
9+
Note that if left as is, the [Roxy test harness](https://github.com/marklogic-community/roxy/wiki/Unit-Testing) will also be set up at http://localhost:8042/test/
910

1011
### Configure MIME types
1112

rest-api/ext/process.xqy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/process";
1111
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
1212

1313
import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
14-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
15-
import module namespace wfa="http://marklogic.com/workflow-actions" at "/app/models/workflow-actions.xqy";
14+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
15+
import module namespace wfa="http://marklogic.com/workflow-actions" at "/workflowengine/models/workflow-actions.xqy";
1616

1717
declare namespace roxy = "http://marklogic.com/roxy";
1818
declare namespace wf="http://marklogic.com/workflow";

rest-api/ext/processasset.xqy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processasset";
44

55
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
66

7-
import module namespace wfi="http://marklogic.com/workflow-import" at "/app/models/workflow-import.xqy";
8-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
7+
import module namespace wfi="http://marklogic.com/workflow-import" at "/workflowengine/models/workflow-import.xqy";
8+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
99

1010
declare namespace wf="http://marklogic.com/workflow";
1111

rest-api/ext/processengine.xqy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processengine";
66
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
77

88
import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
9-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
10-
import module namespace wfadmin="http://marklogic.com/workflow-admin" at "/app/models/workflow-admin.xqy";
9+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
10+
import module namespace wfadmin="http://marklogic.com/workflow-admin" at "/workflowengine/models/workflow-admin.xqy";
1111

1212
declare namespace roxy = "http://marklogic.com/roxy";
1313
declare namespace wf="http://marklogic.com/workflow";

rest-api/ext/processinbox.xqy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processinbox";
66
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
77

88
import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
9-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
9+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
1010

1111
declare namespace roxy = "http://marklogic.com/roxy";
1212
declare namespace wf="http://marklogic.com/workflow";

rest-api/ext/processmodel.xqy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processmodel";
44

55
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
66

7-
import module namespace wfi="http://marklogic.com/workflow-import" at "/app/models/workflow-import.xqy";
8-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
7+
import module namespace wfi="http://marklogic.com/workflow-import" at "/workflowengine/models/workflow-import.xqy";
8+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
99

1010
declare namespace wf="http://marklogic.com/workflow";
1111

rest-api/ext/processqueue.xqy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processqueue";
66
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
77

88
import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
9-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
9+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
1010

1111
declare namespace roxy = "http://marklogic.com/roxy";
1212
declare namespace wf="http://marklogic.com/workflow";

rest-api/ext/processroleinbox.xqy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module namespace ext = "http://marklogic.com/rest-api/resource/processroleinbox"
66
import module namespace json = "http://marklogic.com/xdmp/json" at "/MarkLogic/json/json.xqy";
77

88
import module namespace cpf = "http://marklogic.com/cpf" at "/MarkLogic/cpf/cpf.xqy";
9-
import module namespace wfu="http://marklogic.com/workflow-util" at "/app/models/workflow-util.xqy";
9+
import module namespace wfu="http://marklogic.com/workflow-util" at "/workflowengine/models/workflow-util.xqy";
1010

1111
declare namespace roxy = "http://marklogic.com/roxy";
1212
declare namespace wf="http://marklogic.com/workflow";

0 commit comments

Comments
 (0)