fix for invalid coercion ; document roxy installation ; make roxy executable

Author: eouthwaite

documentation/INSTALL.md

@@ -1,11 +1,18 @@
+## Roxy Installation
 
+To install via roxy, within the roxy directory, edit the properties file for the target environment - for example, ``deploy/local.properties`` and run the following commands:
 
-## Configure MIME types
+    ./ml local bootstrap
+    ./ml local deploy modules
+    ./ml local deploy cpf
+    # ./ml local deploy content
 
-Default filenames for SCXML and BPMN2 bodels are .scxml and .bpmn respectively. These aren't recognised by MarkLogic
-by default. Add these types are application/xml mime types in MarkLogic Server for them to be handled correctly.
+### Configure MIME types
 
-## Configuring a database for MarkLogic Workflow
+Default filenames for SCXML and BPMN2 models are .scxml and .bpmn respectively. These aren't recognised by MarkLogic
+by default. Add these types are application/xml mime types in MarkLogic Server for them to be handled correctly.  *This will be performed automatically via roxy bootstrap.*
+
+### Configuring a database for MarkLogic Workflow
 
 You can install a MarkLogic Workflow modules database from the modules folder within this repository. Once done,
 your application's app server can be configured to either use this modules database, or more likely, use a modules
@@ -19,6 +26,8 @@ with no extra work from yourself.
 You need to ensure your content database has a Triggers database configured, and that CPF is enabled
 (with NO global domain) before you try and deploy a process model in MarkLogic Workflow.
 
+*Installation including triggers and REST extensions will be performed automatically via the Roxy commands above.*
+
 ## Configure global process task settings
 
 Some tasks require global configuration. An example of this is the email task which requires SMTP settings.

ml

@@ -277,7 +277,8 @@ declare function m:list($processName as xs:string?) as element(wf:list) {
 (:
  : Called by the REST API only.
  :)
-declare function m:lock($processId as xs:string) as node()? {
+declare function m:lock($processId as xs:string) as xs:string? {
+  (: when it works, should return empty-sequence() :)
   (: Check that this is a human queue task or user task :)
   let $props := m:getProperties($processId)
   return
@@ -310,7 +311,8 @@ declare function m:lock($processId as xs:string) as node()? {
 (:
  : Allow unlocking of a work item. (Not the same as completion). Does not return data.
  :)
-declare function m:unlock($processId as xs:string) as node()? {
+declare function m:unlock($processId as xs:string) as xs:string? {
+(: when it works, should return empty-sequence() :)
 let $props := m:getProperties($processId)
 return
   if ($props/wf:currentStep/wf:step-type = "userTask" and $props/wf:currentStep/wf:step-status = "ENTERED") then