Author: rgodfrey
Date: Mon Apr 16 08:43:24 2012
New Revision: 1326532
URL: http://svn.apache.org/viewvc?rev=1326532&view=rev
Log:
QPID-3949 : [Java AMQP 1.0] Update selector/no-local definitions to use new
descriptors
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java?rev=1326532&r1=1326531&r2=1326532&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
Mon Apr 16 08:43:24 2012
@@ -32,7 +32,8 @@ public class JMSSelectorFilterConstructo
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("amqp:jms-selector-filter:string"),
+ Symbol.valueOf("apache.org:jms-selector-filter:string"),
+ Long.valueOf(0x0000468C00000004L)
};
private static final JMSSelectorFilterConstructor INSTANCE = new
JMSSelectorFilterConstructor();
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java?rev=1326532&r1=1326531&r2=1326532&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
Mon Apr 16 08:43:24 2012
@@ -25,9 +25,7 @@ package org.apache.qpid.amqp_1_0.type.me
import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
import org.apache.qpid.amqp_1_0.codec.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.Symbol;
import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
-import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
public class JMSSelectorFilterWriter extends
AbstractDescribedTypeWriter<JMSSelectorFilter>
{
@@ -54,7 +52,7 @@ public class JMSSelectorFilterWriter ext
protected Object getDescriptor()
{
- return Symbol.valueOf("amqp:jms-selector-filter:string");
+ return 0x0000468C00000004L;
}
@Override
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java?rev=1326532&r1=1326531&r2=1326532&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
Mon Apr 16 08:43:24 2012
@@ -26,14 +26,13 @@ package org.apache.qpid.amqp_1_0.type.me
import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor;
import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry;
import org.apache.qpid.amqp_1_0.type.Symbol;
-import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
public class NoLocalFilterConstructor extends
DescribedTypeConstructor<NoLocalFilter>
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("amqp:no-local-filter:list"),
+ Symbol.valueOf("apache.org:jms-no-local-filter:list"),
0x0000468C00000003L
};
private static final NoLocalFilterConstructor INSTANCE = new
NoLocalFilterConstructor();
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java?rev=1326532&r1=1326531&r2=1326532&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
Mon Apr 16 08:43:24 2012
@@ -26,7 +26,6 @@ package org.apache.qpid.amqp_1_0.type.me
import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
import org.apache.qpid.amqp_1_0.codec.ListWriter;
import org.apache.qpid.amqp_1_0.codec.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.Symbol;
import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
public class NoLocalFilterWriter extends
AbstractDescribedTypeWriter<NoLocalFilter>
@@ -63,7 +62,7 @@ public class NoLocalFilterWriter extends
protected Object getDescriptor()
{
- return Symbol.valueOf("amqp:no-local-filter:list");
+ return 0x0000468C00000003L;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
