Author: orudyy
Date: Wed Nov 7 18:15:05 2012
New Revision: 1406747
URL: http://svn.apache.org/viewvc?rev=1406747&view=rev
Log:
QPID-4390: WIP - Replace JMX management configuration entry
'useCustomRMISocketFactory' with JVM system property
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXConfiguration.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXConfiguration.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXConfiguration.java
Wed Nov 7 18:15:05 2012
@@ -22,25 +22,18 @@ package org.apache.qpid.server.jmx;
public class JMXConfiguration
{
- private final boolean _useCustomRMISocketFactory;
private final boolean _platformMBeanServer;
private final String _managementKeyStorePath;
private final String _managementKeyStorePassword;
- public JMXConfiguration(boolean useCustomRMISocketFactory, boolean
platformMBeanServer, String managementKeyStorePath,
+ public JMXConfiguration( boolean platformMBeanServer, String
managementKeyStorePath,
String managementKeyStorePassword)
{
- _useCustomRMISocketFactory = useCustomRMISocketFactory;
_platformMBeanServer = platformMBeanServer;
_managementKeyStorePath = managementKeyStorePath;
_managementKeyStorePassword = managementKeyStorePassword;
}
- public boolean isUseCustomRMISocketFactory()
- {
- return _useCustomRMISocketFactory;
- }
-
public boolean isPlatformMBeanServer()
{
return _platformMBeanServer;
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
Wed Nov 7 18:15:05 2012
@@ -64,12 +64,13 @@ import java.util.HashMap;
*/
public class JMXManagedObjectRegistry implements ManagedObjectRegistry
{
+ public static final String USE_CUSTOM_RMI_SOCKET_FACTORY =
"qpid.use_custom_rmi_socket_factory";
+
private static final Logger _log =
Logger.getLogger(JMXManagedObjectRegistry.class);
private static final String OPERATIONAL_LOGGING_NAME = "JMX";
private final MBeanServer _mbeanServer;
- private final boolean _useCustomSocketFactory;
private JMXConnectorServer _cs;
private Registry _rmiRegistry;
@@ -87,8 +88,6 @@ public class JMXManagedObjectRegistry im
_registryPort = registryPort;
_connectorPort = connectorPort;
- // Retrieve the config parameters
- _useCustomSocketFactory =
jmxConfiguration.isUseCustomRMISocketFactory();
boolean platformServer = jmxConfiguration.isPlatformMBeanServer();
_mbeanServer =
@@ -163,13 +162,15 @@ public class JMXManagedObjectRegistry im
HashMap<String,Object> connectorEnv = new HashMap<String,Object>();
connectorEnv.put(JMXConnectorServer.AUTHENTICATOR, rmipa);
+ System.setProperty("java.rmi.server.randomIDs", "true");
+ boolean useCustomSocketFactory =
Boolean.parseBoolean(System.getProperty(USE_CUSTOM_RMI_SOCKET_FACTORY,
Boolean.TRUE.toString()));
+
/*
* Start a RMI registry on the management port, to hold the JMX RMI
ConnectorServer stub.
* Using custom socket factory to prevent anyone (including us
unfortunately) binding to the registry using RMI.
* As a result, only binds made using the object reference will
succeed, thus securing it from external change.
*/
- System.setProperty("java.rmi.server.randomIDs", "true");
- _rmiRegistry = createRmiRegistry(jmxPortRegistryServer,
_useCustomSocketFactory);
+ _rmiRegistry = createRmiRegistry(jmxPortRegistryServer,
useCustomSocketFactory);
/*
* We must now create the RMI ConnectorServer manually, as the JMX
Factory methods use RMI calls
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
Wed Nov 7 18:15:05 2012
@@ -33,7 +33,6 @@ public class JMXManagementFactory implem
{
private static final Logger LOGGER =
Logger.getLogger(JMXManagementFactory.class);
- public static final String USE_CUSTOM_RMI_SOCKET_FACTORY =
"useCustomRMISocketFactory";
public static final String USE_PLATFORM_MBEAN_SERVER =
"usePlatformMBeanServer";
public static final String KEY_STORE_PATH = "keyStorePath";
public static final String KEY_STORE_PASSWORD = "keyStorePassword";
@@ -46,7 +45,6 @@ public class JMXManagementFactory implem
if (PLUGIN_NAME.equals(attributes.get(PLUGIN_TYPE)))
{
JMXConfiguration jmxConfiguration = new JMXConfiguration(
- getBooleanAttribute(USE_CUSTOM_RMI_SOCKET_FACTORY,
attributes, false),
getBooleanAttribute(USE_PLATFORM_MBEAN_SERVER, attributes,
true),
getStringAttribute(KEY_STORE_PATH, attributes, null),
getStringAttribute(KEY_STORE_PASSWORD, attributes, null));
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Wed Nov 7 18:15:05 2012
@@ -63,7 +63,7 @@ public class ServerConfiguration extends
public static final int DEFAULT_HTTP_MANAGEMENT_PORT = 8080;
public static final int DEFAULT_HTTPS_MANAGEMENT_PORT = 8443;
public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 30000l;
- public static final String SKIP_SIGHUP_HANDLER_REGISTRATION =
"qpid.skip_sighup_handler_registration";
+
public static final String USE_CUSTOM_RMI_SOCKET_FACTORY =
"qpid.use_custom_rmi_socket_factory";
public static final String QPID_HOME = "QPID_HOME";
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
Wed Nov 7 18:15:05 2012
@@ -331,7 +331,6 @@ public class XMLConfigurationEntryStore
attributes.put(PluginFactory.PLUGIN_TYPE, "MANAGEMENT-JMX");
attributes.put("keyStorePath",
serverConfiguration.getManagementKeyStorePath());
attributes.put("keyStorePassword",
serverConfiguration.getManagementKeyStorePassword());
- attributes.put("useCustomRMISocketFactory",
serverConfiguration.getUseCustomRMISocketFactory());
attributes.put("usePlatformMBeanServer",
serverConfiguration.getPlatformMbeanserver());
ConfigurationEntry entry = new
ConfigurationEntry(UUID.randomUUID(), ConfiguredObjectType.PLUGIN, attributes,
null, this);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
Wed Nov 7 18:15:05 2012
@@ -266,6 +266,7 @@ public class ManagementLoggingTest exten
{
if (isJavaBroker())
{
+ setSystemProperty("qpid.use_custom_rmi_socket_factory", "false");
startBrokerAndCreateMonitor(true, false);
final JMXTestUtils jmxUtils = new JMXTestUtils(this);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java?rev=1406747&r1=1406746&r2=1406747&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
Wed Nov 7 18:15:05 2012
@@ -77,7 +77,8 @@ public class JMXTestUtils
public void setUp() throws IOException, ConfigurationException, Exception
{
- _test.setConfigurationProperty("management.enabled", "true");
+ _test.setConfigurationProperty("management.enabled", "true");
+ _test.setSystemProperty("qpid.use_custom_rmi_socket_factory", "false");
}
public void open() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
