#222 Commands can now be ignored when running mlDeploy

Merged from 2.x

Author: rjrudin

examples/local-testing-project/gradle.properties

@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=2.8.0
+mlGradleVersion=2.9.0
 
 mlHost=localhost
 mlAppName=example

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -83,7 +83,8 @@ class MarkLogicPlugin implements Plugin<Project> {
 		String deployGroup = "ml-gradle Deploy"
 		project.task("mlPostDeploy", group: deployGroup, description: "Add dependsOn to this task to add tasks at the end of mlDeploy").mustRunAfter(["mlDeployApp"])
 		project.task("mlPostUndeploy", group: deployGroup, description: "Add dependsOn to this task to add tasks at the end of mlUndeploy").mustRunAfter(["mlUndeployApp"])
-		project.task("mlDeploy", group: deployGroup, dependsOn: ["mlDeployApp", "mlPostDeploy"], description: "Deploys all application resources in the configuration directory and allows for additional steps via mlPostDeploy.dependsOn").mustRunAfter("mlClearModulesDatabase")
+		project.task("mlDeploy", group: deployGroup, dependsOn: ["mlDeployApp", "mlPostDeploy"],
+			description: "Deploys all application resources in the configuration directory and allows for additional steps via mlPostDeploy.dependsOn. Use -Pignore to specify a comma-delimited list of short class names of ml-app-deployer command classes to ignore while deploying.").mustRunAfter("mlClearModulesDatabase")
 		project.task("mlUndeploy", group: deployGroup, dependsOn: ["mlUndeployApp", "mlPostUndeploy"], description: "Undeploys all application resources in the configuration directory and allows for additional steps via mlPostUndeploy.dependsOn")
 		project.task("mlRedeploy", group: deployGroup, dependsOn: ["mlClearModulesDatabase", "mlDeploy"], description: "Clears the modules database and then deploys the application")
 

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

@@ -1,11 +1,34 @@
 package com.marklogic.gradle.task
 
+import com.marklogic.appdeployer.impl.SimpleAppDeployer
 import org.gradle.api.tasks.TaskAction
 
 class DeployAppTask extends MarkLogicTask {
 
+	/**
+	 * Use "-Pignore" to specify the short class names of ml-app-deployer commands to ignore. The commands are then
+	 * removed from the mlAppDeployer object, as long as it is an instance of SimpleAppDeployer from ml-app-deployer.
+	 */
     @TaskAction
     void deployApp() {
-        getAppDeployer().deploy(getAppConfig())
+	    def appDeployer = getAppDeployer()
+	    if (project.hasProperty("ignore")) {
+		    if (appDeployer instanceof SimpleAppDeployer) {
+			    String[] commandNames = project.property("ignore").split(",")
+			    SimpleAppDeployer deployer = (SimpleAppDeployer)appDeployer
+			    for (String commandName : commandNames) {
+				    def command = deployer.removeCommand(commandName)
+				    if (command != null) {
+					    println "Ignoring command: " + commandName
+				    } else {
+					    println "Could not find command specified by ignore property: " + commandName
+				    }
+			    }
+		    }
+		    else {
+			    println "ignore property defined, but mlAppDeployer is not an instance of SimpleAppDeployer, so not able to ignore commands"
+		    }
+	    }
+        appDeployer.deploy(getAppConfig())
     }
 }

src/main/groovy/com/marklogic/gradle/task/export/ExportResourcesTask.groovy

@@ -4,7 +4,7 @@ import com.marklogic.appdeployer.export.ExportedResources
 import com.marklogic.appdeployer.export.Exporter
 import com.marklogic.gradle.task.MarkLogicTask
 import com.marklogic.mgmt.selector.PrefixResourceSelector
-import com.marklogic.mgmt.selector.PropertiesFileResourceSelector
+import com.marklogic.mgmt.selector.PropertiesResourceSelector
 import com.marklogic.mgmt.selector.RegexResourceSelector
 import com.marklogic.mgmt.selector.ResourceSelector
 import org.gradle.api.tasks.TaskAction
@@ -27,7 +27,7 @@ class ExportResourcesTask extends MarkLogicTask {
 			String filename = getProject().property(filePropName)
 			File file = new File(filename)
 			if (file.exists()) {
-				export(new PropertiesFileResourceSelector(file))
+				export(new PropertiesResourceSelector(file))
 			} else {
 				println "File " + filename + " does not exist"
 			}