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

3 files changed, 4 insertions, 14 deletions

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();