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

6 files changed, 6 insertions, 44 deletions

diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml
index 25fda69f68..6839f8cf9f 100644
--- a/java/broker/etc/config.xml
+++ b/java/broker/etc/config.xml
@@ -60,10 +60,7 @@
         </ssl>
     </management>
     <advanced>
-        <filterchain enableExecutorPool="true"/>
         <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
         <locale>en_US</locale>	
     </advanced>
 
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
diff --git a/java/systests/etc/config-systests-firewall-2.xml b/java/systests/etc/config-systests-firewall-2.xml
index a9fd86b8e5..5167d88f12 100644
--- a/java/systests/etc/config-systests-firewall-2.xml
+++ b/java/systests/etc/config-systests-firewall-2.xml
@@ -31,12 +31,12 @@
              To disasble Non-SSL port set sslOnly to true -->
         <ssl>
             <enabled>false</enabled>
+            <port>8672</port>
             <sslOnly>false</sslOnly>
             <keyStorePath>/path/to/keystore.ks</keyStorePath>
             <keyStorePassword>keystorepass</keyStorePassword>
         </ssl>
         <port>5672</port>
-        <sslport>8672</sslport>
         <socketReceiveBuffer>262144</socketReceiveBuffer>
         <socketSendBuffer>262144</socketSendBuffer>
     </connector>
@@ -44,12 +44,7 @@
         <enabled>false</enabled>
     </management>
     <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
         <locale>en_US</locale>	
     </advanced>
 
diff --git a/java/systests/etc/config-systests-firewall-3.xml b/java/systests/etc/config-systests-firewall-3.xml
index f0f3423f43..2bcbf53a39 100644
--- a/java/systests/etc/config-systests-firewall-3.xml
+++ b/java/systests/etc/config-systests-firewall-3.xml
@@ -31,12 +31,12 @@
              To disable Non-SSL port set sslOnly to true -->
         <ssl>
             <enabled>false</enabled>
+            <port>8672</port>
             <sslOnly>false</sslOnly>
             <keyStorePath>/path/to/keystore.ks</keyStorePath>
             <keyStorePassword>keystorepass</keyStorePassword>
         </ssl>
         <port>5672</port>
-        <sslport>8672</sslport>
         <socketReceiveBuffer>262144</socketReceiveBuffer>
         <socketSendBuffer>262144</socketSendBuffer>
     </connector>
@@ -44,12 +44,7 @@
         <enabled>false</enabled>
     </management>
     <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
         <locale>en_US</locale>	
     </advanced>
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
index b11a091148..dee593b12b 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
@@ -37,7 +37,7 @@ import java.util.List;
  *
  * BRK-1001 : Startup : Version: <Version> Build: <Build>
  * BRK-1002 : Starting : Listening on <Transport> port <Port>
- * BRK-1003 : Shuting down : <Transport> port <Port>
+ * BRK-1003 : Shutting down : <Transport> port <Port>
  * BRK-1004 : Ready
  * BRK-1005 : Stopped
  * BRK-1006 : Using configuration : <path>
@@ -807,7 +807,7 @@ public class BrokerLoggingTest extends AbstractTestLogging
             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();