From ebb3caff09b7856990df34ef58ac1ddf08781170 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sat, 28 Jan 2012 16:23:04 +0000 Subject: [PATCH] QPID-3788: Remove remaining MINA configuration keys (and those from other retired impls) from the Java Broker's config.xml * Remove remaining references to MINA transport configuration keys: enableDirectBuffers/enablePooledAllocator/filterchain from code and example config files. * Remove references to compressBufferOnQueue from config XMLs. The implementation that used it was removed back in 2007 by QPID-275. * Remove references to broker-side configuration key enableJMSXUserID. This broker feature was removed by QPID-943 (which replaced the functionality with an equivilent client-side option). The old Broker side key plays no part in the client-side function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237088 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/etc/config.xml | 3 --- .../configuration/ServerConfiguration.java | 16 ++-------------- .../configuration/ServerConfigurationTest.java | 13 ------------- .../systests/etc/config-systests-firewall-2.xml | 7 +------ .../systests/etc/config-systests-firewall-3.xml | 7 +------ .../qpid/server/logging/BrokerLoggingTest.java | 4 ++-- 6 files changed, 6 insertions(+), 44 deletions(-) diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 25fda69f689..6839f8cf9ff 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -60,10 +60,7 @@ - 65535 - false - false en_US diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 1f756b3e936..0f7fb513d68 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -88,7 +88,6 @@ public class ServerConfiguration extends ConfigurationPlugin { envVarMap.put("QPID_PORT", "connector.port"); - envVarMap.put("QPID_ENABLEDIRECTBUFFERS", "advanced.enableDirectBuffers"); envVarMap.put("QPID_SSLPORT", "connector.ssl.port"); envVarMap.put("QPID_JMXPORT_REGISTRYSERVER", MGMT_JMXPORT_REGISTRYSERVER); envVarMap.put("QPID_JMXPORT_CONNECTORSERVER", MGMT_JMXPORT_CONNECTORSERVER); @@ -109,7 +108,6 @@ public class ServerConfiguration extends ConfigurationPlugin envVarMap.put("QPID_SOCKETRECEIVEBUFFER", "connector.socketReceiveBuffer"); envVarMap.put("QPID_SOCKETWRITEBUFFER", "connector.socketWriteBuffer"); envVarMap.put("QPID_TCPNODELAY", "connector.tcpNoDelay"); - envVarMap.put("QPID_ENABLEPOOLEDALLOCATOR", "advanced.enablePooledAllocator"); envVarMap.put("QPID_STATUS-UPDATES", "status-updates"); } @@ -178,7 +176,7 @@ public void handle() */ public ServerConfiguration(Configuration conf) { - _configuration = conf; + _configuration = conf; } /** @@ -473,7 +471,7 @@ public void reparseConfigFileSecuritySections() throws ConfigurationException { VirtualHost vhost = vhostRegistry.getVirtualHost(hostName); Configuration vhostConfig = newVhosts.subset("virtualhost." + hostName); - vhost.getConfiguration().setConfiguration("virtualhosts.virtualhost", vhostConfig); // XXX + vhost.getConfiguration().setConfiguration("virtualhosts.virtualhost", vhostConfig); vhost.getSecurityManager().configureGlobalPlugins(this); vhost.getSecurityManager().configureHostPlugins(vhost.getConfiguration()); } @@ -609,11 +607,6 @@ public double getHeartBeatTimeout() return getDoubleValue("heartbeat.timeoutFactor", 2.0); } - public int getDeliveryPoolSize() - { - return getIntValue("delivery.poolsize"); - } - public long getMaximumMessageAge() { return getLongValue("maximumMessageAge"); @@ -699,11 +692,6 @@ public boolean getTcpNoDelay() return getBooleanValue("connector.tcpNoDelay", true); } - public boolean getEnableExecutorPool() - { - return getBooleanValue("advanced.filterchain[@enableExecutorPool]"); - } - public boolean getEnableSSL() { return getBooleanValue("connector.ssl.enabled"); diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index 77dd61c869e..81de6be7030 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -491,19 +491,6 @@ public void testGetTcpNoDelay() throws ConfigurationException assertEquals(false, _serverConfig.getTcpNoDelay()); } - public void testGetEnableExecutorPool() throws ConfigurationException - { - // Check default - _serverConfig.initialise(); - assertEquals(false, _serverConfig.getEnableExecutorPool()); - - // Check value we set - _config.setProperty("advanced.filterchain[@enableExecutorPool]", true); - _serverConfig = new ServerConfiguration(_config); - _serverConfig.initialise(); - assertEquals(true, _serverConfig.getEnableExecutorPool()); - } - public void testGetEnableSSL() throws ConfigurationException { // Check default diff --git a/qpid/java/systests/etc/config-systests-firewall-2.xml b/qpid/java/systests/etc/config-systests-firewall-2.xml index a9fd86b8e5e..5167d88f126 100644 --- a/qpid/java/systests/etc/config-systests-firewall-2.xml +++ b/qpid/java/systests/etc/config-systests-firewall-2.xml @@ -31,12 +31,12 @@ To disasble Non-SSL port set sslOnly to true --> false + 8672 false /path/to/keystore.ks keystorepass 5672 - 8672 262144 262144 @@ -44,12 +44,7 @@ false - - false - false 65535 - false - false en_US diff --git a/qpid/java/systests/etc/config-systests-firewall-3.xml b/qpid/java/systests/etc/config-systests-firewall-3.xml index f0f3423f43a..2bcbf53a39a 100644 --- a/qpid/java/systests/etc/config-systests-firewall-3.xml +++ b/qpid/java/systests/etc/config-systests-firewall-3.xml @@ -31,12 +31,12 @@ To disable Non-SSL port set sslOnly to true --> false + 8672 false /path/to/keystore.ks keystorepass 5672 - 8672 262144 262144 @@ -44,12 +44,7 @@ false - - false - false 65535 - false - false en_US diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java index b11a0911489..dee593b12b1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java @@ -37,7 +37,7 @@ * * BRK-1001 : Startup : Version: Build: * BRK-1002 : Starting : Listening on port - * BRK-1003 : Shuting down : port + * BRK-1003 : Shutting down : port * BRK-1004 : Ready * BRK-1005 : Stopped * BRK-1006 : Using configuration : @@ -807,7 +807,7 @@ public void testBrokerShutdownListeningTCPSSL() throws Exception setConfigurationProperty("connector.ssl.keyStorePath", getConfigurationStringProperty("management.ssl.keyStorePath")); setConfigurationProperty("connector.ssl.keyStorePassword", getConfigurationStringProperty("management.ssl.keyStorePassword")); - Integer sslPort = Integer.parseInt(getConfigurationStringProperty("connector.sslport")); + Integer sslPort = Integer.parseInt(getConfigurationStringProperty("connector.ssl.port")); startBroker();