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, 50 insertions, 50 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
index 7d956881f5..40b253a049 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
@@ -157,37 +157,37 @@ public class BrokerOptionsTest extends QpidTestCase
         assertEquals(true, _options.isManagementModeQuiesceVirtualHosts());
     }
 
-    public void testDefaultManagementModeRmiPort()
+    public void testDefaultManagementModeRmiPortOverride()
     {
-        assertEquals(0, _options.getManagementModeRmiPort());
+        assertEquals(0, _options.getManagementModeRmiPortOverride());
     }
 
-    public void testOverriddenDefaultManagementModeRmiPort()
+    public void testOverriddenManagementModeRmiPort()
     {
-        _options.setManagementModeRmiPort(5555);
-        assertEquals(5555, _options.getManagementModeRmiPort());
+        _options.setManagementModeRmiPortOverride(5555);
+        assertEquals(5555, _options.getManagementModeRmiPortOverride());
     }
 
-    public void testDefaultManagementModeConnectorPort()
+    public void testDefaultManagementModeJmxPortOverride()
     {
-        assertEquals(0, _options.getManagementModeConnectorPort());
+        assertEquals(0, _options.getManagementModeJmxPortOverride());
     }
 
-    public void testOverriddenDefaultManagementModeConnectorPort()
+    public void testOverriddenManagementModeJmxPort()
     {
-        _options.setManagementModeConnectorPort(5555);
-        assertEquals(5555, _options.getManagementModeConnectorPort());
+        _options.setManagementModeJmxPortOverride(5555);
+        assertEquals(5555, _options.getManagementModeJmxPortOverride());
     }
 
-    public void testDefaultManagementModeHttpPort()
+    public void testDefaultManagementModeHttpPortOverride()
     {
-        assertEquals(0, _options.getManagementModeHttpPort());
+        assertEquals(0, _options.getManagementModeHttpPortOverride());
     }
 
-    public void testOverriddenDefaultManagementModeHttpPort()
+    public void testOverriddenManagementModeHttpPort()
     {
-        _options.setManagementModeHttpPort(5555);
-        assertEquals(5555, _options.getManagementModeHttpPort());
+        _options.setManagementModeHttpPortOverride(5555);
+        assertEquals(5555, _options.getManagementModeHttpPortOverride());
     }
 
     public void testDefaultSkipLoggingConfiguration()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
index 27ad5a0313..f3b1749808 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
@@ -55,9 +55,9 @@ public class MainTest extends QpidTestCase
         assertEquals(BrokerOptions.DEFAULT_INITIAL_CONFIG_LOCATION, options.getInitialConfigurationLocation());
         assertFalse(options.isOverwriteConfigurationStore());
         assertFalse(options.isManagementMode());
-        assertEquals(0, options.getManagementModeConnectorPort());
-        assertEquals(0, options.getManagementModeRmiPort());
-        assertEquals(0, options.getManagementModeHttpPort());
+        assertEquals(0, options.getManagementModeJmxPortOverride());
+        assertEquals(0, options.getManagementModeRmiPortOverride());
+        assertEquals(0, options.getManagementModeHttpPortOverride());
     }
 
     public void testConfigurationStoreLocation()
@@ -135,46 +135,46 @@ public class MainTest extends QpidTestCase
         assertTrue(options.isManagementMode());
     }
 
-    public void testManagementModeRmiPort()
+    public void testManagementModeRmiPortOverride()
     {
         BrokerOptions options = startDummyMain("-mm -mmrmi 7777");
         assertTrue(options.isManagementMode());
-        assertEquals(7777, options.getManagementModeRmiPort());
+        assertEquals(7777, options.getManagementModeRmiPortOverride());
 
         options = startDummyMain("-mm --management-mode-rmi-registry-port 7777");
         assertTrue(options.isManagementMode());
-        assertEquals(7777, options.getManagementModeRmiPort());
+        assertEquals(7777, options.getManagementModeRmiPortOverride());
 
         options = startDummyMain("-mmrmi 7777");
-        assertEquals(0, options.getManagementModeRmiPort());
+        assertEquals(0, options.getManagementModeRmiPortOverride());
     }
 
-    public void testManagementModeConnectorPort()
+    public void testManagementModeJmxPortOverride()
     {
         BrokerOptions options = startDummyMain("-mm -mmjmx 8888");
         assertTrue(options.isManagementMode());
-        assertEquals(8888, options.getManagementModeConnectorPort());
+        assertEquals(8888, options.getManagementModeJmxPortOverride());
 
         options = startDummyMain("-mm --management-mode-jmx-connector-port 8888");
         assertTrue(options.isManagementMode());
-        assertEquals(8888, options.getManagementModeConnectorPort());
+        assertEquals(8888, options.getManagementModeJmxPortOverride());
 
         options = startDummyMain("-mmjmx 8888");
-        assertEquals(0, options.getManagementModeConnectorPort());
+        assertEquals(0, options.getManagementModeJmxPortOverride());
     }
 
