You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/05/06 14:44:49 UTC
svn commit: r772182 - in /qpid/trunk/qpid/cpp/src: qpid/client/
qpid/framing/ tests/
Author: aconway
Date: Wed May 6 12:44:35 2009
New Revision: 772182
URL: http://svn.apache.org/viewvc?rev=772182&view=rev
Log:
Remove client::Execution and FrameSet from the public API.
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Wed May 6 12:44:35 2009
@@ -26,6 +26,7 @@
#include "qpid/client/Session.h"
#include "qpid/client/ClientImportExport.h"
#include "qpid/client/ConnectionSettings.h"
+#include "qpid/framing/ProtocolVersion.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Wed May 6 12:44:35 2009
@@ -20,6 +20,7 @@
*/
#include "Dispatcher.h"
#include "SubscriptionImpl.h"
+#include "SessionImpl.h"
#include "qpid/framing/FrameSet.h"
#include "qpid/framing/MessageTransferBody.h"
@@ -45,9 +46,8 @@
autoStop(true),
failoverHandler(0)
{
- queue = q.empty() ?
- session.getExecution().getDemux().getDefault() :
- session.getExecution().getDemux().get(q);
+ Demux& demux = SessionBase_0_10Access(session).get()->getDemux();
+ queue = q.empty() ? demux.getDefault() : demux.get(q);
}
void Dispatcher::start()
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h Wed May 6 12:44:35 2009
@@ -26,6 +26,7 @@
#include <string>
#include <boost/shared_ptr.hpp>
#include "qpid/client/Session.h"
+#include "qpid/client/SessionBase_0_10Access.h"
#include "qpid/sys/Mutex.h"
#include "qpid/sys/Runnable.h"
#include "qpid/sys/Thread.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp Wed May 6 12:44:35 2009
@@ -37,11 +37,6 @@
if (impl) impl->close();
}
-Execution& SessionBase_0_10::getExecution()
-{
- return *impl;
-}
-
void SessionBase_0_10::flush()
{
impl->sendFlush();
@@ -76,7 +71,5 @@
uint32_t SessionBase_0_10::timeout(uint32_t seconds) { return impl->setTimeout(seconds); }
SessionId SessionBase_0_10::getId() const { return impl->getId(); }
-framing::FrameSet::shared_ptr SessionBase_0_10::get() { return impl->get(); }
-
}} // namespace qpid::client
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h Wed May 6 12:44:35 2009
@@ -23,11 +23,9 @@
*/
#include "qpid/SessionId.h"
-#include "qpid/client/SessionImpl.h"
#include "qpid/framing/amqp_structs.h"
#include "qpid/client/Message.h"
#include "qpid/client/Completion.h"
-#include "qpid/client/Execution.h"
#include "qpid/client/TypedResult.h"
#include "qpid/shared_ptr.h"
#include "qpid/client/ClientImportExport.h"
@@ -37,6 +35,7 @@
namespace client {
class Connection;
+class SessionImpl;
using std::string;
using framing::Content;
@@ -63,9 +62,6 @@
QPID_CLIENT_EXTERN SessionBase_0_10();
QPID_CLIENT_EXTERN ~SessionBase_0_10();
- /** Get the next message frame-set from the session. */
- QPID_CLIENT_EXTERN framing::FrameSet::shared_ptr get();
-
/** Get the session ID */
QPID_CLIENT_EXTERN SessionId getId() const;
@@ -97,7 +93,6 @@
/** Get the channel associated with this session */
QPID_CLIENT_EXTERN uint16_t getChannel() const;
- QPID_CLIENT_EXTERN Execution& getExecution();
QPID_CLIENT_EXTERN void flush();
QPID_CLIENT_EXTERN void markCompleted(const framing::SequenceSet& ids, bool notifyPeer);
QPID_CLIENT_EXTERN void markCompleted(const framing::SequenceNumber& id, bool cumulative, bool notifyPeer);
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h Wed May 6 12:44:35 2009
@@ -33,7 +33,7 @@
public:
SessionBase_0_10Access(SessionBase_0_10& sb_) : sb(sb_) {}
void set(const boost::shared_ptr<SessionImpl>& si) { sb.impl = si; }
- boost::shared_ptr<SessionImpl> get() { return sb.impl; }
+ boost::shared_ptr<SessionImpl> get() const { return sb.impl; }
private:
SessionBase_0_10& sb;
};
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp Wed May 6 12:44:35 2009
@@ -21,11 +21,13 @@
#include "AsyncSession.h"
#include "SubscriptionImpl.h"
+#include "SessionImpl.h"
#include "SubscriptionManagerImpl.h"
#include "MessageImpl.h"
#include "CompletionImpl.h"
#include "SubscriptionManager.h"
#include "SubscriptionSettings.h"
+#include "SessionBase_0_10Access.h"
#include "PrivateImplRef.h"
namespace qpid {
@@ -153,7 +155,9 @@
Demux::QueuePtr SubscriptionImpl::divert()
{
- demuxRule = std::auto_ptr<ScopedDivert>(new ScopedDivert(name, manager.getSession().getExecution().getDemux()));
+ Session session(manager.getSession());
+ Demux& demux = SessionBase_0_10Access(session).get()->getDemux();
+ demuxRule = std::auto_ptr<ScopedDivert>(new ScopedDivert(name, demux));
return demuxRule->getQueue();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h Wed May 6 12:44:35 2009
@@ -35,8 +35,6 @@
namespace qpid {
namespace framing {
-enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
-
class AMQHeaderBody : public AMQBody
{
template <class T> struct OptProps { boost::optional<T> props; };
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h Wed May 6 12:44:35 2009
@@ -59,5 +59,8 @@
class SequenceSet;
struct Uuid;
+// Enum types
+enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
+
}} // namespace qpid::framing
#endif
Modified: qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp?rev=772182&r1=772181&r2=772182&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp Wed May 6 12:44:35 2009
@@ -176,8 +176,7 @@
// Make sure we are still subscribed after resume.
fix.connection.resume(fix.session);
fix.session.messageTransfer(arg::content=Message("my-message", "my-queue"));
- FrameSet::shared_ptr msg = fix.session.get();
- BOOST_CHECK_EQUAL(string("my-message"), msg->getContent());
+ BOOST_CHECK_EQUAL("my-message", fix.subs.get("my-queue", TIME_SEC).getData());
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org