You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2011/08/16 13:33:56 UTC
svn commit: r1158212 [2/2] - in /qpid/branches/rg-amqp-1-0-sandbox/qpid/java:
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/
amqp-1-0-common/src/main/java/org/apache/qpid...
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java Tue Aug 16 11:33:54 2011
@@ -37,31 +37,31 @@ public class AmqpError
private final Symbol _val;
- public static final AmqpError INTERNAL_ERROR = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:internal-error"));
+ public static final AmqpError INTERNAL_ERROR = new AmqpError(Symbol.valueOf("amqp:internal-error"));
- public static final AmqpError NOT_FOUND = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:not-found"));
+ public static final AmqpError NOT_FOUND = new AmqpError(Symbol.valueOf("amqp:not-found"));
- public static final AmqpError UNAUTHORIZED_ACCESS = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:unauthorized-access"));
+ public static final AmqpError UNAUTHORIZED_ACCESS = new AmqpError(Symbol.valueOf("amqp:unauthorized-access"));
- public static final AmqpError DECODE_ERROR = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:decode-error"));
+ public static final AmqpError DECODE_ERROR = new AmqpError(Symbol.valueOf("amqp:decode-error"));
- public static final AmqpError RESOURCE_LIMIT_EXCEEDED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:resource-limit-exceeded"));
+ public static final AmqpError RESOURCE_LIMIT_EXCEEDED = new AmqpError(Symbol.valueOf("amqp:resource-limit-exceeded"));
- public static final AmqpError NOT_ALLOWED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:not-allowed"));
+ public static final AmqpError NOT_ALLOWED = new AmqpError(Symbol.valueOf("amqp:not-allowed"));
- public static final AmqpError INVALID_FIELD = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:invalid-field"));
+ public static final AmqpError INVALID_FIELD = new AmqpError(Symbol.valueOf("amqp:invalid-field"));
- public static final AmqpError NOT_IMPLEMENTED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:not-implemented"));
+ public static final AmqpError NOT_IMPLEMENTED = new AmqpError(Symbol.valueOf("amqp:not-implemented"));
- public static final AmqpError RESOURCE_LOCKED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:resource-locked"));
+ public static final AmqpError RESOURCE_LOCKED = new AmqpError(Symbol.valueOf("amqp:resource-locked"));
- public static final AmqpError PRECONDITION_FAILED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:precondition-failed"));
+ public static final AmqpError PRECONDITION_FAILED = new AmqpError(Symbol.valueOf("amqp:precondition-failed"));
- public static final AmqpError RESOURCE_DELETED = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:resource-deleted"));
+ public static final AmqpError RESOURCE_DELETED = new AmqpError(Symbol.valueOf("amqp:resource-deleted"));
- public static final AmqpError ILLEGAL_STATE = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:illegal-state"));
+ public static final AmqpError ILLEGAL_STATE = new AmqpError(Symbol.valueOf("amqp:illegal-state"));
- public static final AmqpError FRAME_SIZE_TOO_SMALL = new AmqpError(Symbol.valueOf("apache.qpid.amqp_1_0:frame-size-too-small"));
+ public static final AmqpError FRAME_SIZE_TOO_SMALL = new AmqpError(Symbol.valueOf("amqp:frame-size-too-small"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java Tue Aug 16 11:33:54 2011
@@ -37,11 +37,11 @@ public class ConnectionError
private final Symbol _val;
- public static final ConnectionError CONNECTION_FORCED = new ConnectionError(Symbol.valueOf("apache.qpid.amqp_1_0:connection:forced"));
+ public static final ConnectionError CONNECTION_FORCED = new ConnectionError(Symbol.valueOf("amqp:connection:forced"));
- public static final ConnectionError FRAMING_ERROR = new ConnectionError(Symbol.valueOf("apache.qpid.amqp_1_0:connection:framing-error"));
+ public static final ConnectionError FRAMING_ERROR = new ConnectionError(Symbol.valueOf("amqp:connection:framing-error"));
- public static final ConnectionError REDIRECT = new ConnectionError(Symbol.valueOf("apache.qpid.amqp_1_0:connection:redirect"));
+ public static final ConnectionError REDIRECT = new ConnectionError(Symbol.valueOf("amqp:connection:redirect"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java Tue Aug 16 11:33:54 2011
@@ -37,15 +37,15 @@ public class LinkError
private final Symbol _val;
- public static final LinkError DETACH_FORCED = new LinkError(Symbol.valueOf("apache.qpid.amqp_1_0:link:detach-forced"));
+ public static final LinkError DETACH_FORCED = new LinkError(Symbol.valueOf("amqp:link:detach-forced"));
- public static final LinkError TRANSFER_LIMIT_EXCEEDED = new LinkError(Symbol.valueOf("apache.qpid.amqp_1_0:link:transfer-limit-exceeded"));
+ public static final LinkError TRANSFER_LIMIT_EXCEEDED = new LinkError(Symbol.valueOf("amqp:link:transfer-limit-exceeded"));
- public static final LinkError MESSAGE_SIZE_EXCEEDED = new LinkError(Symbol.valueOf("apache.qpid.amqp_1_0:link:message-size-exceeded"));
+ public static final LinkError MESSAGE_SIZE_EXCEEDED = new LinkError(Symbol.valueOf("amqp:link:message-size-exceeded"));
- public static final LinkError REDIRECT = new LinkError(Symbol.valueOf("apache.qpid.amqp_1_0:link:redirect"));
+ public static final LinkError REDIRECT = new LinkError(Symbol.valueOf("amqp:link:redirect"));
- public static final LinkError STOLEN = new LinkError(Symbol.valueOf("apache.qpid.amqp_1_0:link:stolen"));
+ public static final LinkError STOLEN = new LinkError(Symbol.valueOf("amqp:link:stolen"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java Tue Aug 16 11:33:54 2011
@@ -37,13 +37,13 @@ public class SessionError
private final Symbol _val;
- public static final SessionError WINDOW_VIOLATION = new SessionError(Symbol.valueOf("apache.qpid.amqp_1_0:session:window-violation"));
+ public static final SessionError WINDOW_VIOLATION = new SessionError(Symbol.valueOf("amqp:session:window-violation"));
- public static final SessionError ERRANT_LINK = new SessionError(Symbol.valueOf("apache.qpid.amqp_1_0:session:errant-link"));
+ public static final SessionError ERRANT_LINK = new SessionError(Symbol.valueOf("amqp:session:errant-link"));
- public static final SessionError HANDLE_IN_USE = new SessionError(Symbol.valueOf("apache.qpid.amqp_1_0:session:handle-in-use"));
+ public static final SessionError HANDLE_IN_USE = new SessionError(Symbol.valueOf("amqp:session:handle-in-use"));
- public static final SessionError UNATTACHED_HANDLE = new SessionError(Symbol.valueOf("apache.qpid.amqp_1_0:session:unattached-handle"));
+ public static final SessionError UNATTACHED_HANDLE = new SessionError(Symbol.valueOf("amqp:session:unattached-handle"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class AttachConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:attach:list"),UnsignedLong.valueOf(0x0000000000000012L),
+ Symbol.valueOf("amqp:attach:list"),UnsignedLong.valueOf(0x0000000000000012L),
};
private static final AttachConstructor INSTANCE = new AttachConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class BeginConstructor extends De
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:begin:list"),UnsignedLong.valueOf(0x0000000000000011L),
+ Symbol.valueOf("amqp:begin:list"),UnsignedLong.valueOf(0x0000000000000011L),
};
private static final BeginConstructor INSTANCE = new BeginConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class CloseConstructor extends De
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:close:list"),UnsignedLong.valueOf(0x0000000000000018L),
+ Symbol.valueOf("amqp:close:list"),UnsignedLong.valueOf(0x0000000000000018L),
};
private static final CloseConstructor INSTANCE = new CloseConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DetachConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:detach:list"),UnsignedLong.valueOf(0x0000000000000016L),
+ Symbol.valueOf("amqp:detach:list"),UnsignedLong.valueOf(0x0000000000000016L),
};
private static final DetachConstructor INSTANCE = new DetachConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DispositionConstructor exte
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:disposition:list"),UnsignedLong.valueOf(0x0000000000000015L),
+ Symbol.valueOf("amqp:disposition:list"),UnsignedLong.valueOf(0x0000000000000015L),
};
private static final DispositionConstructor INSTANCE = new DispositionConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class EndConstructor extends Desc
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:end:list"),UnsignedLong.valueOf(0x0000000000000017L),
+ Symbol.valueOf("amqp:end:list"),UnsignedLong.valueOf(0x0000000000000017L),
};
private static final EndConstructor INSTANCE = new EndConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class ErrorConstructor extends De
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:error:list"),UnsignedLong.valueOf(0x000000000000001dL),
+ Symbol.valueOf("amqp:error:list"),UnsignedLong.valueOf(0x000000000000001dL),
};
private static final ErrorConstructor INSTANCE = new ErrorConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class FlowConstructor extends Des
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:flow:list"),UnsignedLong.valueOf(0x0000000000000013L),
+ Symbol.valueOf("amqp:flow:list"),UnsignedLong.valueOf(0x0000000000000013L),
};
private static final FlowConstructor INSTANCE = new FlowConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class OpenConstructor extends Des
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:open:list"),UnsignedLong.valueOf(0x0000000000000010L),
+ Symbol.valueOf("amqp:open:list"),UnsignedLong.valueOf(0x0000000000000010L),
};
private static final OpenConstructor INSTANCE = new OpenConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class TransferConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:transfer:list"),UnsignedLong.valueOf(0x0000000000000014L),
+ Symbol.valueOf("amqp:transfer:list"),UnsignedLong.valueOf(0x0000000000000014L),
};
private static final TransferConstructor INSTANCE = new TransferConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java Tue Aug 16 11:33:54 2011
@@ -496,6 +496,10 @@ public class MessageMetaData_1_0 impleme
return _appProperties != null && _appProperties.containsKey(name);
}
+ public String getSubject()
+ {
+ return _properties == null ? null : _properties.getSubject();
+ }
}
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java Tue Aug 16 11:33:54 2011
@@ -31,7 +31,7 @@ import org.apache.qpid.server.txn.Server
import java.util.ArrayList;
import java.util.Arrays;
-public class ExchangeDestination implements ReceivingDestination
+public class ExchangeDestination implements ReceivingDestination, SendingDestination
{
private static final Accepted ACCEPTED = new Accepted();
private static final Outcome[] OUTCOMES = { ACCEPTED };
@@ -87,4 +87,9 @@ public class ExchangeDestination impleme
// TODO - fix
return 20000;
}
+
+ public Exchange getExchange()
+ {
+ return _exchange;
+ }
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java Tue Aug 16 11:33:54 2011
@@ -54,7 +54,7 @@ public class Message_1_0 implements Serv
}
else
{
- return null;
+ return getMessageHeader().getSubject();
}
}
@@ -63,7 +63,7 @@ public class Message_1_0 implements Serv
return _storedMessage.getMetaData();
}
- public AMQMessageHeader getMessageHeader()
+ public MessageMetaData_1_0.MessageHeader_1_0 getMessageHeader()
{
return getMessageMetaData().getMessageHeader();
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Tue Aug 16 11:33:54 2011
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v1_0;
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.AMQSecurityException;
import org.apache.qpid.amqp_1_0.transport.DeliveryStateHandler;
import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
import org.apache.qpid.amqp_1_0.transport.SendingLinkEndpoint;
@@ -33,7 +35,12 @@ import org.apache.qpid.amqp_1_0.type.mes
import org.apache.qpid.amqp_1_0.type.transport.Detach;
import org.apache.qpid.amqp_1_0.type.transport.Transfer;
import org.apache.qpid.AMQException;
+import org.apache.qpid.server.exchange.DirectExchange;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -67,28 +74,89 @@ public class SendingLink_1_0 implements
_vhost = vhost;
_destination = destination;
_linkAttachment = linkAttachment;
- _durability = ((Source)linkAttachment.getSource()).getDurable();
+ final Source source = (Source) linkAttachment.getSource();
+ _durability = source.getDurable();
linkAttachment.setDeliveryStateHandler(this);
+ QueueDestination qd = null;
+ AMQQueue queue = null;
if(destination instanceof QueueDestination)
{
- AMQQueue queue = ((QueueDestination) _destination).getQueue();
+ queue = ((QueueDestination) _destination).getQueue();
if(queue.getArguments().containsKey("topic"))
{
- ((Source)linkAttachment.getSource()).setDistributionMode(StdDistMode.COPY);
+ source.setDistributionMode(StdDistMode.COPY);
}
- _subscription = new Subscription_1_0(this, (QueueDestination)destination);
+ qd = (QueueDestination) destination;
+ source.setFilter(null);
+
+ }
+ else if(destination instanceof ExchangeDestination)
+ {
try
{
+ queue = AMQQueueFactory.createAMQQueueImpl(UUID.randomUUID().toString(), false, null, true,
+ false, _vhost, Collections.EMPTY_MAP);
+ Exchange exchange = ((ExchangeDestination) destination).getExchange();
+
+ String binding = "";
- queue.registerSubscription(_subscription, false);
+ Map filters = source.getFilter();
+
+ if(filters != null && !filters.isEmpty())
+ {
+
+ source.setFilter(null);
+ if(exchange.getType() == DirectExchange.TYPE)
+ {
+ if(filters.size() == 1 && filters.values().iterator().next() instanceof ExactSubjectFilter)
+ {
+ ExactSubjectFilter filter = (ExactSubjectFilter) filters.values().iterator().next();
+ source.setFilter(filters);
+ binding = filter.getValue();
+ }
+ }
+ else if(exchange.getType() == TopicExchange.TYPE)
+ {
+ if(filters.size() == 1 && filters.values().iterator().next() instanceof MatchingSubjectFilter)
+ {
+ MatchingSubjectFilter filter = (MatchingSubjectFilter) filters.values().iterator().next();
+ source.setFilter(filters);
+ binding = filter.getValue();
+ }
+ }
+ }
+
+ vhost.getBindingFactory().addBinding(binding,queue,exchange,null);
+ source.setDistributionMode(StdDistMode.COPY);
+
+ qd = new QueueDestination(queue);
}
- catch (AMQException e)
+ catch (AMQSecurityException e)
{
- e.printStackTrace(); //TODO
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ catch (AMQInternalException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
+
+
}
+ _subscription = new Subscription_1_0(this, qd);
+
+ try
+ {
+
+ queue.registerSubscription(_subscription, false);
+ }
+ catch (AMQException e)
+ {
+ e.printStackTrace(); //TODO
+ }
+
+
}
public void resume(SendingLinkAttachment linkAttachment)
@@ -107,7 +175,9 @@ public class SendingLink_1_0 implements
try
{
- ((QueueDestination)_destination).getQueue().unregisterSubscription(_subscription);
+
+ _subscription.getQueue().unregisterSubscription(_subscription);
+
}
catch (AMQException e)
{
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Tue Aug 16 11:33:54 2011
@@ -102,11 +102,23 @@ public class Session_1_0 implements Sess
{
destination = new QueueDestination(queue);
+
+
+
}
else
{
- endpoint.setSource(null);
- destination = null;
+ Exchange exchg = _vhost.getExchangeRegistry().getExchange(addr);
+ if(exchg != null)
+ {
+ destination = new ExchangeDestination(exchg);
+ }
+ else
+ {
+
+ endpoint.setSource(null);
+ destination = null;
+ }
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org