Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java?view=diff&rev=488624&r1=488623&r2=488624 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java Tue Dec 19 02:51:39 2006 @@ -55,7 +55,7 @@ { return _name; } - + public static final AMQConstant FRAME_MIN_SIZE = new AMQConstant(4096, "frame min size", true); public static final AMQConstant FRAME_END = new AMQConstant(206, "frame end", true); @@ -73,6 +73,8 @@ public static final AMQConstant CONTEXT_IN_USE = new AMQConstant(320, "context in use", true); public static final AMQConstant CONTEXT_UNKNOWN = new AMQConstant(321, "context unknown", true); + + public static final AMQConstant INVALID_SELECTOR = new AMQConstant(322, "selector invalid", true); public static final AMQConstant INVALID_PATH = new AMQConstant(402, "invalid path", true);
Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?view=diff&rev=488624&r1=488623&r2=488624 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Tue Dec 19 02:51:39 2006 @@ -30,7 +30,7 @@ /** * Test class to test AMQQueueMBean attribtues and operations */ -public class AMQQueueMBeanTest extends TestCase +public class AMQQueueMBeanTest extends TestCase { private AMQQueue _queue; private AMQQueueMBean _queueMBean; @@ -62,14 +62,14 @@ assertFalse(mgr.hasActiveSubscribers()); assertTrue(_queueMBean.getActiveConsumerCount() == 0); - _channel = new AMQChannel(1, _messageStore, null); + _channel = new AMQChannel(1, _messageStore, null); _protocolSession = new MockProtocolSession(_messageStore); _protocolSession.addChannel(_channel); - _queue.registerProtocolSession(_protocolSession, 1, "test", false); + _queue.registerProtocolSession(_protocolSession, 1, "test", false, null); assertTrue(_queueMBean.getActiveConsumerCount() == 1); - SubscriptionSet _subscribers = (SubscriptionSet)mgr; + SubscriptionSet _subscribers = (SubscriptionSet) mgr; SubscriptionTestHelper s1 = new SubscriptionTestHelper("S1"); SubscriptionTestHelper s2 = new SubscriptionTestHelper("S2"); _subscribers.addSubscriber(s1); @@ -161,7 +161,7 @@ super.setUp(); _queueRegistry = new DefaultQueueRegistry(); _queue = new AMQQueue("testQueue", false, "AMQueueMBeanTest", false, _queueRegistry); - _queueMBean = new AMQQueueMBean(_queue); + _queueMBean = new AMQQueueMBean(_queue); } private void sendMessages(int messageCount) throws AMQException @@ -169,7 +169,8 @@ AMQMessage[] messages = new AMQMessage[messageCount]; for (int i = 0; i < messages.length; i++) { - messages[i] = message(false);; + messages[i] = message(false); + ; } for (int i = 0; i < messageCount; i++) { Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java?view=diff&rev=488624&r1=488623&r2=488624 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java Tue Dec 19 02:51:39 2006 @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Queue; public class SubscriptionTestHelper implements Subscription { @@ -68,6 +69,26 @@ public void queueDeleted(AMQQueue queue) { + } + + public boolean hasFilters() + { + return false; + } + + public boolean hasInterest(AMQMessage msg) + { + return true; + } + + public Queue<AMQMessage> getPreDeliveryQueue() + { + return null; + } + + public void enqueueForPreDelivery(AMQMessage msg) + { + //no-op } public int hashCode() Modified: incubator/qpid/trunk/qpid/specs/amqp-8.0.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/specs/amqp-8.0.xml?view=diff&rev=488624&r1=488623&r2=488624 ============================================================================== --- incubator/qpid/trunk/qpid/specs/amqp-8.0.xml (original) +++ incubator/qpid/trunk/qpid/specs/amqp-8.0.xml Tue Dec 19 02:51:39 2006 @@ -2105,6 +2105,14 @@ method it will raise a channel or connection exception. </doc> </field> + + <field name="arguments" type="table" label="arguments for consuming"> + <doc> + A set of arguments for the consume. The syntax and semantics + of these arguments depends on the server implementation. This + field is ignored if passive is 1. + </doc> + </field> </method> <method name = "consume-ok" synchronous = "1" index = "21">
