QPID-4594,QPID-4682: rename BrokerOptions methods for overriding the HTTP/JMX/RMI ports in management mode to better match their function

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1479310 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 41 insertions, 47 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
index 239726ba63..d5f344f4ed 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
@@ -79,9 +79,9 @@ public class BrokerOptions
 
     private boolean _managementMode;
     private boolean _managementModeQuiesceVhosts;
-    private int _managementModeRmiPort;
-    private int _managementModeConnectorPort;
-    private int _managementModeHttpPort;
+    private int _managementModeRmiPortOverride;
+    private int _managementModeJmxPortOverride;
+    private int _managementModeHttpPortOverride;
     private String _managementModePassword;
     private boolean _skipLoggingConfiguration;
     private boolean _overwriteConfigurationStore;
@@ -136,34 +136,34 @@ public class BrokerOptions
         _managementModeQuiesceVhosts = managementModeQuiesceVhosts;
     }
 
-    public int getManagementModeRmiPort()
+    public int getManagementModeRmiPortOverride()
     {
-        return _managementModeRmiPort;
+        return _managementModeRmiPortOverride;
     }
 
-    public void setManagementModeRmiPort(int managementModeRmiPort)
+    public void setManagementModeRmiPortOverride(int managementModeRmiPortOverride)
     {
-        _managementModeRmiPort = managementModeRmiPort;
+        _managementModeRmiPortOverride = managementModeRmiPortOverride;
     }
 
-    public int getManagementModeConnectorPort()
+    public int getManagementModeJmxPortOverride()
     {
-        return _managementModeConnectorPort;
+        return _managementModeJmxPortOverride;
     }
 
-    public void setManagementModeConnectorPort(int managementModeConnectorPort)
+    public void setManagementModeJmxPortOverride(int managementModeJmxPortOverride)
     {
-        _managementModeConnectorPort = managementModeConnectorPort;
+        _managementModeJmxPortOverride = managementModeJmxPortOverride;
     }
 
-    public int getManagementModeHttpPort()
+    public int getManagementModeHttpPortOverride()
     {
-        return _managementModeHttpPort;
+        return _managementModeHttpPortOverride;
     }
 
