#135 Adding task for waiting for the task server

Author: rjrudin

build.gradle

@@ -32,7 +32,6 @@ dependencies {
   compile localGroovy()
   compile mlAppDeployerDependency
   compile mlcpUtilDependency
-	compile "com.marklogic:ml-javaclient-util:2.10.0-alpha"
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
 version=2.4.0-dev
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.3.1
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.4.0
 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0
 

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

@@ -5,6 +5,7 @@ import com.marklogic.appdeployer.command.forests.DeployCustomForestsCommand
 import com.marklogic.gradle.task.forests.DeployCustomForestsTask
 import com.marklogic.gradle.task.qconsole.ExportWorkspacesTask
 import com.marklogic.gradle.task.qconsole.ImportWorkspacesTask
+import com.marklogic.gradle.task.tasks.WaitForTaskServerTask
 import com.sun.jersey.core.spi.component.ProviderServices
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -246,7 +247,8 @@ class MarkLogicPlugin implements Plugin<Project> {
         project.task("mlDeleteAllTasks", type: DeleteAllTasksTask, group: taskGroup, description: "Delete all scheduled tasks in the cluster")
         project.task("mlDeployTasks", type: DeployTasksTask, group: taskGroup, description: "Deploy each scheduled task, updating it if it exists, in the configuration directory")
         project.task("mlUndeployTasks", type: UndeployTasksTask, group: taskGroup, description: "Undeploy (delete) each scheduled task in the configuration directory")
-
+		project.task("mlWaitForTaskServer", type: WaitForTaskServerTask, group: taskGroup, description: "Wait for the task server to not have any requests in progress")
+		
         String triggerGroup = "ml-gradle Trigger"
         project.task("mlDeployTriggers", type: DeployTriggersTask, group: triggerGroup, description: "Deploy each trigger, updating it if it exists, in the configuration directory")
 

src/main/groovy/com/marklogic/gradle/task/databases/ClearSchemasDatabaseTask.groovy

@@ -8,7 +8,7 @@ import com.marklogic.mgmt.databases.DatabaseManager
 class ClearSchemasDatabaseTask extends MarkLogicTask {
 
     @TaskAction
-    void clearModules() {
+    void clearSchemasDatabase() {
         println "Clearing all documents in schemas database"
         DatabaseManager mgr = new DatabaseManager(getManageClient())
         mgr.clearDatabase(getAppConfig().getSchemasDatabaseName())

src/main/groovy/com/marklogic/gradle/task/tasks/WaitForTaskServerTask.groovy

@@ -0,0 +1,26 @@
+package com.marklogic.gradle.task.tasks
+
+import com.marklogic.appdeployer.command.tasks.WaitForTaskServerCommand
+import com.marklogic.gradle.task.MarkLogicTask
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Waits until the task server has no requests in progress.
+ */
+class WaitForTaskServerTask extends MarkLogicTask {
+
+	String groupName
+	int retryInSeconds = 0
+
+	@TaskAction
+	void waitForTaskServer() {
+		WaitForTaskServerCommand c = new WaitForTaskServerCommand()
+		if (groupName != null) {
+			c.setGroupName(groupName)
+		}
+		if (retryInSeconds > 0) {
+			c.setRetryInSeconds(retryInSeconds)
+		}
+		c.execute(getCommandContext())
+	}
+}