#230 Added mlRestServerName and mlTestRestServerName

Author: rjrudin

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -252,6 +252,18 @@ public AppConfig newAppConfig() {
 			c.setAppServicesSimpleSslConfig();
 		}
 
+		prop = getProperty("mlRestServerName");
+		if (prop != null) {
+			logger.info("REST server name: " + prop);
+			c.setRestServerName(prop);
+		}
+
+		prop = getProperty("mlTestRestServerName");
+		if (prop != null) {
+			logger.info("Test REST server name: " + prop);
+			c.setTestRestServerName(prop);
+		}
+
 		/**
 		 * When a content database is created, this property can be used to control the number of forests per host for
 		 * that database.

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -40,7 +40,7 @@ public void moduleTimestampsPath() {
 	    AppConfig config = new DefaultAppConfigFactory(new SimplePropertySource(p)).newAppConfig();
 	    assertNull(config.getModuleTimestampsPath());
     }
-    
+
     @Test
     public void unrecognizedProperties() {
         sut = new DefaultAppConfigFactory(new SimplePropertySource("foo.mlHost", "host", "foo.mlUsername", "user"));
@@ -103,7 +103,7 @@ public void allProperties() {
         p.setProperty("mlRestCertPassword", "restCertPassword");
         p.setProperty("mlRestExternalName", "restExternalName");
 
-	    p.setProperty("mlAppServicesUsername", "appServicesUsername");
+        p.setProperty("mlAppServicesUsername", "appServicesUsername");
 	    p.setProperty("mlAppServicesPassword", "appServicesPassword");
 	    p.setProperty("mlAppServicesPort", "8123");
 	    p.setProperty("mlAppServicesAuthentication", "kerBEROS");
@@ -112,6 +112,9 @@ public void allProperties() {
 	    p.setProperty("mlAppServicesExternalName", "appServicesExternalName");
 	    p.setProperty("mlAppServicesSimpleSsl", "true");
 
+	    p.setProperty("mlRestServerName", "my-rest-server");
+	    p.setProperty("mlTestRestServerName", "my-test-rest-server");
+
 	    p.setProperty("mlContentForestsPerHost", "17");
 	    p.setProperty("mlCreateForests", "false");
 	    p.setProperty("mlForestsPerHost", "some-db,2,other-db,3");
@@ -204,6 +207,9 @@ public void allProperties() {
 	    assertNotNull(config.getAppServicesSslContext());
 	    assertEquals(DatabaseClientFactory.SSLHostnameVerifier.ANY, config.getAppServicesSslHostnameVerifier());
 
+	    assertEquals("my-rest-server", config.getRestServerName());
+	    assertEquals("my-test-rest-server", config.getTestRestServerName());
+
 	    assertEquals((Integer) 17, config.getContentForestsPerHost());
 	    assertFalse(config.isCreateForests());
 	    Map<String, Integer> forestCounts = config.getForestCounts();