You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/02/08 11:10:11 UTC
svn commit: r619823 [13/19] - in
/incubator/qpid/branches/thegreatmerge/qpid: ./ cpp/ dotnet/
dotnet/Qpid.Buffer.Tests/Properties/ dotnet/Qpid.Buffer/Properties/
dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/Channel/
dotnet/Qpid.Client.Tests/Commo...
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java Fri Feb 8 02:09:37 2008
@@ -409,9 +409,9 @@
}
else
{
- _logger.warn("Got 2, message prefetched wasn't cleared or messages was in transit when rollback occured");
+ _logger.warn("Got 2, message prefetched wasn't cleared or messages was in transit when rollback occured");
assertFalse("Already received message two", _gottwo);
-
+ assertFalse("Already received message redelivered two", _gottwoRedelivered);
_gottwo = true;
}
}
@@ -419,6 +419,13 @@
verifyMessages(_consumer.receive(1000));
}
+ /**
+ * This test sends two messages receives on of them but doesn't ack it.
+ * The consumer is then closed
+ * the first message should be returned as redelivered.
+ * the second message should be delivered normally.
+ * @throws Exception
+ */
public void testSend2ThenCloseAfter1andTryAgain() throws Exception
{
assertTrue("session is not transacted", _session.getTransacted());
@@ -437,6 +444,7 @@
assertTrue("Messasge is marked as redelivered" + result, !result.getJMSRedelivered());
_logger.info("Closing Consumer");
+
_consumer.close();
_logger.info("Creating New consumer");
@@ -444,33 +452,19 @@
_logger.info("receiving result");
-// NOTE: Both msg 1 & 2 will be marked as redelivered as they have both will have been rejected.
-// Only the occasion where it is not rejected will it mean it hasn't arrived at the client yet.
+
+ // Message 2 may be marked as redelivered if it was prefetched.
result = _consumer.receive(1000);
- assertNotNull("test message was consumed and rolled back, but is gone", result);
+ assertNotNull("Second message was not consumed, but is gone", result);
-// The first message back will be either 1 or 2 being redelivered
- if (result.getJMSRedelivered())
- {
- assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
- }
- else // or it will be msg 2 arriving the first time due to latency.
+ // The first message back will be 2, message 1 has been received but not committed
+ // Closing the consumer does not commit the session.
+
+ // if this is message 1 then it should be marked as redelivered
+ if("1".equals(((TextMessage) result).getText()))
{
- _logger.info("Message 2 wasn't prefetched so wasn't rejected");
- assertEquals("2", ((TextMessage) result).getText());
+ fail("First message was recieved again");
}
-
- result = _consumer.receive(1000);
-
- // if( isBroker08() )
- // {
- assertNotNull("test message was consumed and rolled back, but is gone", result);
- // assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
- // }
- // else
- // {
- // assertNull("test message was consumed and not rolled back, but is redelivered", result);
- // }
result = _consumer.receive(1000);
assertNull("test message should be null:" + result, result);
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java Fri Feb 8 02:09:37 2008
@@ -124,7 +124,16 @@
{
protected AMQFrame createConnectionOpenFrame(int channel, AMQShortString path, AMQShortString capabilities, boolean insist, byte major, byte minor)
{
- return super.createConnectionOpenFrame(channel, path, new AMQShortString(ClusterCapability.add(capabilities, _identity)), insist, major, minor);
+ // Be aware of possible changes to parameter order as versions change.
+ return ConnectionOpenBody.createAMQFrame(channel,
+ major,
+ minor,
+ // AMQP version (major, minor)
+ new AMQShortString(ClusterCapability.add(capabilities, _identity)),
+ // capabilities
+ insist,
+ // insist
+ path);
}
}
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java Fri Feb 8 02:09:37 2008
@@ -22,7 +22,7 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.MethodConverter_8_0;
+import org.apache.qpid.framing.amqp_8_0.MethodConverter_8_0;
import org.apache.qpid.framing.abstraction.ContentChunk;
import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
import org.apache.qpid.server.queue.AMQMessage;
Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/build.out
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/build.out?rev=619823&view=auto
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/build.out (added)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/build.out Fri Feb 8 02:09:37 2008
@@ -0,0 +1,460 @@
+[INFO] Scanning for projects...
+[INFO] ----------------------------------------------------------------------------
+[INFO] Building Qpid Common Utilities
+[INFO] task-segment: [install]
+[INFO] ----------------------------------------------------------------------------
+[INFO] [antrun:run {execution: protocol-version}]
+[INFO] Executing tasks
+ [echo] "c:\work\qpid\thegreatmerge\qpid\java\common\target/generated-sources/gentools"
+
+compile_generator:
+
+compile:
+
+generate:
+ [java] XML files: [C:\work\qpid\thegreatmerge\qpid\specs/amqp.0-8.xml, C:\work\qpid\thegreatmerge\qpid\specs/amqp.0-9.xml]
+ [java] "C:\work\qpid\thegreatmerge\qpid\specs/amqp.0-8.xml": Found version 8-0.
+ [java] "C:\work\qpid\thegreatmerge\qpid\specs/amqp.0-9.xml": Found version 0-9.
+ [java] Looking for template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\model
+ [java] Looking for vesrion specific template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version
+ [java] model template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version\AmqpConstantsClass.vm
+ [java] model template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version\ClientMethodDispatcherInterface.vm
+ [java] model template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version\MethodDispatcherInterface.vm
+ [java] model template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version\MethodRegistryClass.vm
+ [java] model template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\model\version\ServerMethodDispatcherInterface.vm
+ [java] Looking for template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\class
+ [java] Looking for vesrion specific template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\class\version
+ [java] Looking for template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\method
+ [java] Looking for vesrion specific template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\method\version
+ [java] method template file(s):
+ [java] C:\work\qpid\thegreatmerge\qpid\java\common\templates\method\version\MethodBodyClass.vm
+ [java] Looking for template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\field
+ [java] Looking for vesrion specific template files in directory: C:\work\qpid\thegreatmerge\qpid\java\common\templates\field\version
+ [java] Generation directory: C:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing
+ [java] Files generated: 0
+ [java] Done.
+[INFO] Executed tasks
+[INFO] Registering compile source root c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools
+[INFO] [jython:jython {execution: jython}]
+[INFO] [resources:resources]
+[INFO] Using default encoding to copy filtered resources.
+[INFO] [compiler:compile]
+Compiling 489 source files to c:\work\qpid\thegreatmerge\qpid\java\common\target\classes
+[INFO] ------------------------------------------------------------------------
+[ERROR] BUILD FAILURE
+[INFO] ------------------------------------------------------------------------
+[INFO] Compilation failure
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\QueueDeleteBodyImpl.java:[41,70] cannot find symbol
+symbol: class QueueDeleteBody
+public class QueueDeleteBodyImpl extends AMQMethodBody_0_9 implements QueueDeleteBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\QueueDeleteBodyImpl.java:[154,27] cannot find symbol
+symbol : class MethodDispatcher
+location: class org.apache.qpid.framing.amqp_0_9.QueueDeleteBodyImpl
+
+c:\work\qpid\thegreatmerge\qpid\java\common\src\main\java\org\apache\qpid\framing\AMQMethodBody.java:[82,27] cannot find symbol
+symbol : class MethodDispatcher
+location: interface org.apache.qpid.framing.AMQMethodBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\StreamQosOkBodyImpl.java:[41,70] cannot find symbol
+symbol: class StreamQosOkBody
+public class StreamQosOkBodyImpl extends AMQMethodBody_0_9 implements StreamQosOkBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\StreamQosOkBodyImpl.java:[101,27] cannot find symbol
+symbol : class MethodDispatcher
+location: class org.apache.qpid.framing.amqp_0_9.StreamQosOkBodyImpl
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_8_0\TxSelectOkBodyImpl.java:[41,69] cannot find symbol
+symbol: class TxSelectOkBody
+public class TxSelectOkBodyImpl extends AMQMethodBody_8_0 implements TxSelectOkBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_8_0\TxSelectOkBodyImpl.java:[101,27] cannot find symbol
+symbol : class MethodDispatcher
+location: class org.apache.qpid.framing.amqp_8_0.TxSelectOkBodyImpl
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_8_0\DtxStartOkBodyImpl.java:[41,69] cannot find symbol
+symbol: class DtxStartOkBody
+public class DtxStartOkBodyImpl extends AMQMethodBody_8_0 implements DtxStartOkBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_8_0\DtxStartOkBodyImpl.java:[101,27] cannot find symbol
+symbol : class MethodDispatcher
+location: class org.apache.qpid.framing.amqp_8_0.DtxStartOkBodyImpl
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ChannelCloseOkBodyImpl.java:[41,73] cannot find symbol
+symbol: class ChannelCloseOkBody
+public class ChannelCloseOkBodyImpl extends AMQMethodBody_0_9 implements ChannelCloseOkBody
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ChannelCloseOkBodyImpl.java:[101,27] cannot find symbol
+symbol : class MethodDispatcher
+location: class org.apache.qpid.framing.amqp_0_9.ChannelCloseOkBodyImpl
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\MethodDispatcher_0_9.java:[35,12] cannot find symbol
+symbol: class MethodDispatcher
+ extends MethodDispatcher,
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[34,52] cannot find symbol
+symbol: class ServerMethodDispatcher
+public interface ServerMethodDispatcher_0_9 extends ServerMethodDispatcher
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[34,52] cannot find symbol
+symbol: class ClientMethodDispatcher
+public interface ClientMethodDispatcher_0_9 extends ClientMethodDispatcher
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[37,41] cannot find symbol
+symbol : class AccessRequestBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[38,36] cannot find symbol
+symbol : class BasicAckBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[39,39] cannot find symbol
+symbol : class BasicCancelBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[40,40] cannot find symbol
+symbol : class BasicConsumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[41,36] cannot find symbol
+symbol : class BasicGetBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[42,40] cannot find symbol
+symbol : class BasicPublishBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[43,36] cannot find symbol
+symbol : class BasicQosBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[44,40] cannot find symbol
+symbol : class BasicRecoverBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[45,44] cannot find symbol
+symbol : class BasicRecoverSyncBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[46,39] cannot find symbol
+symbol : class BasicRejectBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[47,40] cannot find symbol
+symbol : class ChannelCloseBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[48,42] cannot find symbol
+symbol : class ChannelCloseOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[49,39] cannot find symbol
+symbol : class ChannelFlowBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[50,41] cannot find symbol
+symbol : class ChannelFlowOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[51,37] cannot find symbol
+symbol : class ChannelOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[52,39] cannot find symbol
+symbol : class ChannelOpenBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[53,39] cannot find symbol
+symbol : class ChannelPingBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[54,39] cannot find symbol
+symbol : class ChannelPongBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[55,41] cannot find symbol
+symbol : class ChannelResumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[56,43] cannot find symbol
+symbol : class ConnectionCloseBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[57,45] cannot find symbol
+symbol : class ConnectionCloseOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[58,42] cannot find symbol
+symbol : class ConnectionOpenBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[59,46] cannot find symbol
+symbol : class ConnectionSecureOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[60,45] cannot find symbol
+symbol : class ConnectionStartOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[61,44] cannot find symbol
+symbol : class ConnectionTuneOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[62,37] cannot find symbol
+symbol : class DtxSelectBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[63,36] cannot find symbol
+symbol : class DtxStartBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[64,41] cannot find symbol
+symbol : class ExchangeBoundBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[65,43] cannot find symbol
+symbol : class ExchangeDeclareBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[66,42] cannot find symbol
+symbol : class ExchangeDeleteBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[67,35] cannot find symbol
+symbol : class FileAckBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[68,38] cannot find symbol
+symbol : class FileCancelBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[69,39] cannot find symbol
+symbol : class FileConsumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[70,36] cannot find symbol
+symbol : class FileOpenBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[71,38] cannot find symbol
+symbol : class FileOpenOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[72,39] cannot find symbol
+symbol : class FilePublishBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[73,35] cannot find symbol
+symbol : class FileQosBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[74,38] cannot find symbol
+symbol : class FileRejectBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[75,37] cannot find symbol
+symbol : class FileStageBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[76,41] cannot find symbol
+symbol : class MessageAppendBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[77,41] cannot find symbol
+symbol : class MessageCancelBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[78,45] cannot find symbol
+symbol : class MessageCheckpointBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[79,40] cannot find symbol
+symbol : class MessageCloseBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[80,42] cannot find symbol
+symbol : class MessageConsumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[81,40] cannot find symbol
+symbol : class MessageEmptyBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[82,38] cannot find symbol
+symbol : class MessageGetBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[83,41] cannot find symbol
+symbol : class MessageOffsetBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[84,37] cannot find symbol
+symbol : class MessageOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[85,39] cannot find symbol
+symbol : class MessageOpenBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[86,38] cannot find symbol
+symbol : class MessageQosBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[87,42] cannot find symbol
+symbol : class MessageRecoverBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[88,41] cannot find symbol
+symbol : class MessageRejectBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[89,41] cannot find symbol
+symbol : class MessageResumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[90,43] cannot find symbol
+symbol : class MessageTransferBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[91,37] cannot find symbol
+symbol : class QueueBindBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[92,40] cannot find symbol
+symbol : class QueueDeclareBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[93,39] cannot find symbol
+symbol : class QueueDeleteBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[94,38] cannot find symbol
+symbol : class QueuePurgeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[95,39] cannot find symbol
+symbol : class QueueUnbindBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[96,40] cannot find symbol
+symbol : class StreamCancelBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[97,41] cannot find symbol
+symbol : class StreamConsumeBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[98,41] cannot find symbol
+symbol : class StreamPublishBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[99,37] cannot find symbol
+symbol : class StreamQosBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[100,41] cannot find symbol
+symbol : class TunnelRequestBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[101,36] cannot find symbol
+symbol : class TxCommitBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[102,38] cannot find symbol
+symbol : class TxRollbackBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ServerMethodDispatcher_0_9.java:[103,36] cannot find symbol
+symbol : class TxSelectBody
+location: interface org.apache.qpid.framing.amqp_0_9.ServerMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[37,43] cannot find symbol
+symbol : class AccessRequestOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[38,41] cannot find symbol
+symbol : class BasicCancelOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[39,42] cannot find symbol
+symbol : class BasicConsumeOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[40,40] cannot find symbol
+symbol : class BasicDeliverBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[41,41] cannot find symbol
+symbol : class BasicGetEmptyBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[42,38] cannot find symbol
+symbol : class BasicGetOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[43,38] cannot find symbol
+symbol : class BasicQosOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[44,46] cannot find symbol
+symbol : class BasicRecoverSyncOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[45,39] cannot find symbol
+symbol : class BasicReturnBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[46,40] cannot find symbol
+symbol : class ChannelCloseBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[47,42] cannot find symbol
+symbol : class ChannelCloseOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[48,39] cannot find symbol
+symbol : class ChannelFlowBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[49,41] cannot find symbol
+symbol : class ChannelFlowOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[50,37] cannot find symbol
+symbol : class ChannelOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[51,41] cannot find symbol
+symbol : class ChannelOpenOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[52,39] cannot find symbol
+symbol : class ChannelPingBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[53,39] cannot find symbol
+symbol : class ChannelPongBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[54,43] cannot find symbol
+symbol : class ConnectionCloseBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+c:\work\qpid\thegreatmerge\qpid\java\common\target\generated-sources\gentools\org\apache\qpid\framing\amqp_0_9\ClientMethodDispatcher_0_9.java:[55,45] cannot find symbol
+symbol : class ConnectionCloseOkBody
+location: interface org.apache.qpid.framing.amqp_0_9.ClientMethodDispatcher_0_9
+
+
+[INFO] ------------------------------------------------------------------------
+[INFO] For more information, run Maven with the -e switch
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 11 seconds
+[INFO] Finished at: Wed Feb 06 11:27:20 GMT 2008
+[INFO] Final Memory: 7M/30M
+[INFO] ------------------------------------------------------------------------
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/pom.xml?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/pom.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/pom.xml Fri Feb 8 02:09:37 2008
@@ -139,18 +139,6 @@
<dependencies>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
-
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.0</version>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/protocol-version.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/protocol-version.xml?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/protocol-version.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/protocol-version.xml Fri Feb 8 02:09:37 2008
@@ -27,18 +27,23 @@
<property name="generated.dir" location="${generated.path}/${generated.package}" />
<property name="generated.timestamp" location="${generated.dir}/timestamp" />
<property name="xml.spec.dir" location="${topDirectoryLocation}/../specs" />
- <property name="xml.spec.deps" value="amqp.0-8.xml cluster.0-8.xml" />
- <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/cluster.0-8.xml" />
+ <property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml" />
+ <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml" />
+ <property name="template.dir" value="${topDirectoryLocation}/common/templates" />
+
- <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">
+ <!--<target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">-->
+ <target name="generate" depends="compile_generator" unless="generation.notRequired">
<mkdir dir="${generated.dir}"/>
<java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
- <arg line="-j -o ${generated.dir} -t ${topDirectoryLocation}/common/templates ${xml.spec.list}" />
+ <arg line="-j -o ${generated.dir} -t ${template.dir} ${xml.spec.list}" />
<classpath>
<pathelement path="${gentools.home}/src" />
- <fileset dir="${gentools.home}/lib">
- <include name="**/*.jar"/>
- </fileset>
+ <fileset dir="${gentools.home}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+ <pathelement path="${gentools.home}/lib/velocity-dep-1.4.jar" />
</classpath>
</java>
<touch file="${generated.timestamp}" />
@@ -47,7 +52,8 @@
<target name="check_generate_deps">
<uptodate property="generation.notRequired" targetfile="${generated.timestamp}">
<srcfiles dir="${xml.spec.dir}" includes="${xml.spec.deps}" />
- </uptodate>
+ <srcfiles dir="${template.dir}" includes="**/*.vm **/*.tmpl" />
+ </uptodate>
</target>
<target name="compile_generator">
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java Fri Feb 8 02:09:37 2008
@@ -65,7 +65,7 @@
* </code></pre>
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 598324 $, $Date: 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) $
*/
public class WriteBufferLimitFilterBuilder
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java Fri Feb 8 02:09:37 2008
@@ -91,7 +91,7 @@
* </pre>
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev: 598285 $, $Date: 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) $
+ * @version $Rev: 614906 $, $Date: 2008-01-24 15:43:23 +0000 (Thu, 24 Jan 2008) $
*/
public abstract class OurCumulativeProtocolDecoder extends ProtocolDecoderAdapter {
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java Fri Feb 8 02:09:37 2008
@@ -47,7 +47,7 @@
* {@link IoAcceptor} for socket transport (TCP/IP).
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 598324 $, $Date: 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) $
*/
public class MultiThreadSocketAcceptor extends SocketAcceptor
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java Fri Feb 8 02:09:37 2008
@@ -46,7 +46,7 @@
* {@link IoConnector} for socket transport (TCP/IP).
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 614906 $, $Date: 2008-01-24 15:43:23 +0000 (Thu, 24 Jan 2008) $
*/
public class MultiThreadSocketConnector extends SocketConnector
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java Fri Feb 8 02:09:37 2008
@@ -45,7 +45,7 @@
* Performs all I/O operations for sockets which is connected or bound. This class is used by MINA internally.
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$,
+ * @version $Rev: 614906 $, $Date: 2008-01-24 15:43:23 +0000 (Thu, 24 Jan 2008) $,
*/
class MultiThreadSocketIoProcessor extends SocketIoProcessor
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java Fri Feb 8 02:09:37 2008
@@ -31,7 +31,7 @@
* An {@link IoConnectorConfig} for {@link SocketConnector}.
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 598324 $, $Date: 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) $
*/
public class MultiThreadSocketSessionConfigImpl extends org.apache.mina.transport.socket.nio.SocketSessionConfigImpl
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java Fri Feb 8 02:09:37 2008
@@ -43,7 +43,7 @@
* An {@link IoSession} for socket transport (TCP/IP).
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 598324 $, $Date: 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) $
*/
class MultiThreadSocketSessionImpl extends SocketSessionImpl
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java Fri Feb 8 02:09:37 2008
@@ -43,7 +43,7 @@
* {@link VmPipeAddress}.
*
* @author The Apache Directory Project (mina-dev@directory.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 614906 $, $Date: 2008-01-24 15:43:23 +0000 (Thu, 24 Jan 2008) $
*/
public class QpidVmPipeConnector extends VmPipeConnector
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java Fri Feb 8 02:09:37 2008
@@ -20,9 +20,7 @@
*/
package org.apache.qpid;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ChannelCloseBody;
+import org.apache.qpid.framing.*;
import org.apache.qpid.protocol.AMQConstant;
/**
@@ -55,7 +53,7 @@
public AMQFrame getCloseFrame(int channel)
{
- return ChannelCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode().getCode(),
- new AMQShortString(getMessage()));
+ MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor));
+ return new AMQFrame(channel, reg.createChannelCloseBody(getErrorCode().getCode(), new AMQShortString(getMessage()),_classId,_methodId));
}
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java Fri Feb 8 02:09:37 2008
@@ -21,9 +21,7 @@
package org.apache.qpid;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionCloseBody;
+import org.apache.qpid.framing.*;
import org.apache.qpid.protocol.AMQConstant;
/**
@@ -61,7 +59,12 @@
public AMQFrame getCloseFrame(int channel)
{
- return ConnectionCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode().getCode(),
- new AMQShortString(getMessage()));
+ MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor));
+ return new AMQFrame(channel,
+ reg.createConnectionCloseBody(getErrorCode().getCode(),
+ new AMQShortString(getMessage()),
+ _classId,
+ _methodId));
+
}
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java Fri Feb 8 02:09:37 2008
@@ -56,6 +56,7 @@
/** Flag to indicate whether this decoder needs to handle protocol initiation. */
private boolean _expectProtocolInitiation;
+ private boolean firstDecode = true;
/**
* Creates a new AMQP decoder.
@@ -81,14 +82,24 @@
*/
protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) throws Exception
{
- if (_expectProtocolInitiation)
+
+ boolean decoded;
+ if (_expectProtocolInitiation
+ || (firstDecode
+ && (in.remaining() > 0)
+ && (in.get(in.position()) == (byte)'A')))
{
- return doDecodePI(session, in, out);
+ decoded = doDecodePI(session, in, out);
}
else
{
- return doDecodeDataBlock(session, in, out);
+ decoded = doDecodeDataBlock(session, in, out);
+ }
+ if(firstDecode && decoded)
+ {
+ firstDecode = false;
}
+ return decoded;
}
/**
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java Fri Feb 8 02:09:37 2008
@@ -1,39 +1,39 @@
-/*
- *
- * 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.framing;
-
-import org.apache.mina.common.ByteBuffer;
-
-public abstract class AMQBody
-{
- public abstract byte getFrameType();
-
- /**
- * Get the size of the body
- * @return unsigned short
- */
- protected abstract int getSize();
-
- protected abstract void writePayload(ByteBuffer buffer);
-
- protected abstract void populateFromBuffer(ByteBuffer buffer, long size)
- throws AMQFrameDecodingException, AMQProtocolVersionException;
-}
+/*
+ *
+ * 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.framing;
+
+import org.apache.mina.common.ByteBuffer;
+
+public interface AMQBody
+{
+ public byte getFrameType();
+
+ /**
+ * Get the size of the body
+ * @return unsigned short
+ */
+ public abstract int getSize();
+
+ public void writePayload(ByteBuffer buffer);
+
+ //public void populateFromBuffer(ByteBuffer buffer, long size)
+ // throws AMQFrameDecodingException, AMQProtocolVersionException;
+}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java Fri Feb 8 02:09:37 2008
@@ -38,4 +38,10 @@
{
super(errorCode, message, cause);
}
+
+ public AMQFrameDecodingException(AMQConstant errorCode, String message)
+ {
+ super(errorCode, message, null);
+ }
+
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java Fri Feb 8 02:09:37 2008
@@ -1,132 +1,83 @@
-/*
- *
- * 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.framing;
-
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.AMQChannelException;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.protocol.AMQConstant;
-
-public abstract class AMQMethodBody extends AMQBody
-{
- public static final byte TYPE = 1;
-
- /** AMQP version */
- protected byte major;
- protected byte minor;
-
- public byte getMajor()
- {
- return major;
- }
-
- public byte getMinor()
- {
- return minor;
- }
-
- public AMQMethodBody(byte major, byte minor)
- {
- this.major = major;
- this.minor = minor;
- }
-
- /** unsigned short */
- protected abstract int getBodySize();
-
- /** @return unsigned short */
- protected abstract int getClazz();
-
- /** @return unsigned short */
- protected abstract int getMethod();
-
- protected abstract void writeMethodPayload(ByteBuffer buffer);
-
- public byte getFrameType()
- {
- return TYPE;
- }
-
- protected int getSize()
- {
- return 2 + 2 + getBodySize();
- }
-
- protected void writePayload(ByteBuffer buffer)
- {
- EncodingUtils.writeUnsignedShort(buffer, getClazz());
- EncodingUtils.writeUnsignedShort(buffer, getMethod());
- writeMethodPayload(buffer);
- }
-
- protected abstract void populateMethodBodyFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException;
-
- protected void populateFromBuffer(ByteBuffer buffer, long size) throws AMQFrameDecodingException
- {
- populateMethodBodyFromBuffer(buffer);
- }
-
- public String toString()
- {
- StringBuffer buf = new StringBuffer(getClass().getName());
- buf.append("[ Class: ").append(getClazz());
- buf.append(" Method: ").append(getMethod()).append(']');
- return buf.toString();
- }
-
- /**
- * Creates an AMQChannelException for the corresponding body type (a channel exception should include the class and
- * method ids of the body it resulted from).
- */
-
- /**
- * Convenience Method to create a channel not found exception
- *
- * @param channelId The channel id that is not found
- *
- * @return new AMQChannelException
- */
- public AMQChannelException getChannelNotFoundException(int channelId)
- {
- return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId);
- }
-
- public AMQChannelException getChannelException(AMQConstant code, String message)
- {
- return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor, null);
- }
-
- public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause)
- {
- return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor, cause);
- }
-
- public AMQConnectionException getConnectionException(AMQConstant code, String message)
- {
- return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor, null);
- }
-
- public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause)
- {
- return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor, cause);
- }
-
-}
+/*
+ *
+ * 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.framing;
+
+import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQChannelException;
+import org.apache.qpid.AMQConnectionException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.protocol.AMQConstant;
+
+public interface AMQMethodBody extends AMQBody
+{
+ public static final byte TYPE = 1;
+
+ /** AMQP version */
+ public byte getMajor();
+
+ public byte getMinor();
+
+
+
+ /** @return unsigned short */
+ public int getClazz();
+
+ /** @return unsigned short */
+ public int getMethod();
+
+ public void writeMethodPayload(ByteBuffer buffer);
+
+
+ public int getSize();
+
+ public void writePayload(ByteBuffer buffer);
+
+ //public abstract void populateMethodBodyFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException;
+
+ //public void populateFromBuffer(ByteBuffer buffer, long size) throws AMQFrameDecodingException;
+
+ public AMQFrame generateFrame(int channelId);
+
+ public String toString();
+
+
+
+ /**
+ * Convenience Method to create a channel not found exception
+ *
+ * @param channelId The channel id that is not found
+ *
+ * @return new AMQChannelException
+ */
+ public AMQChannelException getChannelNotFoundException(int channelId);
+
+ public AMQChannelException getChannelException(AMQConstant code, String message);
+
+ public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause);
+
+ public AMQConnectionException getConnectionException(AMQConstant code, String message);
+
+
+ public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause);
+
+
+ public boolean execute(MethodDispatcher methodDispatcher, int channelId) throws AMQException;
+}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java Fri Feb 8 02:09:37 2008
@@ -40,7 +40,6 @@
public AMQBody createBody(ByteBuffer in, long bodySize) throws AMQFrameDecodingException
{
- return _protocolSession.getRegistry().get((short) in.getUnsignedShort(), (short) in.getUnsignedShort(), in,
- bodySize);
+ return _protocolSession.getMethodRegistry().convertToBody(in, bodySize);
}
}
Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java?rev=619823&view=auto
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java (added)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java Fri Feb 8 02:09:37 2008
@@ -0,0 +1,89 @@
+package org.apache.qpid.framing;
+
+/*
+ *
+ * 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.
+ *
+ */
+
+import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQChannelException;
+import org.apache.qpid.AMQConnectionException;
+import org.apache.qpid.protocol.AMQConstant;
+
+public abstract class AMQMethodBodyImpl implements AMQMethodBody
+{
+ public static final byte TYPE = 1;
+
+ public AMQMethodBodyImpl()
+ {
+ }
+
+ public byte getFrameType()
+ {
+ return TYPE;
+ }
+
+
+ /** unsigned short */
+ abstract protected int getBodySize();
+
+
+ public AMQFrame generateFrame(int channelId)
+ {
+ return new AMQFrame(channelId, this);
+ }
+
+ /**
+ * Creates an AMQChannelException for the corresponding body type (a channel exception should include the class and
+ * method ids of the body it resulted from).
+ */
+
+ /**
+ * Convenience Method to create a channel not found exception
+ *
+ * @param channelId The channel id that is not found
+ *
+ * @return new AMQChannelException
+ */
+ public AMQChannelException getChannelNotFoundException(int channelId)
+ {
+ return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId);
+ }
+
+ public AMQChannelException getChannelException(AMQConstant code, String message)
+ {
+ return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null);
+ }
+
+ public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause)
+ {
+ return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause);
+ }
+
+ public AMQConnectionException getConnectionException(AMQConstant code, String message)
+ {
+ return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null);
+ }
+
+ public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause)
+ {
+ return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause);
+ }
+
+}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java Fri Feb 8 02:09:37 2008
@@ -26,6 +26,5 @@
public abstract interface AMQMethodBodyInstanceFactory
{
- public AMQMethodBody newInstance(byte major, byte minor, ByteBuffer buffer, long size) throws AMQFrameDecodingException;
- public AMQMethodBody newInstance(byte major, byte minor, int clazzID, int methodID, ByteBuffer buffer, long size) throws AMQFrameDecodingException;
+ public AMQMethodBody newInstance(ByteBuffer buffer, long size) throws AMQFrameDecodingException;
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java Fri Feb 8 02:09:37 2008
@@ -59,6 +59,8 @@
private static final char[] EMPTY_CHAR_ARRAY = new char[0];
private char[] chars;
private String str;
+
+ public static final AMQShortString EMPTY_STRING = new AMQShortString((String)null);
public AMQShortString(byte[] data)
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java Fri Feb 8 02:09:37 2008
@@ -22,7 +22,7 @@
import org.apache.mina.common.ByteBuffer;
-public class ContentBody extends AMQBody
+public class ContentBody implements AMQBody
{
public static final byte TYPE = 3;
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java Fri Feb 8 02:09:37 2008
@@ -22,7 +22,7 @@
import org.apache.mina.common.ByteBuffer;
-public class ContentHeaderBody extends AMQBody
+public class ContentHeaderBody implements AMQBody
{
public static final byte TYPE = 2;
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java Fri Feb 8 02:09:37 2008
@@ -22,6 +22,8 @@
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
+
public class ContentHeaderPropertiesFactory
{
private static final ContentHeaderPropertiesFactory _instance = new ContentHeaderPropertiesFactory();
@@ -43,7 +45,7 @@
// AMQP version change: "Hardwired" version to major=8, minor=0
// 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 == BasicConsumeBodyImpl.CLASS_ID)
{
properties = new BasicContentHeaderProperties();
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Fri Feb 8 02:09:37 2008
@@ -229,7 +229,11 @@
encodedString[i] = (byte) cha[i];
}
- writeBytes(buffer, encodedString);
+ // TODO: check length fits in an unsigned byte
+ writeUnsignedByte(buffer, (short)encodedString.length);
+ buffer.put(encodedString);
+
+
}
else
{
@@ -928,15 +932,15 @@
public static byte[] readBytes(ByteBuffer buffer)
{
- short length = buffer.getUnsigned();
+ long length = buffer.getUnsignedInt();
if (length == 0)
{
return null;
}
else
{
- byte[] dataBytes = new byte[length];
- buffer.get(dataBytes, 0, length);
+ byte[] dataBytes = new byte[(int)length];
+ buffer.get(dataBytes, 0, (int)length);
return dataBytes;
}
@@ -947,13 +951,14 @@
if (data != null)
{
// TODO: check length fits in an unsigned byte
- writeUnsignedByte(buffer, (short) data.length);
+ writeUnsignedInteger(buffer, (long)data.length);
buffer.put(data);
}
else
- {
+ {
// really writing out unsigned byte
- buffer.put((byte) 0);
+ //buffer.put((byte) 0);
+ writeUnsignedInteger(buffer, 0L);
}
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java Fri Feb 8 02:09:37 2008
@@ -22,7 +22,7 @@
import org.apache.mina.common.ByteBuffer;
-public class HeartbeatBody extends AMQBody
+public class HeartbeatBody implements AMQBody
{
public static final byte TYPE = 8;
public static AMQFrame FRAME = new HeartbeatBody().toFrame();
@@ -46,12 +46,12 @@
return TYPE;
}
- protected int getSize()
+ public int getSize()
{
return 0;//heartbeats we generate have no payload
}
- protected void writePayload(ByteBuffer buffer)
+ public void writePayload(ByteBuffer buffer)
{
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java Fri Feb 8 02:09:37 2008
@@ -139,7 +139,7 @@
}
}
- public void checkVersion() throws AMQException
+ public ProtocolVersion checkVersion() throws AMQException
{
if(_protocolHeader.length != 4)
@@ -180,6 +180,7 @@
throw new AMQProtocolVersionException("Protocol version " +
_protocolMajor + "." + _protocolMinor + " not suppoerted by this version of the Qpid broker.", null);
}
+ return pv;
}
public String toString()
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java Fri Feb 8 02:09:37 2008
@@ -182,7 +182,7 @@
+ " method " + methodID + ".", null);
}
- return bodyFactory.newInstance(_protocolMajorVersion, _protocolMinorVersion, classID, methodID, in, size);
+ return bodyFactory.newInstance( in, size);
}
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java?rev=619823&r1=616809&r2=619823&view=diff
==============================================================================
(empty)
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java?rev=619823&r1=619822&r2=619823&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java Fri Feb 8 02:09:37 2008
@@ -21,6 +21,7 @@
package org.apache.qpid.protocol;
import org.apache.qpid.framing.VersionSpecificRegistry;
+import org.apache.qpid.framing.MethodRegistry;
/**
* AMQVersionAwareProtocolSession is implemented by all AMQP session classes, that need to provide an awareness to
@@ -42,5 +43,7 @@
*
* @return The method registry for a specific version of the AMQP.
*/
- public VersionSpecificRegistry getRegistry();
+// public VersionSpecificRegistry getRegistry();
+
+ MethodRegistry getMethodRegistry();
}