Merge branch 'master' into dev

Author: rjrudin

build.gradle

@@ -24,13 +24,19 @@ targetCompatibility = "1.7"
 
 repositories {
   jcenter()
+
+  // Needed for mlcp and its Hadoop dependencies
+  maven {url "http://developer.marklogic.com/maven2/"}
+  maven {url "http://repository.cloudera.com/artifactory/cloudera-repos/" }
+
   mavenLocal() // Used for local development only
 }
 
 dependencies {
   compile gradleApi()
   compile localGroovy()
   compile mlAppDeployerDependency
+  compile mlcpUtilDependency
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

gradle.properties

@@ -1,4 +1,5 @@
 group=com.marklogic
 version=2.3.2
 mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.3.0
+mlcpUtilDependency=com.marklogic:mlcp-util:0.2.0
 

src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy

@@ -1,10 +1,14 @@
 package com.marklogic.gradle.task
 
+import com.marklogic.contentpump.bean.MlcpBean
+import org.gradle.api.logging.Logger
+import org.gradle.api.logging.Logging
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
 
 import com.marklogic.appdeployer.AppConfig
 
+
 /**
  * Provides parameters for some, but not all, mlcp arguments. Arguments that aren't supported can be passed in
  * via JavaExec's "args" property. The main benefit of using this class is that it assumes usage of the connection
@@ -16,32 +20,12 @@ import com.marklogic.appdeployer.AppConfig
  */
 class MlcpTask extends JavaExec {
 
-    String host
-    Integer port = 8000
-    String username
-    String password 
-    String database
-    
-    String command
-    String input_file_path
-    String input_file_type
-    String input_file_pattern
-    String input_compressed
-    String document_type
-    String output_collections
-    String delimited_root_name
-    String delimited_uri_id
-    String namespace
-    String options_file
-    String output_file_path
-    String output_uri_prefix
-    String output_uri_replace
-    String output_permissions
-    String transform_module
-    String transform_namespace
-    String transform_param
-    String thread_count
-    
+    @Delegate MlcpBean mlcpBean = new MlcpBean();
+
+    public Logger getLogger() {
+        return Logging.getLogger(MlcpTask.class)
+    }
+
     @TaskAction
     @Override
     public void exec() {
@@ -50,92 +34,33 @@ class MlcpTask extends JavaExec {
 
         List<String> newArgs = new ArrayList<>()
         newArgs.add(command)
-        newArgs.add("-host")
-        newArgs.add(host ? host : config.getHost())
-        newArgs.add("-port")
-        newArgs.add(port)
-        newArgs.add("-username")
-        newArgs.add(username ? username : config.getRestAdminUsername())
-        
-        if (database) {
-            newArgs.add("-database")
-            newArgs.add(database)
-        }
-        if (input_file_path) {
-            newArgs.add("-input_file_path")
-            newArgs.add(input_file_path)
-        }
-        if (input_file_type) {
-            newArgs.add("-input_file_type")
-            newArgs.add(input_file_type)
-        }
-        if (input_file_pattern) {
-            newArgs.add("-input_file_pattern")
-            newArgs.add(input_file_pattern)
-        }
-        if (input_compressed) {
-            newArgs.add("-input_compressed")
-            newArgs.add(input_compressed)
-        }
-        if (document_type) {
-            newArgs.add("-document_type")
-            newArgs.add(document_type)
-        }
-        if (output_collections) {
-            newArgs.add("-output_collections")
-            newArgs.add(output_collections)
-        }
-        if (delimited_root_name) {
-            newArgs.add("-delimited_root_name")
-            newArgs.add(delimited_root_name)
-        }
-        if (delimited_uri_id) {
-            newArgs.add("-delimited_uri_id")
-            newArgs.add(delimited_uri_id)
-        }
-        if (namespace) {
-            newArgs.add("-namespace")
-            newArgs.add(namespace)
-        }
-        if (options_file) {
-            newArgs.add("-options_file")
-            newArgs.add(options_file)
-        }
-        if (output_file_path) {
-            newArgs.add("-output_file_path")
-            newArgs.add(output_file_path)
-        }
-        if (output_uri_prefix) {
-            newArgs.add("-output_uri_prefix")
-            newArgs.add(output_uri_prefix)
-        }
-        if (output_uri_replace) {
-            newArgs.add("-output_uri_replace")
-            newArgs.add(output_uri_replace)
-        }
-        if (output_permissions) {
-            newArgs.add("-output_permissions")
-            newArgs.add(output_permissions)
-        }
-        if (transform_module) {
-            newArgs.add("-transform_module")
-            newArgs.add(transform_module)
-        }
-        if (transform_namespace) {
-            newArgs.add("-transform_namespace")
-            newArgs.add(transform_namespace)
-        }
-		if (transform_param) {
-			newArgs.add("-transform_param")
-			newArgs.add(transform_param)
-		}
-        if (thread_count) {
-            newArgs.add("-thread_count")
-            newArgs.add(thread_count)
+
+        mlcpBean.properties.each { prop, val ->
+            def propVal
+            if (val) {
+                switch (prop) {
+                    case "host":
+                        propVal = (val ? val : config.getHost())
+                        break
+                    case "port":
+                        propVal = (val ? val : 8000)
+                        break
+                    case "username":
+                        propVal = (val ? val : config.getRestAdminUsername())
+                        break
+                    case ["class", "logger", "command", "password"]:
+                        // skip for now
+                        return
+                    default:
+                        propVal = val
+                        break
+                }
+
+                newArgs.add("-" + prop);
+                newArgs.add(String.valueOf(propVal));
+            }
         }
-        
-        newArgs.addAll(getArgs())
-        
+
         println "mlcp arguments, excluding password: " + newArgs
 
         newArgs.add("-password")