fixed #512

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadUserModulesCommand.java

@@ -7,9 +7,11 @@
 import com.marklogic.appdeployer.command.modules.AllButAssetsModulesFinder;
 import com.marklogic.appdeployer.command.modules.AssetModulesFinder;
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.document.DocumentWriteSet;
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.io.DocumentMetadataHandle;
+import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.modulesloader.Modules;
 import com.marklogic.client.modulesloader.impl.*;
@@ -165,9 +167,14 @@ public void execute(CommandContext context) {
                 // load Flow Definitions
                 List<Flow> flows = flowManager.getLocalFlows();
                 XMLDocumentManager documentManager = hubConfig.newModulesDbClient().newXMLDocumentManager();
+                DocumentWriteSet documentWriteSet = documentManager.newWriteSet();
+
                 for (Flow flow : flows) {
-                    documentManager.write(flow.getFlowDbPath(), new StringHandle(flow.serialize()));
+                    StringHandle handle = new StringHandle(flow.serialize());
+                    handle.setFormat(Format.XML);
+                    documentWriteSet.add(flow.getFlowDbPath(), handle);
                 }
+                documentManager.write(documentWriteSet);
 
                 Files.walkFileTree(startPath, new SimpleFileVisitor<Path>() {
                     @Override

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

@@ -13,7 +13,7 @@ public boolean accept(File f) {
         boolean result = f != null &&
             !f.getName().startsWith(".") &&
             !f.getName().endsWith("entity.json") &&
-            !f.getName().equals(f.getParent() + ".properties") &&
+            !f.getName().equals(f.getParentFile().getName() + ".properties") &&
             !f.toString().matches(".*[/\\\\]REST[/\\\\].*") &&
 
             // ignore vim files ending in ~