fixed #287

Author: paxtonhare

marklogic-data-hub/build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.6'
-    id 'com.marklogic.ml-gradle' version '2.3.1'
+    id 'com.marklogic.ml-gradle' version '2.3.4'
 }
 
 repositories {
@@ -22,10 +22,10 @@ targetCompatibility = 1.8
 dependencies {
     compile 'org.springframework.batch:spring-batch-core:3.0.6.RELEASE'
     compile 'org.springframework:spring-jdbc:4.2.6.RELEASE'
-    compile 'com.marklogic:java-client-api:3.0.4'
-    compile 'com.marklogic:ml-javaclient-util:2.9.0'
-    compile 'com.marklogic:ml-app-deployer:2.2.0'
-    compile 'com.marklogic:marklogic-spring-batch-core:0.5.2'
+    compile 'com.marklogic:java-client-api:3.0.5'
+    compile 'com.marklogic:ml-javaclient-util:2.9.1'
+    compile 'com.marklogic:ml-app-deployer:2.3.0'
+    compile 'com.marklogic:marklogic-spring-batch-core:0.7.0'
     compile 'commons-io:commons-io:2.4'
     testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
     testCompile 'junit:junit:4.12'

marklogic-data-hub/src/main/java/com/marklogic/spring/batch/hub/FlowConfig.java

@@ -46,7 +46,7 @@ public JobExecutionDao jobExecutionDao() throws Exception {
 
     @Bean
     public StepExecutionDao stepExecutionDao() throws Exception {
-        MarkLogicStepExecutionDao stepExecutionDao = new MarkLogicStepExecutionDao(databaseClientProvider.getDatabaseClient());
+        MarkLogicStepExecutionDao stepExecutionDao = new MarkLogicStepExecutionDao(databaseClientProvider.getDatabaseClient(), jobExecutionDao());
         stepExecutionDao.setJobExecutionDao(jobExecutionDao());
         stepExecutionDao.setIncrementer(new UriIncrementer());
         return stepExecutionDao;

quick-start/build.gradle

@@ -49,7 +49,8 @@ dependencies {
     compile("org.springframework.boot:spring-boot-devtools:${springBootVersion}")
 
     // Needed for the Upload feature using mlcp
-    compile("com.marklogic:mlcp-util:0.2.0")
+    compile("com.marklogic:mlcp-util:0.3.0")
+    compile("com.marklogic:mlcp:8.0-5")
 
     testCompile("junit:junit")
     testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
@@ -58,6 +59,7 @@ dependencies {
 configurations {
     all*.exclude group: 'xml-apis'
     all*.exclude group: 'xerces'
+    all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
 }
 
 task cleanUI(type: Delete) {

quick-start/src/main/java/com/marklogic/quickstart/service/DataHubService.java

@@ -9,11 +9,12 @@
 import com.marklogic.quickstart.exception.DataHubException;
 import com.marklogic.quickstart.listeners.DeployUserModulesListener;
 import com.marklogic.quickstart.listeners.ValidateListener;
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.nio.file.Paths;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -30,11 +31,18 @@ public boolean install(HubConfig config, StatusListener listener) throws DataHub
             dataHub.install(listener);
             return true;
         } catch(Throwable e) {
-            listener.onStatusChange(100, ExceptionUtils.getStackTrace(e));
+            listener.onStatusChange(100, getStackTrace(e));
         }
         return false;
     }
 
+    private String getStackTrace(final Throwable throwable) {
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw, true);
+        throwable.printStackTrace(pw);
+        return sw.getBuffer().toString();
+    }
+
     @Async
     public void installUserModules(HubConfig config, boolean forceLoad, DeployUserModulesListener deployListener, ValidateListener validateListener) {
         long startTime = PerformanceLogger.monitorTimeInsideMethod();

quick-start/src/main/java/com/marklogic/quickstart/service/FlowManagerService.java

@@ -1,8 +1,6 @@
 package com.marklogic.quickstart.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
 import com.marklogic.client.helper.LoggingObject;
 import com.marklogic.hub.FlowManager;
 import com.marklogic.hub.JobStatusListener;
@@ -31,6 +29,9 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -119,7 +120,8 @@ public String getFlowMlcpOptionsFromFile(String entityName, String flowName) thr
         Path filePath = getMlcpOptionsFilePath(destFolder, entityName, flowName);
         File file = filePath.toFile();
         if(file.exists()) {
-            return Files.toString(file, Charsets.UTF_8);
+            byte[] encoded = Files.readAllBytes(filePath);
+            return new String(encoded, StandardCharsets.UTF_8);
         }
         return "{ \"input_file_path\": \"" + envConfig.getProjectDir().replace("\\", "\\\\") + "\" }";
     }

quick-start/src/main/java/com/marklogic/quickstart/service/MlcpTasklet.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.marklogic.contentpump.ContentPump;
 import com.marklogic.contentpump.bean.MlcpBean;
 import com.marklogic.hub.HubConfig;
 import com.marklogic.hub.JobStatusListener;
@@ -61,8 +62,7 @@ public void onError() {
         PrintStream ps = new PrintStream(sos);
         System.setOut(ps);
 
-
-        bean.run();
+        ContentPump.runCommand(bean.buildArgs());
 
         chunkContext
             .getStepContext()

quick-start/src/main/java/com/marklogic/quickstart/web/UtilController.java

@@ -2,7 +2,6 @@
 
 import com.marklogic.quickstart.model.SearchPathModel;
 import com.marklogic.quickstart.util.FileUtil;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -28,7 +27,7 @@ public Map<String, Object> searchPath(@RequestParam String path) {
 		List<SearchPathModel> paths = new ArrayList<SearchPathModel>();
 		String currentPath;
 
-		if (StringUtils.isEmpty(path)) {
+		if (path == null || path.length() == 0) {
 		    currentPath = "/";
 			File[] roots = File.listRoots();
 			for (int i = 0; i < roots.length; i++) {