You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2007/01/05 16:34:29 UTC
svn commit: r493049 [2/2] - in /incubator/qpid/branches/qpid.0-9/java:
broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/handler/
broker/src/main/java/org/apache/qpid/server/protocol/
broker/src/main/java/org/apac...
Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java Fri Jan 5 07:34:24 2007
@@ -75,9 +75,9 @@
delete();
//send deletion request to all other members:
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
- QueueDeleteBody request = new QueueDeleteBody((byte)8, (byte)0);
+ QueueDeleteBody request = new QueueDeleteBody((byte)0, (byte)9);
request.queue = getName();
_groupMgr.broadcast(new SimpleSendable(request));
}
@@ -89,9 +89,9 @@
super.unregisterProtocolSession(ps, channel, consumerTag);
//signal other members:
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
- BasicCancelBody request = new BasicCancelBody((byte)8, (byte)0);
+ BasicCancelBody request = new BasicCancelBody((byte)0, (byte)9);
request.consumerTag = getName();
_groupMgr.broadcast(new SimpleSendable(request));
}
Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java Fri Jan 5 07:34:24 2007
@@ -56,9 +56,9 @@
super.autodelete();
//send delete request to peers:
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
- QueueDeleteBody request = new QueueDeleteBody((byte)8, (byte)0);
+ QueueDeleteBody request = new QueueDeleteBody((byte)0, (byte)9);
request.queue = getName();
_groupMgr.broadcast(new SimpleSendable(request));
}
Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java Fri Jan 5 07:34:24 2007
@@ -148,9 +148,9 @@
TestMethod(Object id)
{
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
- super((byte)8, (byte)0);
+ super((byte)0, (byte)9);
this.id = id;
}
Modified: incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java Fri Jan 5 07:34:24 2007
@@ -46,6 +46,6 @@
// if generated together with amqp.xml is a part of MainRegistry.
// TODO: Connect with version acquired from ProtocolInitiation class.
return MainRegistry.get((short)in.getUnsignedShort(), (short)in.getUnsignedShort(),
- (byte)8, (byte)0);
+ (byte)0, (byte)9);
}
}
Modified: incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java Fri Jan 5 07:34:24 2007
@@ -40,10 +40,10 @@
throws AMQFrameDecodingException, AMQProtocolVersionException
{
ContentHeaderProperties properties;
- // AMQP version change: "Hardwired" version to major=8, minor=0
+ // AMQP version change: "Hardwired" version to major=0, minor=9
// TODO: Change so that the actual version is obtained from
// the ProtocolInitiation object for this session.
- if (classId == BasicConsumeBody.getClazz((byte)8, (byte)0))
+ if (classId == BasicConsumeBody.getClazz((byte)0, (byte)9))
{
properties = new BasicContentHeaderProperties();
}
Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java Fri Jan 5 07:34:24 2007
@@ -135,9 +135,9 @@
static BasicPublishBody getPublishRequest(String id)
{
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Establish some way to determine the version for the test.
- BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0);
+ BasicPublishBody request = new BasicPublishBody((byte)0, (byte)9);
request.routingKey = id;
return request;
}
Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Fri Jan 5 07:34:24 2007
@@ -148,9 +148,9 @@
private AMQMessage message(boolean immediate) throws AMQException
{
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Establish some way to determine the version for the test.
- BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0);
+ BasicPublishBody publish = new BasicPublishBody((byte)0, (byte)9);
publish.immediate = immediate;
ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
contentHeaderBody.bodySize = 1000; // in bytes
Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java Fri Jan 5 07:34:24 2007
@@ -80,9 +80,9 @@
{
for (int i = 1; i <= count; i++)
{
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Establish some way to determine the version for the test.
- BasicPublishBody publishBody = new BasicPublishBody((byte)8, (byte)0);
+ BasicPublishBody publishBody = new BasicPublishBody((byte)0, (byte)9);
publishBody.routingKey = "rk";
publishBody.exchange = "someExchange";
AMQMessage msg = new AMQMessage(_messageStore, publishBody);
Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java?view=diff&rev=493049&r1=493048&r2=493049
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java Fri Jan 5 07:34:24 2007
@@ -46,9 +46,9 @@
AMQMessage message(boolean immediate) throws AMQException
{
- // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
+ // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9)
// TODO: Establish some way to determine the version for the test.
- BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0);
+ BasicPublishBody publish = new BasicPublishBody((byte)0, (byte)9);
publish.immediate = immediate;
return new AMQMessage(_messageStore, publish, new ContentHeaderBody(), null);
}