Merge pull request #215 from paxtonhare/fix_mlcp_windows_issue_89

Fix mlcp windows issue 89

Author: paxtonhare

build.gradle

@@ -18,7 +18,9 @@ subprojects {
 
     test{
         testLogging{
-            events 'started','passed', 'skipped'
+            events 'started','passed', 'skipped', 'failed', 'standardError', 'standardOut'
+
+            showStandardStreams true
         }
     }
 

marklogic-data-hub/build.gradle

@@ -27,11 +27,7 @@ dependencies {
     compile 'com.marklogic:ml-app-deployer:2.0'
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.commons:commons-csv:1.2'
-    compile('com.marklogic:mlcp:8.0-5') {
-        exclude module : 'servlet-api'
-        exclude group: 'com.google.guava', module: 'guava'
-    }
-    compile 'com.google.guava:guava:19.0'
+    compile 'org.glassfish.jaxb:txw2:2.2.11'
     testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
     testCompile 'junit:junit:4.12'
     testCompile 'xmlunit:xmlunit:1.3'

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

@@ -15,15 +15,11 @@
  */
 package com.marklogic.hub;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.stream.XMLStreamException;
 
-import org.codehaus.jettison.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobExecutionListener;
@@ -54,7 +50,6 @@
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.util.RequestParameters;
-import com.marklogic.hub.Mlcp.SourceOptions;
 import com.marklogic.hub.collector.Collector;
 import com.marklogic.hub.collector.ServerCollector;
 import com.marklogic.hub.flow.Flow;
@@ -68,8 +63,6 @@ public class FlowManager extends ResourceManager {
     private static final String NAME = "flow";
     private static final int DEFAULT_THREAD_COUNT = 8;
 
-    static final private Logger LOGGER = LoggerFactory.getLogger(FlowManager.class);
-
     private DatabaseClient client;
 
     private JobBuilderFactory jobBuilderFactory;
@@ -230,26 +223,6 @@ public JobExecution runFlow(Flow flow, int batchSize, JobExecutionListener liste
         }
     }
 
-    public void runInputFlow(Flow flow, HubConfig config) {
-        try {
-            Mlcp mlcp = new Mlcp(config.host, config.stagingPort, config.adminUsername, config.adminPassword);
-            SourceOptions sourceOptions = new SourceOptions(
-                    flow.getEntityName(), flow.getName(),
-                    FlowType.INPUT.toString(),
-                    flow.getDataFormat());
-            sourceOptions.setInputFileType("documents");
-            sourceOptions.setTransformModule("/com.marklogic.hub/mlcp-flow-transform.xqy");
-            sourceOptions.setTransformNamespace("http://marklogic.com/data-hub/mlcp-flow-transform");
-            mlcp.addSourceDirectory(config.modulesPath, sourceOptions);
-            mlcp.loadContent();
-        }
-        catch (IOException | JSONException e) {
-            LOGGER.error(
-                    "Error encountered while trying to run flow:  "
-                            + flow.getEntityName() + " > " + flow.getName(), e);
-        }
-    }
-
     public void runFlowsInParallel(Flow ... flows) {
 
     }