#97 App services port can now be configured via mlAppServicesPort

Author: rjrudin

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

@@ -67,6 +67,7 @@ public class AppConfig {
 
     private Integer restPort = DEFAULT_PORT;
     private Integer testRestPort;
+    private Integer appServicesPort = 8000;
 
     // These can all be set to override the default names that are generated off of the "name" attribute.
     private String groupName = DEFAULT_GROUP;
@@ -168,6 +169,9 @@ public XccAssetLoader newXccAssetLoader() {
         l.setUsername(getRestAdminUsername());
         l.setPassword(getRestAdminPassword());
         l.setDatabaseName(getModulesDatabaseName());
+        if (getAppServicesPort() != null) {
+            l.setPort(getAppServicesPort());
+        }
 
         String permissions = getModulePermissions();
         if (permissions != null) {
@@ -508,4 +512,12 @@ public Map<String, Integer> getForestCounts() {
     public void setForestCounts(Map<String, Integer> forestCounts) {
         this.forestCounts = forestCounts;
     }
+
+    public Integer getAppServicesPort() {
+        return appServicesPort;
+    }
+
+    public void setAppServicesPort(Integer appServicesPort) {
+        this.appServicesPort = appServicesPort;
+    }
 }

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

@@ -60,6 +60,12 @@ public AppConfig newAppConfig() {
             c.setTestRestPort(Integer.parseInt(prop));
         }
 
+        prop = getProperty("mlAppServicesPort");
+        if (prop != null) {
+            logger.info("App services port: " + prop);
+            c.setAppServicesPort(Integer.parseInt(prop));
+        }
+
         prop = getProperty("mlRestAdminUsername");
         if (prop != null) {
             logger.info("REST admin username: " + prop);

src/main/java/com/marklogic/appdeployer/command/admin/SetSslFipsEnabledCommand.java

@@ -13,7 +13,7 @@ public SetSslFipsEnabledCommand(boolean sslFipsEnabled) {
 
     @Override
     public void execute(CommandContext context) {
-        context.getAdminManager().setSslFipsEnabled(sslFipsEnabled);
+        context.getAdminManager().setSslFipsEnabled(sslFipsEnabled, context.getAppConfig().getAppServicesPort());
     }
 
     public boolean isSslFipsEnabled() {

src/main/java/com/marklogic/mgmt/admin/AdminManager.java

@@ -169,25 +169,25 @@ private void waitForRestartInternal(int attempt) {
     }
 
     /**
-     * Set whether SSL FIPS is enabled on the cluster or not by running against /v1/eval on 8000.
+     * Set whether SSL FIPS is enabled on the cluster or not by running against /v1/eval on the given appServicesPort.
      */
-    public void setSslFipsEnabled(final boolean enabled) {
+    public void setSslFipsEnabled(final boolean enabled, final int appServicesPort) {
         final String xquery = "import module namespace admin = 'http://marklogic.com/xdmp/admin' at '/MarkLogic/admin.xqy'; "
                 + "admin:save-configuration(admin:cluster-set-ssl-fips-enabled(admin:get-configuration(), " + enabled
                 + "()))";
 
         invokeActionRequiringRestart(new ActionRequiringRestart() {
             @Override
             public boolean execute() {
-                RestTemplate rt = RestTemplateUtil.newRestTemplate(adminConfig.getHost(), 8000,
+                RestTemplate rt = RestTemplateUtil.newRestTemplate(adminConfig.getHost(), appServicesPort,
                         adminConfig.getUsername(), adminConfig.getPassword());
                 HttpHeaders headers = new HttpHeaders();
                 headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
                 MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
                 map.add("xquery", xquery);
                 HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<MultiValueMap<String, String>>(map,
                         headers);
-                String url = format("http://%s:8000/v1/eval", adminConfig.getHost());
+                String url = format("http://%s:%d/v1/eval", adminConfig.getHost(), appServicesPort);
                 if (logger.isInfoEnabled()) {
                     logger.info("Setting SSL FIPS enabled: " + enabled);
                 }
@@ -215,5 +215,4 @@ public void setWaitForRestartCheckInterval(int waitForRestartCheckInterval) {
     public void setWaitForRestartLimit(int waitForRestartLimit) {
         this.waitForRestartLimit = waitForRestartLimit;
     }
-
 }

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

@@ -57,6 +57,7 @@ public void allProperties() {
         p.setProperty("mlSimpleSsl", "anyvalue");
         p.setProperty("mlModulesDatabaseName", "my-modules");
         p.setProperty("mlGroupName", "other-group");
+        p.setProperty("mlAppServicesPort", "8123");
 
         sut = new DefaultAppConfigFactory(new SimplePropertySource(p));
         AppConfig config = sut.newAppConfig();
@@ -77,6 +78,7 @@ public void allProperties() {
         assertNotNull(config.getRestSslHostnameVerifier());
         assertEquals("my-modules", config.getModulesDatabaseName());
         assertEquals("other-group", config.getGroupName());
+        assertEquals((Integer) 8123, config.getAppServicesPort());
     }
 
     @Test