diff options
6 files changed, 91 insertions, 97 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java index 239726ba63..d5f344f4ed 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java +++ b/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/java/broker/src/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java index 66ef296a4b..3f6c3e7f78 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/Main.java +++ b/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/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java index d08deee29b..823377f48c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java +++ b/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; diff --git a/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java index 7d956881f5..40b253a049 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java +++ b/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/java/broker/src/test/java/org/apache/qpid/server/MainTest.java b/java/broker/src/test/java/org/apache/qpid/server/MainTest.java index 27ad5a0313..f3b1749808 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/MainTest.java +++ b/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/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java index d9d3c9fe8f..a295753311 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java +++ b/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 |