Author: aconway
Date: Thu Jan 4 16:52:33 2007
New Revision: 492840
URL: http://svn.apache.org/viewvc?view=rev&rev=492840
Log:
0-9 branch now compiles but is not yet functional.
Areas needing attention are marked FIXME.
It includes both 0-8 Basic etc. classes 0-9 Message claasses,
0-8 classes cannot be removed till 0-9 Message is ready to replace them.
Summary of fixes:
- added 0-9 methods to SessionHandlerImpl.h, no implementation yet.
- added missing framing::Content methods
- unimplemented methods do { assert(0); // FIXME
Modified:
incubator/qpid/branches/qpid.0-9/cpp/README-dev
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.h
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
Modified: incubator/qpid/branches/qpid.0-9/cpp/README-dev
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/README-dev?view=diff&rev=492840&r1=492839&r2=492840
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/README-dev (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/README-dev Thu Jan 4 16:52:33 2007
@@ -128,6 +128,13 @@
../configure CXXFLAGS=-g --prefix=/tmp/x \
&& make && make check)
+Since it's common to want to bootstrap & test a working copy with
+default configuration you can say:
+ ./bootstrap -build
+
+Which is equivalent to
+ ./bootstrap && ./configure && make && make check
+
=== Portability ===
All system calls are abstracted by classes under lib/common/sys. This
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp?view=diff&rev=492840&r1=492839&r2=492840
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp Thu
Jan 4 16:52:33 2007
@@ -217,9 +217,13 @@
void SessionHandlerImpl::ChannelHandlerImpl::open(u_int16_t channel, const
string& /*outOfBand*/){
- parent->channels[channel] = new
Channel(parent->client->getProtocolVersion() , parent->context, channel,
parent->framemax,
- parent->queues->getStore(),
parent->settings.stagingThreshold);
- parent->client->getChannel().openOk(channel);
+ parent->channels[channel] = new Channel(
+ parent->client->getProtocolVersion() , parent->context, channel,
+ parent->framemax, parent->queues->getStore(),
+ parent->settings.stagingThreshold);
+
+ // FIXME aconway 2007-01-04: provide valid channel Id as per ampq 0-9
+ parent->client->getChannel().openOk(channel, std::string()/* ID */);
}
void SessionHandlerImpl::ChannelHandlerImpl::flow(u_int16_t /*channel*/, bool
/*active*/){}
@@ -262,7 +266,21 @@
if(!nowait){
parent->client->getExchange().declareOk(channel);
}
-}
+}
+
+
+void SessionHandlerImpl::ExchangeHandlerImpl::unbind(
+ u_int16_t /*channel*/,
+ u_int16_t /*ticket*/,
+ const string& /*queue*/,
+ const string& /*exchange*/,
+ const string& /*routingKey*/,
+ const qpid::framing::FieldTable& /*arguments*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+
void SessionHandlerImpl::ExchangeHandlerImpl::delete_(u_int16_t channel,
u_int16_t /*ticket*/,
const string& exchange,
bool /*ifUnused*/, bool nowait){
@@ -453,3 +471,42 @@
parent->getChannel(channel)->recover(false);
}
+void
+SessionHandlerImpl::QueueHandlerImpl::unbind(
+ u_int16_t /*channel*/,
+ u_int16_t /*ticket*/,
+ const string& /*queue*/,
+ const string& /*exchange*/,
+ const string& /*routingKey*/,
+ const qpid::framing::FieldTable& /*arguments*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+void
+SessionHandlerImpl::ChannelHandlerImpl::ok( u_int16_t /*channel*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+void
+SessionHandlerImpl::ChannelHandlerImpl::ping( u_int16_t /*channel*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+void
+SessionHandlerImpl::ChannelHandlerImpl::pong( u_int16_t /*channel*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+void
+SessionHandlerImpl::ChannelHandlerImpl::resume(
+ u_int16_t /*channel*/,
+ const string& /*channelId*/ )
+{
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.h?view=diff&rev=492840&r1=492839&r2=492840
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.h
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.h Thu
Jan 4 16:52:33 2007
@@ -157,7 +157,15 @@
virtual void flowOk(u_int16_t channel, bool active);
- // Change to match new code generator function signature (adding const
to string&) - kpvdr 2006-11-20
+ virtual void ok( u_int16_t channel );
+
+ virtual void ping( u_int16_t channel );
+
+ virtual void pong( u_int16_t channel );
+
+ virtual void resume( u_int16_t channel,
+ const string& channelId );
+
virtual void close(u_int16_t channel, u_int16_t replyCode, const
string& replyText,
u_int16_t classId, u_int16_t methodId);
@@ -175,9 +183,15 @@
bool passive, bool durable, bool autoDelete, bool
internal, bool nowait,
const qpid::framing::FieldTable& arguments);
- // Change to match new code generator function signature (adding const
to string&) - kpvdr 2006-11-20
virtual void delete_(u_int16_t channel, u_int16_t ticket, const
string& exchange, bool ifUnused, bool nowait);
+ virtual void unbind(u_int16_t channel,
+ u_int16_t ticket,
+ const string& queue,
+ const string& exchange,
+ const string& routingKey,
+ const qpid::framing::FieldTable& arguments );
+
virtual ~ExchangeHandlerImpl(){}
};
@@ -195,6 +209,13 @@
const string& exchange, const string& routingKey,
bool nowait,
const qpid::framing::FieldTable& arguments);
+ virtual void unbind(u_int16_t channel,
+ u_int16_t ticket,
+ const string& queue,
+ const string& exchange,
+ const string& routingKey,
+ const qpid::framing::FieldTable& arguments );
+
virtual void purge(u_int16_t channel, u_int16_t ticket, const string&
queue,
bool nowait);
@@ -258,7 +279,9 @@
inline virtual DtxHandler* getDtxHandler(){ throw ConnectionException(540,
"Dtx class not implemented"); }
inline virtual TunnelHandler* getTunnelHandler(){ throw
ConnectionException(540, "Tunnel class not implemented"); }
- // FIXME aconway 2007-01-04: what's this about?
+ virtual AMQP_ServerOperations::MessageHandler* getMessageHandler(){ throw
ConnectionException(540, "Message class not implemented"); }
+
+ // FIXME aconway 2007-01-04: Remove?
// Temporary add-in to resolve version conflicts: AMQP v8.0 still defines
class Test;
// however v0.9 will not - kpvdr 2006-11-17
// inline virtual TestHandler* getTestHandler(){ throw
ConnectionException(540, "Test class not implemented"); }
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp?view=diff&rev=492840&r1=492839&r2=492840
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp
Thu Jan 4 16:52:33 2007
@@ -18,24 +18,30 @@
* under the License.
*
*/
-#include <Buffer.h>
-#include <FramingContent.h>
+#include <assert.h>
-namespace qpid
-{
-namespace framing
-{
+#include "Buffer.h"
+#include "FramingContent.h"
+
+namespace qpid {
+namespace framing {
Content::~Content() {}
-void Content::encode(Buffer&) const
-{
+void Content::encode(Buffer&) const {
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
+
+void Content::decode(Buffer&) {
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
}
-void Content::decode(Buffer&)
-{
+size_t Content::size() const {
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
}
+std::ostream& operator<<(std::ostream&, const Content&) {
+ assert(0); // FIXME aconway 2007-01-04: 0-9 feature
+}
-} // namespace framing
-} // namespace qpid
+}} // namespace framing::qpid
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h?view=diff&rev=492840&r1=492839&r2=492840
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
Thu Jan 4 16:52:33 2007
@@ -1,26 +1,5 @@
-/*
- *
- * 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.
- *
- */
-
-#ifndef _Content_
-#define _Content_
+#ifndef _framing_FramingContent_h
+#define _framing_FramingContent_h
#include <ostream>
@@ -45,4 +24,4 @@
}} // namespace qpid::framing
-#endif
+#endif /*!_framing_FramingContent_h*/