-    public void setManagementModeHttpPort(int managementModeHttpPort)
+    public void setManagementModeHttpPortOverride(int managementModeHttpPortOverride)
     {
-        _managementModeHttpPort = managementModeHttpPort;
+        _managementModeHttpPortOverride = managementModeHttpPortOverride;
     }
 
     /**
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 66ef296a4b..3f6c3e7f78 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -271,17 +271,17 @@ public class Main
                 String rmiPort = _commandLine.getOptionValue(OPTION_MM_RMI_PORT.getOpt());
                 if (rmiPort != null)
                 {
-                    options.setManagementModeRmiPort(Integer.parseInt(rmiPort));
+                    options.setManagementModeRmiPortOverride(Integer.parseInt(rmiPort));
                 }
                 String connectorPort = _commandLine.getOptionValue(OPTION_MM_CONNECTOR_PORT.getOpt());
                 if (connectorPort != null)
                 {
-                    options.setManagementModeConnectorPort(Integer.parseInt(connectorPort));
+                    options.setManagementModeJmxPortOverride(Integer.parseInt(connectorPort));
                 }
                 String httpPort = _commandLine.getOptionValue(OPTION_MM_HTTP_PORT.getOpt());
                 if (httpPort != null)
                 {
-                    options.setManagementModeHttpPort(Integer.parseInt(httpPort));
+                    options.setManagementModeHttpPortOverride(Integer.parseInt(httpPort));
                 }
 
                 boolean quiesceVhosts = _commandLine.hasOption(OPTION_MM_QUIESCE_VHOST.getOpt());
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
index d08deee29b..823377f48c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
@@ -12,9 +12,6 @@ import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.ConfigurationEntry;
 import org.apache.qpid.server.configuration.ConfigurationEntryStore;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.AccessControlProvider;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.GroupProvider;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.State;
@@ -28,9 +25,6 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore
     private static final String MANAGEMENT_MODE_PORT_PREFIX = "MANAGEMENT-MODE-PORT-";
     private static final String PORT_TYPE = Port.class.getSimpleName();
     private static final String VIRTUAL_HOST_TYPE = VirtualHost.class.getSimpleName();
-    private static final String ACCESS_CONTROL_PROVIDER_TYPE = AccessControlProvider.class.getSimpleName();
-    private static final String GROUP_PROVIDER_TYPE = GroupProvider.class.getSimpleName();
-    private static final String AUTHENTICATION_PROVIDER_TYPE = AuthenticationProvider.class.getSimpleName();
     private static final String ATTRIBUTE_STATE = VirtualHost.STATE;
     private static final Object MANAGEMENT_MODE_AUTH_PROVIDER = "mm-auth";
 
@@ -171,40 +165,40 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore
 
     private Map<UUID, ConfigurationEntry> createPortsFromCommadLineOptions(BrokerOptions options)
     {
-        int managementModeRmiPort = options.getManagementModeRmiPort();
-        if (managementModeRmiPort < 0)
+        int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
+        if (managementModeRmiPortOverride < 0)
         {
-            throw new IllegalConfigurationException("Invalid rmi port is specified: " + managementModeRmiPort);
+            throw new IllegalConfigurationException("Invalid rmi port is specified: " + managementModeRmiPortOverride);
         }
-        int managementModeConnectorPort = options.getManagementModeConnectorPort();
-        if (managementModeConnectorPort < 0)
+        int managementModeJmxPortOverride = options.getManagementModeJmxPortOverride();
+        if (managementModeJmxPortOverride < 0)
         {
-            throw new IllegalConfigurationException("Invalid connector port is specified: " + managementModeConnectorPort);
+            throw new IllegalConfigurationException("Invalid jmx port is specified: " + managementModeJmxPortOverride);
         }
-        int managementModeHttpPort = options.getManagementModeHttpPort();
-        if (managementModeHttpPort < 0)
+        int managementModeHttpPortOverride = options.getManagementModeHttpPortOverride();
+        if (managementModeHttpPortOverride < 0)
         {
-            throw new IllegalConfigurationException("Invalid http port is specified: " + managementModeHttpPort);
+            throw new IllegalConfigurationException("Invalid http port is specified: " + managementModeHttpPortOverride);
         }
         Map<UUID, ConfigurationEntry> cliEntries = new HashMap<UUID, ConfigurationEntry>();
-        if (managementModeRmiPort != 0)
+        if (managementModeRmiPortOverride != 0)
         {
-            ConfigurationEntry entry = createCLIPortEntry(managementModeRmiPort, Protocol.RMI);
+            ConfigurationEntry entry = createCLIPortEntry(managementModeRmiPortOverride, Protocol.RMI);
             cliEntries.put(entry.getId(), entry);
-            if (managementModeConnectorPort == 0)
+            if (managementModeJmxPortOverride == 0)
             {
-                ConfigurationEntry connectorEntry = createCLIPortEntry(managementModeRmiPort + 100, Protocol.JMX_RMI);
+                ConfigurationEntry connectorEntry = createCLIPortEntry(managementModeRmiPortOverride + 100, Protocol.JMX_RMI);
                 cliEntries.put(connectorEntry.getId(), connectorEntry);
             }
         }
-        if (managementModeConnectorPort != 0)
+        if (managementModeJmxPortOverride != 0)
         {
-            ConfigurationEntry entry = createCLIPortEntry(managementModeConnectorPort, Protocol.JMX_RMI);
+            ConfigurationEntry entry = createCLIPortEntry(managementModeJmxPortOverride, Protocol.JMX_RMI);
             cliEntries.put(entry.getId(), entry);
         }
-        if (managementModeHttpPort != 0)
+        if (managementModeHttpPortOverride != 0)
         {
-            ConfigurationEntry entry = createCLIPortEntry(managementModeHttpPort, Protocol.HTTP);
+            ConfigurationEntry entry = createCLIPortEntry(managementModeHttpPortOverride, Protocol.HTTP);
             cliEntries.put(entry.getId(), entry);
         }
         return cliEntries;
@@ -246,9 +240,9 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore
     {
         Map<UUID, Object> quiescedEntries = new HashMap<UUID, Object>();
         Set<UUID> childrenIds;
-        int managementModeRmiPort = options.getManagementModeRmiPort();
-        int managementModeConnectorPort = options.getManagementModeConnectorPort();
-        int managementModeHttpPort = options.getManagementModeHttpPort();
+        int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
+        int managementModeJmxPortOverride = options.getManagementModeJmxPortOverride();
+        int managementModeHttpPortOverride = options.getManagementModeHttpPortOverride();
         childrenIds = storeRoot.getChildrenIds();
         for (UUID id : childrenIds)
         {
@@ -278,14 +272,14 @@ public class ManagementModeStoreHandler implements ConfigurationEntryStore
                         switch (protocol)
                         {
                         case JMX_RMI:
-                            quiesce = managementModeConnectorPort > 0 || managementModeRmiPort > 0;
+                            quiesce = managementModeJmxPortOverride > 0 || managementModeRmiPortOverride > 0;
                             break;
                         case RMI:
-                            quiesce = managementModeRmiPort > 0;
+                            quiesce = managementModeRmiPortOverride > 0;
                             break;
                         case HTTP:
                         case HTTPS:
-                            quiesce = managementModeHttpPort > 0;
+                            quiesce = managementModeHttpPortOverride > 0;
                             break;
                         default:
                             quiesce = true;