#251 MlcpTask should use args instead of additionalOptions

Author: rjrudin

examples/mlcp-project/build.gradle

@@ -69,15 +69,22 @@ task importSampleData(type: com.marklogic.gradle.task.MlcpTask) {
 	classpath = configurations.mlcp
 	command = "IMPORT"
 	database = mlAppConfig.contentDatabaseName
-	input_file_path = "data/import"
 	output_collections = "sample-import"
 	output_permissions = "rest-reader,read,rest-writer,update"
 	output_uri_replace = ".*import,'/import'"
+
 	/**
 	 * New in ml-gradle 2.6.0 - set this to define a URI in your content database for mlcp's log output to be written to
 	 * as a text document. This can also be a variable, Gradle property, etc.
 	 */
 	logOutputUri = "/slappy.txt"
+
+	/**
+	 * The args array can be used for any MLCP parameters that are not supported by the MlcpBean class that MlcpTask
+	 * delegates to. input_file_path is supported by MlcpTask; this is just included as an example of using the args
+	 * array.
+ 	 */
+	args = ["-input_file_path", "data/import"]
 }
 
 /**

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.1-alpha4
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.1-alpha4
+version=3.1-alpha5
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.1-alpha5
 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0
 

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

@@ -57,6 +57,9 @@ class MlcpTask extends JavaExec {
 					case ["class", "logger", "command", "password"]:
 						// skip for now
 						return
+					case "additionalOptions":
+						// Not supported by this task; use JavaExec's args instead
+						return
 					default:
 						propVal = val
 						break
@@ -84,16 +87,16 @@ class MlcpTask extends JavaExec {
 			}
 		}
 
+		// Include any args that a user has configured via the args parameter of the Gradle task
+		newArgs.addAll(getArgs())
+
 		println "mlcp arguments, excluding password: " + newArgs
 
 		if (!isCopy) {
 			newArgs.add("-password")
 			newArgs.add(password ? password : config.getRestAdminPassword())
 		}
 
-		// Include any args that a user has configured via the args parameter of the Gradle task
-		newArgs.addAll(getArgs())
-
 		setArgs(newArgs)
 
 		File logOutputFile = null