Merge pull request #190 from paxtonhare/187_rest_deploy_bug

fixed #187

Author: dmcassel

examples/healthcare/plugins/entities/Patients/conformance/final/writer/writer.xqy

@@ -0,0 +1,22 @@
+xquery version "1.0-ml";
+
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
+
+declare option xdmp:mapping "false";
+
+(:~
+ : Writer Plugin
+ :
+ : @param $id       - the identifier returned by the collector
+ : @param $envelope - the final envelope
+ : @param $options  - a map containing options. Options are sent from Java
+ :
+ : @return - nothing
+ :)
+declare function plugin:write(
+  $id as xs:string,
+  $envelope as node(),
+  $options as map:map) as empty-sequence()
+{
+  xdmp:document-insert($id, $envelope)
+};

marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java

@@ -254,8 +254,8 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
                 boolean isRest = dir.endsWith("REST");
 
                 String dirStr = dir.toString();
-                boolean isInputDir = dirStr.matches(".*/input/.*");
-                boolean isConformanceDir = dirStr.matches(".*/conformance/.*");
+                boolean isInputDir = dirStr.matches(".*[/\\\\]input[/\\\\].*");
+                boolean isConformanceDir = dirStr.matches(".*[/\\\\]conformance[/\\\\].*");
                 if (isRest) {
                     if (isInputDir) {
                         loadedFiles.addAll(hubModulesLoader.loadModules(dir.normalize().toAbsolutePath().toFile(), new AllButAssetsModulesFinder(), stagingClient));

marklogic-data-hub/src/main/java/com/marklogic/hub/util/HubFileFilter.java

@@ -10,7 +10,7 @@ public class HubFileFilter implements FileFilter {
 
     @Override
     public boolean accept(File f) {
-        boolean result = f != null && !f.getName().startsWith(".") && !f.toString().matches(".*/REST/.*");
+        boolean result = f != null && !f.getName().startsWith(".") && !f.toString().matches(".*[/\\\\]REST[/\\\\].*");
         return result;
     }
 

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/flow-lib.xqy

@@ -279,6 +279,7 @@ declare %private function flow:get-flow(
     return
       fn:doc($uri)/hub:flow
   })
+  where $flow
   return
     <flow xmlns="http://marklogic.com/data-hub">
       <name>{$flow-name}</name>