Author: rgodfrey
Date: Mon Apr 16 10:44:03 2012
New Revision: 1326555
URL: http://svn.apache.org/viewvc?rev=1326555&view=rev
Log:
QPID-3949 : [Java AMQP 1.0] Fix descriptors on filters
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
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/MatchingSubjectFilterConstructor.java
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.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/ExactSubjectFilterConstructor.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/ExactSubjectFilterConstructor.java?rev=1326555&r1=1326554&r2=1326555&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
Mon Apr 16 10:44:03 2012
@@ -32,7 +32,7 @@ public class ExactSubjectFilterConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("amqp:exact-subject-filter:string"),
+ Symbol.valueOf("apache.org:legacy-amqp-direct-binding:string"),
0x0000468C00000000L
};
private static final ExactSubjectFilterConstructor INSTANCE = new
ExactSubjectFilterConstructor();
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.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/ExactSubjectFilterWriter.java?rev=1326555&r1=1326554&r2=1326555&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
Mon Apr 16 10:44:03 2012
@@ -25,7 +25,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.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.Symbol;
import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
public class ExactSubjectFilterWriter extends
AbstractDescribedTypeWriter<ExactSubjectFilter>
@@ -53,7 +52,7 @@ public class ExactSubjectFilterWriter ex
protected Object getDescriptor()
{
- return Symbol.valueOf("amqp:exact-subject-filter:string");
+ return 0x0000468C00000000L;
}
@Override
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=1326555&r1=1326554&r2=1326555&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 10:44:03 2012
@@ -26,6 +26,7 @@ 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.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
public class JMSSelectorFilterConstructor extends
DescribedTypeConstructor<JMSSelectorFilter>
@@ -33,7 +34,7 @@ public class JMSSelectorFilterConstructo
private static final Object[] DESCRIPTORS =
{
Symbol.valueOf("apache.org:jms-selector-filter:string"),
- Long.valueOf(0x0000468C00000004L)
+ UnsignedLong.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=1326555&r1=1326554&r2=1326555&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 10:44:03 2012
@@ -25,6 +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.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
public class JMSSelectorFilterWriter extends
AbstractDescribedTypeWriter<JMSSelectorFilter>
@@ -52,7 +53,7 @@ public class JMSSelectorFilterWriter ext
protected Object getDescriptor()
{
- return 0x0000468C00000004L;
+ return UnsignedLong.valueOf(0x0000468C00000004L);
}
@Override
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.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/MatchingSubjectFilterConstructor.java?rev=1326555&r1=1326554&r2=1326555&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
Mon Apr 16 10:44:03 2012
@@ -26,13 +26,14 @@ 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.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
public class MatchingSubjectFilterConstructor extends
DescribedTypeConstructor<MatchingSubjectFilter>
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("amqp:matching-subject-filter:string"),
+ Symbol.valueOf("apache.org:legacy-amqp-topic-binding:string"),
UnsignedLong.valueOf(0x0000468C00000001L)
};
private static final MatchingSubjectFilterConstructor INSTANCE = new
MatchingSubjectFilterConstructor();
Modified:
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.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/MatchingSubjectFilterWriter.java?rev=1326555&r1=1326554&r2=1326555&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
Mon Apr 16 10:44:03 2012
@@ -25,7 +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.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
public class MatchingSubjectFilterWriter extends
AbstractDescribedTypeWriter<MatchingSubjectFilter>
@@ -53,7 +53,7 @@ public class MatchingSubjectFilterWriter
protected Object getDescriptor()
{
- return Symbol.valueOf("amqp:matching-subject-filter:string");
+ return UnsignedLong.valueOf(0x0000468C00000001L);
}
@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=1326555&r1=1326554&r2=1326555&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 10:44:03 2012
@@ -26,13 +26,14 @@ 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.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
public class NoLocalFilterConstructor extends
DescribedTypeConstructor<NoLocalFilter>
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.org:jms-no-local-filter:list"),
0x0000468C00000003L
+ Symbol.valueOf("apache.org:jms-no-local-filter:list"),
UnsignedLong.valueOf(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=1326555&r1=1326554&r2=1326555&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 10:44:03 2012
@@ -26,6 +26,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.ListWriter;
import org.apache.qpid.amqp_1_0.codec.ValueWriter;
+import org.apache.qpid.amqp_1_0.type.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
public class NoLocalFilterWriter extends
AbstractDescribedTypeWriter<NoLocalFilter>
@@ -62,7 +63,7 @@ public class NoLocalFilterWriter extends
protected Object getDescriptor()
{
- return 0x0000468C00000003L;
+ return UnsignedLong.valueOf(0x0000468C00000003L);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
