Removed JMSXUserID as it appears the new mina is conflicting.

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

4 files changed, 24 insertions, 24 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 25669c62d1..b05eba1e72 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -223,15 +223,15 @@ public class AMQChannel
                 _log.trace(debugIdentity() + "Content header received on channel " + _channelId);
             }
 
-            if (ENABLE_JMSXUserID)
-            {
-                //Set JMSXUserID
-                BasicContentHeaderProperties properties = (BasicContentHeaderProperties) contentHeaderBody.properties;
-                //fixme: fudge for QPID-677
-                properties.getHeaders().keySet();
-
-                properties.setUserId(protocolSession.getAuthorizedID().getName());
-            }
+//            if (ENABLE_JMSXUserID)
+//            {
+//                //Set JMSXUserID
+//                BasicContentHeaderProperties properties = (BasicContentHeaderProperties) contentHeaderBody.properties;
+//                //fixme: fudge for QPID-677
+//                properties.getHeaders().keySet();
+//
+//                properties.setUserId(protocolSession.getAuthorizedID().getName());
+//            }
 
             _currentMessage.setContentHeaderBody(contentHeaderBody);
             _currentMessage.setExpiration();
diff --git a/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java b/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
index 07d5d5dd32..f2fca322c6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
+++ b/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
@@ -31,8 +31,8 @@ public enum CustomJMSXProperty
     JMS_AMQP_NULL,

     JMS_QPID_DESTTYPE,

     JMSXGroupID,

-    JMSXGroupSeq,

-    JMSXUserID;

+    JMSXGroupSeq;

+//    JMSXUserID;

 

 

     private final AMQShortString _nameAsShortString;

diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index b029770946..7c14bd7132 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -392,17 +392,17 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
     public String getStringProperty(String propertyName) throws JMSException
     {
 
-        if (propertyName.startsWith("JMSX"))
-        {
-            //NOTE: if the JMSX Property is a non AMQP property then we must check _strictAMQP and throw as below.
-            if (propertyName.equals(CustomJMSXProperty.JMSXUserID.toString()))
-            {
-                return ((BasicContentHeaderProperties) _contentHeaderProperties).getUserIdAsString();
-            }
-
-            return null;
-        }
-        else
+//        if (propertyName.startsWith("JMSX"))
+//        {
+//            //NOTE: if the JMSX Property is a non AMQP property then we must check _strictAMQP and throw as below.
+//            if (propertyName.equals(CustomJMSXProperty.JMSXUserID.toString()))
+//            {
+//                return ((BasicContentHeaderProperties) _contentHeaderProperties).getUserIdAsString();
+//            }
+//
+//            return null;
+//        }
+//        else
         {
             if (_strictAMQP)
             {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index d2a7ba301b..df03945943 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -292,8 +292,8 @@ public class PropertyValueTest extends TestCase implements MessageListener
                               ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
 
             //JMSXUserID
-            Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
-                                m.getStringProperty("JMSXUserID"));
+//            Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
+//                                m.getStringProperty("JMSXUserID"));
         }
 
         received.clear();