Author: ritchiem
Date: Fri Dec 7 02:50:41 2007
New Revision: 602066
URL: http://svn.apache.org/viewvc?rev=602066&view=rev
Log:
Removed JMSXUserID as it appears the new mina is conflicting.
Modified:
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/branches/M2.1.1/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
Modified:
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=602066&r1=602065&r2=602066&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Fri Dec 7 02:50:41 2007
@@ -223,15 +223,15 @@
_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();
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java?rev=602066&r1=602065&r2=602066&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
Fri Dec 7 02:50:41 2007
@@ -31,8 +31,8 @@
JMS_AMQP_NULL,
JMS_QPID_DESTTYPE,
JMSXGroupID,
- JMSXGroupSeq,
- JMSXUserID;
+ JMSXGroupSeq;
+// JMSXUserID;
private final AMQShortString _nameAsShortString;
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=602066&r1=602065&r2=602066&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
Fri Dec 7 02:50:41 2007
@@ -392,17 +392,17 @@
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)
{
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?rev=602066&r1=602065&r2=602066&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
Fri Dec 7 02:50:41 2007
@@ -292,8 +292,8 @@
((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();
