#72 Fixing issue where "is deleted" wasn't saved in the DeleteReceipt…

…, and thus ml-app-deployer didn't think it had to wait for a restart after deleting a server

src/main/java/com/rjrudin/marklogic/mgmt/DeleteReceipt.java

@@ -9,6 +9,7 @@ public class DeleteReceipt {
     public DeleteReceipt(String resourceId, String path, boolean deleted) {
         this.resourceId = resourceId;
         this.path = path;
+        this.deleted = deleted;
     }
 
     public String getResourceId() {

src/test/java/com/rjrudin/marklogic/appdeployer/command/servers/ManageOtherServerTest.java

@@ -0,0 +1,32 @@
+package com.rjrudin.marklogic.appdeployer.command.servers;
+
+import org.junit.After;
+import org.junit.Test;
+
+import com.rjrudin.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.rjrudin.marklogic.appdeployer.command.appservers.DeployOtherServersCommand;
+import com.rjrudin.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
+import com.rjrudin.marklogic.appdeployer.command.databases.DeploySchemasDatabaseCommand;
+import com.rjrudin.marklogic.appdeployer.command.databases.DeployTriggersDatabaseCommand;
+
+/**
+ * Only purpose of this test so far is to ensure that we wait properly after deleting the server.
+ */
+public class ManageOtherServerTest extends AbstractAppDeployerTest {
+
+    @After
+    public void teardown() {
+        undeploySampleApp();
+    }
+
+    @Test
+    public void updateMainAndRestRestApiServers() {
+        // Create some other databases that have to be deleted to ensure we wait for a restart after deleting the ODBC
+        // server
+        initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(),
+                new DeploySchemasDatabaseCommand(), new DeployOtherServersCommand());
+        appConfig.getCustomTokens().put("%%ODBC_PORT%%", "8048");
+        appDeployer.deploy(appConfig);
+
+    }
+}

src/test/resources/sample-app/src/main/ml-config/servers/odbc-server.json

@@ -4,6 +4,6 @@
   "root": "/",
   "group-name": "%%GROUP%%",
   "port": %%ODBC_PORT%%,
-  "modules-database": "%%MODULES_DATABASE%%",
+  "modules-database": "Modules",
   "content-database": "%%DATABASE%%"
 }