-    public void testManagementModeHttpPort()
+    public void testManagementModeHttpPortOverride()
     {
         BrokerOptions options = startDummyMain("-mm -mmhttp 9999");
         assertTrue(options.isManagementMode());
-        assertEquals(9999, options.getManagementModeHttpPort());
+        assertEquals(9999, options.getManagementModeHttpPortOverride());
 
         options = startDummyMain("-mm --management-mode-http-port 9999");
         assertTrue(options.isManagementMode());
-        assertEquals(9999, options.getManagementModeHttpPort());
+        assertEquals(9999, options.getManagementModeHttpPortOverride());
 
         options = startDummyMain("-mmhttp 9999");
-        assertEquals(0, options.getManagementModeHttpPort());
+        assertEquals(0, options.getManagementModeHttpPortOverride());
     }
 
     public void testManagementModePassword()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
index d9d3c9fe8f..a295753311 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
@@ -61,7 +61,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetRootEntryWithHttpPortOverriden()
     {
-        _options.setManagementModeHttpPort(9090);
+        _options.setManagementModeHttpPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
         ConfigurationEntry root = _handler.getRootEntry();
         assertEquals("Unexpected root id", _rootId, root.getId());
@@ -72,7 +72,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetRootEntryWithRmiPortOverriden()
     {
-        _options.setManagementModeRmiPort(9090);
+        _options.setManagementModeRmiPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
         ConfigurationEntry root = _handler.getRootEntry();
         assertEquals("Unexpected root id", _rootId, root.getId());
@@ -83,7 +83,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetRootEntryWithConnectorPortOverriden()
     {
-        _options.setManagementModeConnectorPort(9090);
+        _options.setManagementModeJmxPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
         ConfigurationEntry root = _handler.getRootEntry();
         assertEquals("Unexpected root id", _rootId, root.getId());
@@ -94,9 +94,9 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetRootEntryWithManagementPortsOverriden()
     {
-        _options.setManagementModeHttpPort(1000);
-        _options.setManagementModeRmiPort(2000);
-        _options.setManagementModeConnectorPort(3000);
+        _options.setManagementModeHttpPortOverride(1000);
+        _options.setManagementModeRmiPortOverride(2000);
+        _options.setManagementModeJmxPortOverride(3000);
         _handler = new ManagementModeStoreHandler(_store, _options);
         ConfigurationEntry root = _handler.getRootEntry();
         assertEquals("Unexpected root id", _rootId, root.getId());
@@ -122,7 +122,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetEntryByCLIConnectorPortId()
     {
-        _options.setManagementModeConnectorPort(9090);
+        _options.setManagementModeJmxPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         UUID optionsPort = getOptionsPortId();
@@ -132,7 +132,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testGetEntryByCLIHttpPortId()
     {
-        _options.setManagementModeHttpPort(9090);
+        _options.setManagementModeHttpPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         UUID optionsPort = getOptionsPortId();
@@ -145,7 +145,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP));
         when(_portEntry.getAttributes()).thenReturn(attributes);
-        _options.setManagementModeHttpPort(9090);
+        _options.setManagementModeHttpPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         ConfigurationEntry portEntry = _handler.getEntry(_portEntryId);
@@ -157,7 +157,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
         when(_portEntry.getAttributes()).thenReturn(attributes);
-        _options.setManagementModeRmiPort(9090);
+        _options.setManagementModeRmiPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         ConfigurationEntry portEntry = _handler.getEntry(_portEntryId);
@@ -169,7 +169,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.JMX_RMI));
         when(_portEntry.getAttributes()).thenReturn(attributes);
-        _options.setManagementModeRmiPort(9090);
+        _options.setManagementModeRmiPortOverride(9090);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         ConfigurationEntry portEntry = _handler.getEntry(_portEntryId);
@@ -226,9 +226,9 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testSavePort()
     {
-        _options.setManagementModeHttpPort(1000);
-        _options.setManagementModeRmiPort(2000);
-        _options.setManagementModeConnectorPort(3000);
+        _options.setManagementModeHttpPortOverride(1000);
+        _options.setManagementModeRmiPortOverride(2000);
+        _options.setManagementModeJmxPortOverride(3000);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         Map<String, Object> attributes = new HashMap<String, Object>();
@@ -241,9 +241,9 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testSaveRoot()
     {
-        _options.setManagementModeHttpPort(1000);
-        _options.setManagementModeRmiPort(2000);
-        _options.setManagementModeConnectorPort(3000);
+        _options.setManagementModeHttpPortOverride(1000);
+        _options.setManagementModeRmiPortOverride(2000);
+        _options.setManagementModeJmxPortOverride(3000);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         ConfigurationEntry root = _handler.getRootEntry();
@@ -257,7 +257,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testSaveCLIHttpPort()
     {
-        _options.setManagementModeHttpPort(1000);
+        _options.setManagementModeHttpPortOverride(1000);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         UUID portId = getOptionsPortId();
@@ -278,7 +278,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testRemove()
     {
-        _options.setManagementModeHttpPort(1000);
+        _options.setManagementModeHttpPortOverride(1000);
         _handler = new ManagementModeStoreHandler(_store, _options);
 
         _handler.remove(_portEntryId);
@@ -287,7 +287,7 @@ public class ManagementModeStoreHandlerTest extends QpidTestCase
 
     public void testRemoveCLIPort()
     {
-        _options.setManagementModeHttpPort(1000);
+        _options.setManagementModeHttpPortOverride(1000);
         _handler = new ManagementModeStoreHandler(_store, _options);
         UUID portId = getOptionsPortId();
         try