Remove client::Execution and FrameSet from the public API.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@772182 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 16 insertions, 22 deletions

diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index d898ea70d9..1671462c58 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -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 {
 
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index 9efc205b23..0eb1203e16 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -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 @@ Dispatcher::Dispatcher(const Session& s, const std::string& q)
       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()
diff --git a/cpp/src/qpid/client/Dispatcher.h b/cpp/src/qpid/client/Dispatcher.h
index 9b8a6de908..4206b6ff15 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/cpp/src/qpid/client/Dispatcher.h
@@ -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"
diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/cpp/src/qpid/client/SessionBase_0_10.cpp
index 8a33c7393f..140d6f9a12 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.cpp
+++ b/cpp/src/qpid/client/SessionBase_0_10.cpp
@@ -37,11 +37,6 @@ void SessionBase_0_10::close()
     if (impl) impl->close(); 
 }
 
-Execution& SessionBase_0_10::getExecution()
-{
-    return *impl;
-}
-
 void SessionBase_0_10::flush()
 {
     impl->sendFlush();
@@ -76,7 +71,5 @@ void SessionBase_0_10::resume(Connection c) { impl->resume(c.impl); }
 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
diff --git a/cpp/src/qpid/client/SessionBase_0_10.h b/cpp/src/qpid/client/SessionBase_0_10.h
index d375b3ec2e..b4f713dcb5 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/cpp/src/qpid/client/SessionBase_0_10.h
@@ -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 qpid {
 namespace client {
 
 class Connection;
+class SessionImpl;
 
 using std::string;
 using framing::Content;
@@ -63,9 +62,6 @@ class SessionBase_0_10 {
     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 @@ class SessionBase_0_10 {
     /** 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);
diff --git a/cpp/src/qpid/client/SessionBase_0_10Access.h b/cpp/src/qpid/client/SessionBase_0_10Access.h
index e2189a53dd..4d08a7ceaf 100644
--- a/cpp/src/qpid/client/SessionBase_0_10Access.h
+++ b/cpp/src/qpid/client/SessionBase_0_10Access.h
@@ -33,7 +33,7 @@ class SessionBase_0_10Access {
   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;
 };
diff --git a/cpp/src/qpid/client/SubscriptionImpl.cpp b/cpp/src/qpid/client/SubscriptionImpl.cpp
index fb5808f3a6..c0f58ed4e7 100644
--- a/cpp/src/qpid/client/SubscriptionImpl.cpp
+++ b/cpp/src/qpid/client/SubscriptionImpl.cpp
@@ -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 @@ void SubscriptionImpl::received(Message& m) {
 
 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();
 }
 
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h
index b8099f2e51..8c72683b1a 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -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; };
diff --git a/cpp/src/qpid/framing/amqp_types.h b/cpp/src/qpid/framing/amqp_types.h
index 97b889a7ca..0cc2e80dce 100644
--- a/cpp/src/qpid/framing/amqp_types.h
+++ b/cpp/src/qpid/framing/amqp_types.h
@@ -59,5 +59,8 @@ class SequenceNumberSet;
 class SequenceSet;
 struct Uuid;
 
+// Enum types
+enum DeliveryMode { TRANSIENT = 1, PERSISTENT = 2};
+
 }} // namespace qpid::framing
 #endif
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp
index 0a72facd86..f732d61ce1 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/cpp/src/tests/ClientSessionTest.cpp
@@ -176,8 +176,7 @@ QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(testSuspendResume, 1)
     // 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());
 }