Fixes for eXist-db 5.0.0

Author: adamretter

src/main/xar-resources/modules/collection.xqm

@@ -59,15 +59,15 @@ declare function col:copy($src-uri as xs:string, $dst-uri as xs:string) as xs:st
         let $dst-name := $_[2]
         return
             if ($src-name eq $dst-name) then
-                let $_ := xmldb:copy($src-uri, $dst-parent)
+                let $_ := xmldb:copy-collection($src-uri, $dst-parent)
                 return
                     $dst-uri
             else
 
                 (: copy to a temp collection :)
                 let $temp-id := util:uuid()
                 let $temp-col-uri := ut:mkcol("/db/" || $temp-id)
-                let $_ := xmldb:copy($src-uri, $temp-col-uri)
+                let $_ := xmldb:copy-collection($src-uri, $temp-col-uri)
 
                 (: rename the collection to its destination name:)
                 let $_ := xmldb:rename($temp-col-uri || "/" || $src-name, $dst-name)

src/main/xar-resources/modules/document.xqm

@@ -134,30 +134,7 @@ declare function doc:copy($src-uri as xs:string, $dst-uri as xs:string) as xs:st
         let $dst-parent := $_[1]
         let $dst-name := $_[2]
         return
-            
-             if ($src-name eq $dst-name) then
-                let $_ := xmldb:copy($src-parent, $dst-parent, $src-name)
-                return
-                    $dst-uri
-            else
-                
-                (: copy to a temp collection :)
-                let $temp-id := util:uuid()
-                let $temp-col-uri := ut:mkcol("/db/" || $temp-id)
-                let $_ := xmldb:copy($src-parent, $temp-col-uri, $src-name)
-                
-                (: rename the document to its destination name:)
-                let $_ := xmldb:rename($temp-col-uri, $src-name, $dst-name)
-                return
-    
-                    (: move the renamed document into place :)
-                    let $_ := xmldb:move($temp-col-uri, $dst-parent, $dst-name)
-                    
-                    (: remove the temp collection :)
-                    let $_ := xmldb:remove($temp-col-uri)
-                    return
-                        
-                        $dst-uri
+            xmldb:copy-resource($src-parent, $src-name, $dst-parent, $dst-name)
 
     else
         perr:error($perr:PD003, $src-uri)

src/main/xar-resources/modules/json-xml.xqm

@@ -86,7 +86,7 @@ declare %private function jx:json-to-xml-recurse($json as item()*) as item()+ {
                             $array-member
                     }
             else if ($data-type eq "map") then
-                map:for-each-entry(
+                map:for-each(
                     $json, 
                     function($object-name, $object-value) {
                         let $object-value-data-type := jx:json-data-type($object-value)