diff options
author | Keith Wall <kwall@apache.org> | 2012-01-28 16:23:04 +0000 |
---|---|---|
committer | Keith Wall <kwall@apache.org> | 2012-01-28 16:23:04 +0000 |
commit | 9bb75aae85d397bd9dd98c8230de3e576ce97572 (patch) | |
tree | 9bca2b6c015693d588a0e2809894e1f6ffcba60d /java/broker/src | |
parent | be57a571ef2b008f95a6d01af8565381a47daa70 (diff) | |
download | qpid-python-9bb75aae85d397bd9dd98c8230de3e576ce97572.tar.gz |
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/qpid@1237088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src')
2 files changed, 2 insertions, 27 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 1f756b3e93..0f7fb513d6 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/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 class ServerConfiguration extends ConfigurationPlugin */ public ServerConfiguration(Configuration conf) { - _configuration = conf; + _configuration = conf; } /** @@ -473,7 +471,7 @@ public class ServerConfiguration extends ConfigurationPlugin { 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 class ServerConfiguration extends ConfigurationPlugin return getDoubleValue("heartbeat.timeoutFactor", 2.0); } - public int getDeliveryPoolSize() - { - return getIntValue("delivery.poolsize"); - } - public long getMaximumMessageAge() { return getLongValue("maximumMessageAge"); @@ -699,11 +692,6 @@ public class ServerConfiguration extends ConfigurationPlugin return getBooleanValue("connector.tcpNoDelay", true); } - public boolean getEnableExecutorPool() - { - return getBooleanValue("advanced.filterchain[@enableExecutorPool]"); - } - public boolean getEnableSSL() { return getBooleanValue("connector.ssl.enabled"); diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index 77dd61c869..81de6be703 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -491,19 +491,6 @@ public class ServerConfigurationTest extends QpidTestCase 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 |