Merged revisions 632054-632055,632070 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r632054 | ritchiem | 2008-02-28 16:51:12 +0000 (Thu, 28 Feb 2008) | 1 line
  
  QPID-821 Set default to false for MultiIO and Buffer Limiting.
........
  r632055 | ritchiem | 2008-02-28 16:58:43 +0000 (Thu, 28 Feb 2008) | 1 line
  
  QPID-822 Set default to false for JMSXUserID.
........
  r632070 | ritchiem | 2008-02-28 17:38:20 +0000 (Thu, 28 Feb 2008) | 1 line
  
  QPID-822 Setting default to false for JMSXUserID cause this test to fail. Now test only validates the JMSXUserID if it exists.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@632074 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 16 insertions, 10 deletions

diff --git a/qpid/java/broker/etc/acl.config.xml b/qpid/java/broker/etc/acl.config.xml
index 4de8168fcc..701b71dbec 100644
--- a/qpid/java/broker/etc/acl.config.xml
+++ b/qpid/java/broker/etc/acl.config.xml
@@ -52,7 +52,7 @@
         <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>true</enableJMSXUserID>
+        <enableJMSXUserID>false</enableJMSXUserID>
     </advanced>
 
     <security>
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
index 6c650b95eb..5c665e9216 100644
--- a/qpid/java/broker/etc/config.xml
+++ b/qpid/java/broker/etc/config.xml
@@ -32,8 +32,8 @@
             <keystorePath>/path/to/keystore.ks</keystorePath>
             <keystorePassword>keystorepass</keystorePassword>
         </ssl>-->
-        <qpidnio>true</qpidnio>
-        <protectio>true</protectio>
+        <qpidnio>false</qpidnio>
+        <protectio>false</protectio>
         <transport>nio</transport>
         <port>5672</port>
         <sslport>8672</sslport>
@@ -51,6 +51,7 @@
         <enableDirectBuffers>false</enableDirectBuffers>
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
+        <enableJMSXUserID>false</enableJMSXUserID>
     </advanced>
 
     <security>
diff --git a/qpid/java/broker/etc/persistent_config.xml b/qpid/java/broker/etc/persistent_config.xml
index 5b3151e6fc..14ce3adab2 100644
--- a/qpid/java/broker/etc/persistent_config.xml
+++ b/qpid/java/broker/etc/persistent_config.xml
@@ -28,7 +28,6 @@
     <work>${QPID_WORK}</work>
     <conf>${prefix}/etc</conf>
     <connector>
-        <qpidnio>true</qpidnio>
         <transport>nio</transport>
         <port>5672</port>
         <sslport>8672</sslport>
diff --git a/qpid/java/broker/etc/transient_config.xml b/qpid/java/broker/etc/transient_config.xml
index fcffd90ba2..bba963f983 100644
--- a/qpid/java/broker/etc/transient_config.xml
+++ b/qpid/java/broker/etc/transient_config.xml
@@ -28,7 +28,6 @@
     <work>${QPID_WORK}</work>
     <conf>${prefix}/etc</conf>
     <connector>
-        <qpidnio>true</qpidnio>
         <transport>nio</transport>
         <port>5672</port>
         <sslport>8672</sslport>
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 482d353b4a..d38a78a1f5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -119,7 +119,7 @@ public class AMQChannel
     private boolean _closing;
 
     @Configured(path = "advanced.enableJMSXUserID",
-                defaultValue = "true")
+                defaultValue = "false")
     public boolean ENABLE_JMSXUserID;
 
     public AMQChannel(AMQProtocolSession session, int channelId, TransactionManager transactionManager,
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
index 1dcbb02d5c..23aaf56876 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
@@ -94,7 +94,7 @@ public class ConnectorConfiguration
     public String certType;
 
     @Configured(path = "connector.qpidnio",
-                defaultValue = "true")
+                defaultValue = "false")
     public boolean _multiThreadNIO;
 
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index a158a681b9..96001ca7b8 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -213,7 +213,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter
             e.printStackTrace();
         }
 
-        if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio"))
+        if (Boolean.getBoolean("protectio"))
         {
             try
             {
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index 795a9c24b6..0a95dc29ba 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
@@ -122,7 +122,7 @@ public class TransportConnection
                     {
                         SocketConnector result;
                         // FIXME - this needs to be sorted to use the new Mina MultiThread SA.
-                        if (!System.getProperties().containsKey("qpidnio") || Boolean.getBoolean("qpidnio"))
+                        if (Boolean.getBoolean("qpidnio"))
                         {
                             _logger.warn("Using Qpid MultiThreaded NIO - " + (System.getProperties().containsKey("qpidnio")
                                                                  ? "Qpid NIO is new default"
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 881a8cff2b..dbc6283a3a 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -287,7 +287,14 @@ public class PropertyValueTest extends QpidTestCase implements MessageListener
             ((AMQMessage) m).setVoidProperty(new AMQShortString("void"));
 
             Assert.assertTrue("Check void properties are correctly transported",
-                ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
+                              ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
+
+            //JMSXUserID
+            if (m.getStringProperty("JMSXUserID") != null)
+            {
+                Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
+                                    m.getStringProperty("JMSXUserID"));
+            }
         }
 
         received.clear();