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 [1/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...
Author: rgodfrey
Date: Tue Aug 16 11:33:54 2011
New Revision: 1158212
URL: http://svn.apache.org/viewvc?rev=1158212&view=rev
Log:
NO-JIRA : Add consuming from exchanges, filters for 0-x style bindings
Added:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java
- copied, changed from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
- copied, changed from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
- copied, changed from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
Removed:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/messaging/Predicate.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Predicate.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryState.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryStateConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryStateWriter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FilterConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FilterWriter.java
Modified:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java
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
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
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
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
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
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
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
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
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
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
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
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
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
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
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receive.java Tue Aug 16 11:33:54 2011
@@ -21,9 +21,15 @@
package org.apache.qpid.amqp_1_0.client;
+import org.apache.qpid.amqp_1_0.type.Symbol;
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
import org.apache.qpid.amqp_1_0.type.UnsignedLong;
import org.apache.commons.cli.*;
+import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
+import org.apache.qpid.amqp_1_0.type.messaging.Filter;
+import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
+
+import java.util.Collections;
public class Receive extends Util
{
@@ -102,6 +108,12 @@ public class Receive extends Util
return true;
}
+ @Override
+ protected boolean hasFilterOption()
+ {
+ return true;
+ }
+
protected void run()
{
@@ -116,9 +128,28 @@ public class Receive extends Util
Session session = conn.createSession();
+ Filter filter = null;
+ if(getFilter() != null)
+ {
+ String[] filterParts = getFilter().split("=",2);
+ if("exact-subject".equals(filterParts[0]))
+ {
+ filter = new ExactSubjectFilter(filterParts[1]);
+ }
+ else if("matching-subject".equals(filterParts[0]))
+ {
+ filter = new MatchingSubjectFilter(filterParts[1]);
+ }
+ else
+ {
+ System.err.println("Unknown filter type: " + filterParts[0]);
+ }
+ }
-
- Receiver r = session.createReceiver(queue, getMode(), getLinkName(), isDurableLink());
+ Receiver r =
+ filter == null
+ ? session.createReceiver(queue, getMode(), getLinkName(), isDurableLink())
+ : session.createReceiver(queue, getMode(), getLinkName(), isDurableLink(), Collections.singletonMap(Symbol.valueOf("filter"), filter), null);
Transaction txn = null;
int credit = 0;
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java Tue Aug 16 11:33:54 2011
@@ -49,70 +49,6 @@ public class Receiver implements Deliver
private Queue<Transfer> _prefetchQueue = new ConcurrentLinkedQueue<Transfer>();
private Map<Binary, SettledAction> _unsettledMap = new HashMap<Binary, SettledAction>();
-
-
- public Receiver(final Session session, final String linkName, final String targetAddr, final String sourceAddr)
- {
- this(session, linkName, targetAddr, sourceAddr, null);
- }
- public Receiver(final Session session, final String linkName, final String targetAddr, final String sourceAddr, DistributionMode mode)
- {
- this(session, linkName, targetAddr, sourceAddr, mode, AcknowledgeMode.ALO);
- }
-
-
- public Receiver(final Session session,
- final String linkName,
- final String targetAddr,
- final String sourceAddr,
- final DistributionMode distMode,
- final AcknowledgeMode ackMode)
- {
- this(session, linkName, createTarget(targetAddr), createSource(sourceAddr, distMode), ackMode);
-
- }
-
- public Receiver(final Session session,
- final String linkName,
- final String targetAddr,
- final String sourceAddr,
- final DistributionMode distMode,
- final AcknowledgeMode ackMode,
- boolean isDurable)
- {
- this(session, linkName, createTarget(targetAddr), createSource(sourceAddr, distMode), ackMode, isDurable);
- }
-
-
- public Receiver(final Session session,
- final String linkName,
- final String targetAddr,
- final String sourceAddr,
- final DistributionMode distMode,
- final AcknowledgeMode ackMode,
- boolean isDurable,
- Map<Binary, Outcome> unsettled)
- {
- this(session, linkName, createTarget(targetAddr), createSource(sourceAddr, distMode), ackMode, isDurable,
- unsettled);
- }
-
-
- private static Source createSource(final String sourceAddr, final DistributionMode distMode)
- {
- Source source = new Source();
- source.setAddress(sourceAddr);
- source.setDistributionMode(distMode);
- return source;
- }
-
- private static Target createTarget(final String targetAddr)
- {
- Target target = new Target();
- target.setAddress(targetAddr);
- return target;
- }
-
public Receiver(final Session session,
final String linkName,
final Target target,
@@ -121,6 +57,7 @@ public class Receiver implements Deliver
{
this(session, linkName, target, source, ackMode, false);
}
+
public Receiver(final Session session,
final String linkName,
final Target target,
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Session.java Tue Aug 16 11:33:54 2011
@@ -29,6 +29,8 @@ import org.apache.qpid.amqp_1_0.transpor
import org.apache.qpid.amqp_1_0.type.Binary;
import org.apache.qpid.amqp_1_0.type.DistributionMode;
import org.apache.qpid.amqp_1_0.type.Outcome;
+import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.amqp_1_0.type.messaging.Filter;
import org.apache.qpid.amqp_1_0.type.messaging.Source;
import org.apache.qpid.amqp_1_0.type.messaging.StdDistMode;
import org.apache.qpid.amqp_1_0.type.messaging.Target;
@@ -123,6 +125,13 @@ public class Session
return createReceiver(queue, null, mode, linkName, isDurable);
}
+ public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName, boolean isDurable,
+ Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
+ {
+ return createReceiver(queue, null, mode, linkName, isDurable, filters, unsettled);
+ }
+
+
public Receiver createReceiver(final String queue, final AcknowledgeMode mode, String linkName,
boolean isDurable, Map<Binary, Outcome> unsettled)
{
@@ -163,13 +172,30 @@ public class Session
final AcknowledgeMode ackMode, String linkName, boolean isDurable,
Map<Binary, Outcome> unsettled)
{
+ return createReceiver(sourceAddr,mode,ackMode, linkName, isDurable, null, unsettled);
+ }
+
+ private synchronized Receiver createReceiver(final String sourceAddr, DistributionMode mode,
+ final AcknowledgeMode ackMode, String linkName, boolean isDurable,
+ Map<Symbol, Filter> filters, Map<Binary, Outcome> unsettled)
+ {
+
+ final Target target = new Target();
+ final Source source = new Source();
+ source.setAddress(sourceAddr);
+ source.setDistributionMode(mode);
+ source.setFilter(filters);
+
+ if(linkName == null)
+ {
+ linkName = sourceAddr + "-> (" + UUID.randomUUID().toString() + ")";
+ }
final Receiver receiver =
- new Receiver(this, linkName == null
- ? sourceAddr + "-> (" + UUID.randomUUID().toString() + ")"
- : linkName,
- null, sourceAddr, mode, ackMode, isDurable, unsettled);
+ new Receiver(this, linkName,
+ target, source, ackMode, isDurable, unsettled);
_receivers.add(receiver);
+
return receiver;
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java?rev=1158212&r1=1158211&r2=1158212&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java Tue Aug 16 11:33:54 2011
@@ -51,6 +51,7 @@ public abstract class Util
private boolean _useMultipleConnections;
private int _windowSize = 100;
private String _subject;
+ private String _filter;
protected Util(String[] args)
{
@@ -120,6 +121,13 @@ public abstract class Util
.hasArg(false)
.create('Z'));
+ if(hasFilterOption())
+ options.addOption(OptionBuilder.withLongOpt("filter")
+ .withDescription("filter, e.g. exact-subject=hello; matching-subject=%.a.#")
+ .hasArg(true)
+ .withArgName("<TYPE>=<VALUE>")
+ .create('F'));
+
if(hasTxnOption())
{
@@ -224,6 +232,11 @@ public abstract class Util
_password = cmdLine.getOptionValue('w');
}
+ if(cmdLine.hasOption('F'))
+ {
+ _filter = cmdLine.getOptionValue('F');
+ }
+
_port = Integer.parseInt(portStr);
_containerName = cmdLine.getOptionValue('C');
@@ -327,6 +340,11 @@ public abstract class Util
}
+ protected boolean hasFilterOption()
+ {
+ return false;
+ }
+
protected boolean hasSubjectOption()
{
return false;
@@ -486,4 +504,9 @@ public abstract class Util
{
_windowSize = windowSize;
}
+
+ public String getFilter()
+ {
+ return _filter;
+ }
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.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/transport/ConnectionEndpoint.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/transport/ConnectionEndpoint.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java Tue Aug 16 11:33:54 2011
@@ -63,7 +63,7 @@ public class ConnectionEndpoint implemen
private Principal _user;
private static final short DEFAULT_CHANNEL_MAX = 255;
- private static final int DEFAULT_MAX_FRAME = Integer.getInteger("apache.qpid.amqp_1_0.max_frame_size",1<<15);
+ private static final int DEFAULT_MAX_FRAME = Integer.getInteger("amqp.max_frame_size",1<<15);
private ConnectionState _state = ConnectionState.UNOPENED;
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.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/codec/AMQPDescribedTypeRegistry.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/codec/AMQPDescribedTypeRegistry.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/codec/AMQPDescribedTypeRegistry.java Tue Aug 16 11:33:54 2011
@@ -181,6 +181,10 @@ public class AMQPDescribedTypeRegistry i
DeleteOnNoLinksWriter.register(registry);
DeleteOnNoMessagesWriter.register(registry);
DeleteOnNoLinksOrMessagesWriter.register(registry);
+
+
+ ExactSubjectFilterWriter.register(registry);
+ MatchingSubjectFilterWriter.register(registry);
}
private static void registerTransactionsWriters(final AMQPDescribedTypeRegistry registry)
@@ -244,6 +248,9 @@ public class AMQPDescribedTypeRegistry i
DeleteOnNoLinksConstructor.register(registry);
DeleteOnNoMessagesConstructor.register(registry);
DeleteOnNoLinksOrMessagesConstructor.register(registry);
+
+ ExactSubjectFilterConstructor.register(registry);
+ MatchingSubjectFilterConstructor.register(registry);
}
private static void registerTransactionsConstructors(final AMQPDescribedTypeRegistry registry)
Copied: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java (from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.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/messaging/ExactSubjectFilter.java?p2=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java&p1=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java&r1=1157750&r2=1158212&rev=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/messaging/AmqpValue.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/messaging/ExactSubjectFilter.java Tue Aug 16 11:33:54 2011
@@ -25,42 +25,30 @@ package org.apache.qpid.amqp_1_0.type.me
import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.amqp_1_0.type.Binary;
+import org.apache.qpid.amqp_1_0.type.Section;
+public class ExactSubjectFilter implements Filter
+{
-import org.apache.qpid.amqp_1_0.type.*;
-public class AmqpValue
- implements Section
- {
+ private final String _value;
-
- private final Object _value;
-
- public AmqpValue(Object value)
+ public ExactSubjectFilter(String value)
{
_value = value;
}
- public Object getValue()
+ public String getValue()
{
return _value;
}
-
-
- public Binary encode(final SectionEncoder encoder)
- {
- encoder.reset();
- encoder.encodeObject(this);
- return encoder.getEncoding();
- }
-
-
@Override
public String toString()
{
- return "AmqpValue{(" + _value.getClass().getName() + ')' + _value + '}';
+ return "ExactSubjectFilter{" + _value + '}';
}
- }
+}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.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/messaging/Filter.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/messaging/Filter.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/messaging/Filter.java Tue Aug 16 11:33:54 2011
@@ -23,65 +23,6 @@
package org.apache.qpid.amqp_1_0.type.messaging;
-
-
-import org.apache.qpid.amqp_1_0.type.*;
-
-public class Filter
- {
-
-
- private Symbol _type;
-
- private Predicate _predicate;
-
- public Symbol getType()
- {
- return _type;
- }
-
- public void setType(Symbol type)
- {
- _type = type;
- }
-
- public Predicate getPredicate()
- {
- return _predicate;
- }
-
- public void setPredicate(Predicate predicate)
- {
- _predicate = predicate;
- }
-
- @Override
- public String toString()
- {
- StringBuilder builder = new StringBuilder("Filter{");
- final int origLength = builder.length();
-
- if(_type != null)
- {
- if(builder.length() != origLength)
- {
- builder.append(',');
- }
- builder.append("type=").append(_type);
- }
-
- if(_predicate != null)
- {
- if(builder.length() != origLength)
- {
- builder.append(',');
- }
- builder.append("predicate=").append(_predicate);
- }
-
- builder.append('}');
- return builder.toString();
- }
-
-
- }
+public interface Filter
+{
+}
Added: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.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/messaging/MatchingSubjectFilter.java?rev=1158212&view=auto
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java (added)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java Tue Aug 16 11:33:54 2011
@@ -0,0 +1,53 @@
+
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+
+package org.apache.qpid.amqp_1_0.type.messaging;
+
+
+import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.amqp_1_0.type.Binary;
+import org.apache.qpid.amqp_1_0.type.Section;
+
+public class MatchingSubjectFilter implements Filter
+{
+
+
+
+ private final String _value;
+
+ public MatchingSubjectFilter(String value)
+ {
+ _value = value;
+ }
+
+ public String getValue()
+ {
+ return _value;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "MatchingSubjectFilter{" + _value + '}';
+ }
+ }
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.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/messaging/codec/AcceptedConstructor.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/messaging/codec/AcceptedConstructor.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/messaging/codec/AcceptedConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class AcceptedConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:accepted:list"),UnsignedLong.valueOf(0x0000000000000024L),
+ Symbol.valueOf("amqp:accepted:list"),UnsignedLong.valueOf(0x0000000000000024L),
};
private static final AcceptedConstructor INSTANCE = new AcceptedConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.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/messaging/codec/AmqpSequenceConstructor.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/messaging/codec/AmqpSequenceConstructor.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/messaging/codec/AmqpSequenceConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class AmqpSequenceConstructor ext
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:apache.qpid.amqp_1_0-sequence:list"),UnsignedLong.valueOf(0x0000000000000076L),
+ Symbol.valueOf("amqp:amqp-sequence:list"),UnsignedLong.valueOf(0x0000000000000076L),
};
private static final AmqpSequenceConstructor INSTANCE = new AmqpSequenceConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.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/messaging/codec/AmqpValueConstructor.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/messaging/codec/AmqpValueConstructor.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/messaging/codec/AmqpValueConstructor.java Tue Aug 16 11:33:54 2011
@@ -33,7 +33,7 @@ public class AmqpValueConstructor extend
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:apache.qpid.amqp_1_0-value:*"),UnsignedLong.valueOf(0x0000000000000077L),
+ Symbol.valueOf("amqp:amqp-value:*"),UnsignedLong.valueOf(0x0000000000000077L),
};
private static final AmqpValueConstructor INSTANCE = new AmqpValueConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.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/messaging/codec/ApplicationPropertiesConstructor.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/messaging/codec/ApplicationPropertiesConstructor.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/messaging/codec/ApplicationPropertiesConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class ApplicationPropertiesConstr
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:application-properties:map"),UnsignedLong.valueOf(0x0000000000000074L),
+ Symbol.valueOf("amqp:application-properties:map"),UnsignedLong.valueOf(0x0000000000000074L),
};
private static final ApplicationPropertiesConstructor INSTANCE = new ApplicationPropertiesConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.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/messaging/codec/DataConstructor.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/messaging/codec/DataConstructor.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/messaging/codec/DataConstructor.java Tue Aug 16 11:33:54 2011
@@ -33,7 +33,7 @@ public class DataConstructor extends Des
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:data:binary"),UnsignedLong.valueOf(0x0000000000000075L),
+ Symbol.valueOf("amqp:data:binary"),UnsignedLong.valueOf(0x0000000000000075L),
};
private static final DataConstructor INSTANCE = new DataConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.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/messaging/codec/DeleteOnCloseConstructor.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/messaging/codec/DeleteOnCloseConstructor.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/messaging/codec/DeleteOnCloseConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeleteOnCloseConstructor ex
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:delete-on-close:list"),UnsignedLong.valueOf(0x000000000000002bL),
+ Symbol.valueOf("amqp:delete-on-close:list"),UnsignedLong.valueOf(0x000000000000002bL),
};
private static final DeleteOnCloseConstructor INSTANCE = new DeleteOnCloseConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.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/messaging/codec/DeleteOnNoLinksConstructor.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/messaging/codec/DeleteOnNoLinksConstructor.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/messaging/codec/DeleteOnNoLinksConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeleteOnNoLinksConstructor
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:delete-on-no-links:list"),UnsignedLong.valueOf(0x000000000000002cL),
+ Symbol.valueOf("amqp:delete-on-no-links:list"),UnsignedLong.valueOf(0x000000000000002cL),
};
private static final DeleteOnNoLinksConstructor INSTANCE = new DeleteOnNoLinksConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeleteOnNoLinksOrMessagesCo
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:delete-on-no-links-or-messages:list"),UnsignedLong.valueOf(0x000000000000002eL),
+ Symbol.valueOf("amqp:delete-on-no-links-or-messages:list"),UnsignedLong.valueOf(0x000000000000002eL),
};
private static final DeleteOnNoLinksOrMessagesConstructor INSTANCE = new DeleteOnNoLinksOrMessagesConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.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/messaging/codec/DeleteOnNoMessagesConstructor.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/messaging/codec/DeleteOnNoMessagesConstructor.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/messaging/codec/DeleteOnNoMessagesConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeleteOnNoMessagesConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:delete-on-no-messages:list"),UnsignedLong.valueOf(0x000000000000002dL),
+ Symbol.valueOf("amqp:delete-on-no-messages:list"),UnsignedLong.valueOf(0x000000000000002dL),
};
private static final DeleteOnNoMessagesConstructor INSTANCE = new DeleteOnNoMessagesConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.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/messaging/codec/DeliveryAnnotationsConstructor.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/messaging/codec/DeliveryAnnotationsConstructor.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/messaging/codec/DeliveryAnnotationsConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeliveryAnnotationsConstruc
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:delivery-annotations:map"),UnsignedLong.valueOf(0x0000000000000071L),
+ Symbol.valueOf("amqp:delivery-annotations:map"),UnsignedLong.valueOf(0x0000000000000071L),
};
private static final DeliveryAnnotationsConstructor INSTANCE = new DeliveryAnnotationsConstructor();
Copied: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java (from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.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/messaging/codec/ExactSubjectFilterConstructor.java?p2=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java&p1=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java&r1=1157750&r2=1158212&rev=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/messaging/codec/AmqpValueConstructor.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/messaging/codec/ExactSubjectFilterConstructor.java Tue Aug 16 11:33:54 2011
@@ -25,18 +25,17 @@ 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.*;
-import org.apache.qpid.amqp_1_0.type.messaging.*;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
+import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
-public class AmqpValueConstructor extends DescribedTypeConstructor<AmqpValue>
+public class ExactSubjectFilterConstructor extends DescribedTypeConstructor<ExactSubjectFilter>
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:apache.qpid.amqp_1_0-value:*"),UnsignedLong.valueOf(0x0000000000000077L),
+ Symbol.valueOf("amqp:exact-subject-filter:string"),
};
- private static final AmqpValueConstructor INSTANCE = new AmqpValueConstructor();
+ private static final ExactSubjectFilterConstructor INSTANCE = new ExactSubjectFilterConstructor();
public static void register(DescribedTypeConstructorRegistry registry)
{
@@ -47,12 +46,12 @@ public class AmqpValueConstructor extend
}
- public AmqpValue construct(Object underlying)
+ public ExactSubjectFilter construct(Object underlying)
{
- if(underlying instanceof Object)
+ if(underlying instanceof String)
{
- return new AmqpValue((Object)underlying);
+ return new ExactSubjectFilter((String)underlying);
}
else
{
Copied: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java (from r1157750, qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.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/messaging/codec/ExactSubjectFilterWriter.java?p2=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java&p1=qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java&r1=1157750&r2=1158212&rev=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/messaging/codec/AmqpValueWriter.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/messaging/codec/ExactSubjectFilterWriter.java Tue Aug 16 11:33:54 2011
@@ -25,23 +25,22 @@ 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;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
-
-public class AmqpValueWriter extends AbstractDescribedTypeWriter<AmqpValue>
+public class ExactSubjectFilterWriter extends AbstractDescribedTypeWriter<ExactSubjectFilter>
{
- private AmqpValue _value;
+ private ExactSubjectFilter _value;
- public AmqpValueWriter(final Registry registry)
+ public ExactSubjectFilterWriter(final Registry registry)
{
super(registry);
}
@Override
- protected void onSetValue(final AmqpValue value)
+ protected void onSetValue(final ExactSubjectFilter value)
{
_value = value;
}
@@ -54,7 +53,7 @@ public class AmqpValueWriter extends Abs
protected Object getDescriptor()
{
- return UnsignedLong.valueOf(0x0000000000000077L);
+ return Symbol.valueOf("amqp:exact-subject-filter:string");
}
@Override
@@ -63,18 +62,18 @@ public class AmqpValueWriter extends Abs
return getRegistry().getValueWriter(_value.getValue());
}
- private static Factory<AmqpValue> FACTORY = new Factory<AmqpValue>()
+ private static Factory<ExactSubjectFilter> FACTORY = new Factory<ExactSubjectFilter>()
{
- public ValueWriter<AmqpValue> newInstance(Registry registry)
+ public ValueWriter<ExactSubjectFilter> newInstance(Registry registry)
{
- return new AmqpValueWriter(registry);
+ return new ExactSubjectFilterWriter(registry);
}
};
- public static void register(ValueWriter.Registry registry)
+ public static void register(Registry registry)
{
- registry.register(AmqpValue.class, FACTORY);
+ registry.register(ExactSubjectFilter.class, FACTORY);
}
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.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/messaging/codec/FooterConstructor.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/messaging/codec/FooterConstructor.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/messaging/codec/FooterConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class FooterConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:footer:map"),UnsignedLong.valueOf(0x0000000000000078L),
+ Symbol.valueOf("amqp:footer:map"),UnsignedLong.valueOf(0x0000000000000078L),
};
private static final FooterConstructor INSTANCE = new FooterConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.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/messaging/codec/HeaderConstructor.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/messaging/codec/HeaderConstructor.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/messaging/codec/HeaderConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class HeaderConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:header:list"),UnsignedLong.valueOf(0x0000000000000070L),
+ Symbol.valueOf("amqp:header:list"),UnsignedLong.valueOf(0x0000000000000070L),
};
private static final HeaderConstructor INSTANCE = new HeaderConstructor();
Added: qpid/branches/rg-amqp-1-0-sandbox/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/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java?rev=1158212&view=auto
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java (added)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java Tue Aug 16 11:33:54 2011
@@ -0,0 +1,64 @@
+
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+
+package org.apache.qpid.amqp_1_0.type.messaging.codec;
+
+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.MatchingSubjectFilter;
+
+public class MatchingSubjectFilterConstructor extends DescribedTypeConstructor<MatchingSubjectFilter>
+{
+ private static final Object[] DESCRIPTORS =
+ {
+ Symbol.valueOf("amqp:matching-subject-filter:string"),
+ };
+
+ private static final MatchingSubjectFilterConstructor INSTANCE = new MatchingSubjectFilterConstructor();
+
+ public static void register(DescribedTypeConstructorRegistry registry)
+ {
+ for(Object descriptor : DESCRIPTORS)
+ {
+ registry.register(descriptor, INSTANCE);
+ }
+ }
+
+
+ public MatchingSubjectFilter construct(Object underlying)
+ {
+
+ if(underlying instanceof String)
+ {
+ return new MatchingSubjectFilter((String)underlying);
+ }
+ else
+ {
+ // TODO - error
+ return null;
+ }
+ }
+
+
+}
Added: qpid/branches/rg-amqp-1-0-sandbox/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/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java?rev=1158212&view=auto
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java (added)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java Tue Aug 16 11:33:54 2011
@@ -0,0 +1,79 @@
+
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+
+package org.apache.qpid.amqp_1_0.type.messaging.codec;
+
+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.MatchingSubjectFilter;
+
+public class MatchingSubjectFilterWriter extends AbstractDescribedTypeWriter<MatchingSubjectFilter>
+{
+ private MatchingSubjectFilter _value;
+
+
+
+ public MatchingSubjectFilterWriter(final Registry registry)
+ {
+ super(registry);
+ }
+
+ @Override
+ protected void onSetValue(final MatchingSubjectFilter value)
+ {
+ _value = value;
+ }
+
+ @Override
+ protected void clear()
+ {
+ _value = null;
+ }
+
+ protected Object getDescriptor()
+ {
+ return Symbol.valueOf("amqp:matching-subject-filter:string");
+ }
+
+ @Override
+ protected ValueWriter createDescribedWriter()
+ {
+ return getRegistry().getValueWriter(_value.getValue());
+ }
+
+ private static Factory<MatchingSubjectFilter> FACTORY = new Factory<MatchingSubjectFilter>()
+ {
+
+ public ValueWriter<MatchingSubjectFilter> newInstance(Registry registry)
+ {
+ return new MatchingSubjectFilterWriter(registry);
+ }
+ };
+
+ public static void register(Registry registry)
+ {
+ registry.register(MatchingSubjectFilter.class, FACTORY);
+ }
+
+}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.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/messaging/codec/MessageAnnotationsConstructor.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/messaging/codec/MessageAnnotationsConstructor.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/messaging/codec/MessageAnnotationsConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class MessageAnnotationsConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:message-annotations:map"),UnsignedLong.valueOf(0x0000000000000072L),
+ Symbol.valueOf("amqp:message-annotations:map"),UnsignedLong.valueOf(0x0000000000000072L),
};
private static final MessageAnnotationsConstructor INSTANCE = new MessageAnnotationsConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.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/messaging/codec/ModifiedConstructor.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/messaging/codec/ModifiedConstructor.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/messaging/codec/ModifiedConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class ModifiedConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:modified:list"),UnsignedLong.valueOf(0x0000000000000027L),
+ Symbol.valueOf("amqp:modified:list"),UnsignedLong.valueOf(0x0000000000000027L),
};
private static final ModifiedConstructor INSTANCE = new ModifiedConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.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/messaging/codec/PropertiesConstructor.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/messaging/codec/PropertiesConstructor.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/messaging/codec/PropertiesConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class PropertiesConstructor exten
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:properties:list"),UnsignedLong.valueOf(0x0000000000000073L),
+ Symbol.valueOf("amqp:properties:list"),UnsignedLong.valueOf(0x0000000000000073L),
};
private static final PropertiesConstructor INSTANCE = new PropertiesConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.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/messaging/codec/ReceivedConstructor.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/messaging/codec/ReceivedConstructor.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/messaging/codec/ReceivedConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class ReceivedConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:received:list"),UnsignedLong.valueOf(0x0000000000000023L),
+ Symbol.valueOf("amqp:received:list"),UnsignedLong.valueOf(0x0000000000000023L),
};
private static final ReceivedConstructor INSTANCE = new ReceivedConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.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/messaging/codec/RejectedConstructor.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/messaging/codec/RejectedConstructor.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/messaging/codec/RejectedConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class RejectedConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:rejected:list"),UnsignedLong.valueOf(0x0000000000000025L),
+ Symbol.valueOf("amqp:rejected:list"),UnsignedLong.valueOf(0x0000000000000025L),
};
private static final RejectedConstructor INSTANCE = new RejectedConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.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/messaging/codec/ReleasedConstructor.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/messaging/codec/ReleasedConstructor.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/messaging/codec/ReleasedConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class ReleasedConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:released:list"),UnsignedLong.valueOf(0x0000000000000026L),
+ Symbol.valueOf("amqp:released:list"),UnsignedLong.valueOf(0x0000000000000026L),
};
private static final ReleasedConstructor INSTANCE = new ReleasedConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.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/messaging/codec/SourceConstructor.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/messaging/codec/SourceConstructor.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/messaging/codec/SourceConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class SourceConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:source:list"),UnsignedLong.valueOf(0x0000000000000028L),
+ Symbol.valueOf("amqp:source:list"),UnsignedLong.valueOf(0x0000000000000028L),
};
private static final SourceConstructor INSTANCE = new SourceConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.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/messaging/codec/TargetConstructor.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/messaging/codec/TargetConstructor.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/messaging/codec/TargetConstructor.java Tue Aug 16 11:33:54 2011
@@ -37,7 +37,7 @@ public class TargetConstructor extends D
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:target:list"),UnsignedLong.valueOf(0x0000000000000029L),
+ Symbol.valueOf("amqp:target:list"),UnsignedLong.valueOf(0x0000000000000029L),
};
private static final TargetConstructor INSTANCE = new TargetConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.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/security/codec/SaslChallengeConstructor.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/security/codec/SaslChallengeConstructor.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/security/codec/SaslChallengeConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class SaslChallengeConstructor ex
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:sasl-challenge:list"),UnsignedLong.valueOf(0x0000000000000042L),
+ Symbol.valueOf("amqp:sasl-challenge:list"),UnsignedLong.valueOf(0x0000000000000042L),
};
private static final SaslChallengeConstructor INSTANCE = new SaslChallengeConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.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/security/codec/SaslInitConstructor.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/security/codec/SaslInitConstructor.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/security/codec/SaslInitConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class SaslInitConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:sasl-init:list"),UnsignedLong.valueOf(0x0000000000000041L),
+ Symbol.valueOf("amqp:sasl-init:list"),UnsignedLong.valueOf(0x0000000000000041L),
};
private static final SaslInitConstructor INSTANCE = new SaslInitConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.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/security/codec/SaslMechanismsConstructor.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/security/codec/SaslMechanismsConstructor.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/security/codec/SaslMechanismsConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class SaslMechanismsConstructor e
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:sasl-mechanisms:list"),UnsignedLong.valueOf(0x0000000000000040L),
+ Symbol.valueOf("amqp:sasl-mechanisms:list"),UnsignedLong.valueOf(0x0000000000000040L),
};
private static final SaslMechanismsConstructor INSTANCE = new SaslMechanismsConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.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/security/codec/SaslOutcomeConstructor.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/security/codec/SaslOutcomeConstructor.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/security/codec/SaslOutcomeConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class SaslOutcomeConstructor exte
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:sasl-outcome:list"),UnsignedLong.valueOf(0x0000000000000044L),
+ Symbol.valueOf("amqp:sasl-outcome:list"),UnsignedLong.valueOf(0x0000000000000044L),
};
private static final SaslOutcomeConstructor INSTANCE = new SaslOutcomeConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.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/security/codec/SaslResponseConstructor.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/security/codec/SaslResponseConstructor.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/security/codec/SaslResponseConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class SaslResponseConstructor ext
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:sasl-response:list"),UnsignedLong.valueOf(0x0000000000000043L),
+ Symbol.valueOf("amqp:sasl-response:list"),UnsignedLong.valueOf(0x0000000000000043L),
};
private static final SaslResponseConstructor INSTANCE = new SaslResponseConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.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/transaction/TransactionErrors.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/transaction/TransactionErrors.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/transaction/TransactionErrors.java Tue Aug 16 11:33:54 2011
@@ -37,11 +37,11 @@ public class TransactionErrors
private final Symbol _val;
- public static final TransactionErrors UNKNOWN_ID = new TransactionErrors(Symbol.valueOf("apache.qpid.amqp_1_0:transaction:unknown-id"));
+ public static final TransactionErrors UNKNOWN_ID = new TransactionErrors(Symbol.valueOf("amqp:transaction:unknown-id"));
- public static final TransactionErrors TRANSACTION_ROLLBACK = new TransactionErrors(Symbol.valueOf("apache.qpid.amqp_1_0:transaction:rollback"));
+ public static final TransactionErrors TRANSACTION_ROLLBACK = new TransactionErrors(Symbol.valueOf("amqp:transaction:rollback"));
- public static final TransactionErrors TRANSACTION_TIMEOUT = new TransactionErrors(Symbol.valueOf("apache.qpid.amqp_1_0:transaction:timeout"));
+ public static final TransactionErrors TRANSACTION_TIMEOUT = new TransactionErrors(Symbol.valueOf("amqp:transaction:timeout"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.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/transaction/TxnCapabilities.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/transaction/TxnCapabilities.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/transaction/TxnCapabilities.java Tue Aug 16 11:33:54 2011
@@ -38,17 +38,17 @@ public class TxnCapabilities
private final Symbol _val;
- public static final TxnCapabilities LOCAL_TXN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:local-transactions"));
+ public static final TxnCapabilities LOCAL_TXN = new TxnCapabilities(Symbol.valueOf("amqp:local-transactions"));
- public static final TxnCapabilities DISTRIBUTED_TXN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:distributed-transactions"));
+ public static final TxnCapabilities DISTRIBUTED_TXN = new TxnCapabilities(Symbol.valueOf("amqp:distributed-transactions"));
- public static final TxnCapabilities PROMOTABLE_TXN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:promotable-transactions"));
+ public static final TxnCapabilities PROMOTABLE_TXN = new TxnCapabilities(Symbol.valueOf("amqp:promotable-transactions"));
- public static final TxnCapabilities MULTI_TXNS_PER_SSN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:multi-txns-per-ssn"));
+ public static final TxnCapabilities MULTI_TXNS_PER_SSN = new TxnCapabilities(Symbol.valueOf("amqp:multi-txns-per-ssn"));
- public static final TxnCapabilities MULTI_SSNS_PER_TXN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:multi-ssns-per-txn"));
+ public static final TxnCapabilities MULTI_SSNS_PER_TXN = new TxnCapabilities(Symbol.valueOf("amqp:multi-ssns-per-txn"));
- public static final TxnCapabilities MULTI_CONNS_PER_TXN = new TxnCapabilities(Symbol.valueOf("apache.qpid.amqp_1_0:multi-conns-per-txn"));
+ public static final TxnCapabilities MULTI_CONNS_PER_TXN = new TxnCapabilities(Symbol.valueOf("amqp:multi-conns-per-txn"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.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/transaction/TxnCapability.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/transaction/TxnCapability.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/transaction/TxnCapability.java Tue Aug 16 11:33:54 2011
@@ -37,15 +37,15 @@ public class TxnCapability
private final Symbol _val;
- public static final TxnCapability LOCAL_TXN = new TxnCapability(Symbol.valueOf("apache.qpid.amqp_1_0:local-transactions"));
+ public static final TxnCapability LOCAL_TXN = new TxnCapability(Symbol.valueOf("amqp:local-transactions"));
- public static final TxnCapability DISTRIBUTED_TXN = new TxnCapability(Symbol.valueOf("apache.qpid.amqp_1_0:distributed-transactions"));
+ public static final TxnCapability DISTRIBUTED_TXN = new TxnCapability(Symbol.valueOf("amqp:distributed-transactions"));
- public static final TxnCapability PROMOTABLE_TXN = new TxnCapability(Symbol.valueOf("apache.qpid.amqp_1_0:promotable-transactions"));
+ public static final TxnCapability PROMOTABLE_TXN = new TxnCapability(Symbol.valueOf("amqp:promotable-transactions"));
- public static final TxnCapability MULTI_TXNS_PER_SSN = new TxnCapability(Symbol.valueOf("apache.qpid.amqp_1_0:multi-txns-per-ssn"));
+ public static final TxnCapability MULTI_TXNS_PER_SSN = new TxnCapability(Symbol.valueOf("amqp:multi-txns-per-ssn"));
- public static final TxnCapability MULTI_SSNS_PER_TXN = new TxnCapability(Symbol.valueOf("apache.qpid.amqp_1_0:multi-ssns-per-txn"));
+ public static final TxnCapability MULTI_SSNS_PER_TXN = new TxnCapability(Symbol.valueOf("amqp:multi-ssns-per-txn"));
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.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/transaction/codec/CoordinatorConstructor.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/transaction/codec/CoordinatorConstructor.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/transaction/codec/CoordinatorConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class CoordinatorConstructor exte
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:coordinator:list"),UnsignedLong.valueOf(0x0000000000000030L),
+ Symbol.valueOf("amqp:coordinator:list"),UnsignedLong.valueOf(0x0000000000000030L),
};
private static final CoordinatorConstructor INSTANCE = new CoordinatorConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.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/transaction/codec/DeclareConstructor.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/transaction/codec/DeclareConstructor.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/transaction/codec/DeclareConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeclareConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:declare:list"),UnsignedLong.valueOf(0x0000000000000031L),
+ Symbol.valueOf("amqp:declare:list"),UnsignedLong.valueOf(0x0000000000000031L),
};
private static final DeclareConstructor INSTANCE = new DeclareConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.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/transaction/codec/DeclaredConstructor.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/transaction/codec/DeclaredConstructor.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/transaction/codec/DeclaredConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DeclaredConstructor extends
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:declared:list"),UnsignedLong.valueOf(0x0000000000000033L),
+ Symbol.valueOf("amqp:declared:list"),UnsignedLong.valueOf(0x0000000000000033L),
};
private static final DeclaredConstructor INSTANCE = new DeclaredConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.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/transaction/codec/DischargeConstructor.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/transaction/codec/DischargeConstructor.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/transaction/codec/DischargeConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class DischargeConstructor extend
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:discharge:list"),UnsignedLong.valueOf(0x0000000000000032L),
+ Symbol.valueOf("amqp:discharge:list"),UnsignedLong.valueOf(0x0000000000000032L),
};
private static final DischargeConstructor INSTANCE = new DischargeConstructor();
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.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/transaction/codec/TransactionalStateConstructor.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/transaction/codec/TransactionalStateConstructor.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/transaction/codec/TransactionalStateConstructor.java Tue Aug 16 11:33:54 2011
@@ -36,7 +36,7 @@ public class TransactionalStateConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.qpid.amqp_1_0:transactional-state:list"),UnsignedLong.valueOf(0x0000000000000034L),
+ Symbol.valueOf("amqp:transactional-state:list"),UnsignedLong.valueOf(0x0000000000000034L),
};
private static final TransactionalStateConstructor INSTANCE = new TransactionalStateConstructor();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org