Start moving towards final 0-10 spec:

* marked preview spec as 99-0 to distinguish it from 0-10 (which will now be used for the final version)
* modified python client to treat 99-0 as 0-10 for now
* modified broker to have two paths for the two different versions: 99-0 uses PreviewConnection, PreviewConnectionHandler 
  and PreviewSessionHandler which are straight copy & pastes of the Connection, ConnectionHandler and SessionHandler now
  associated with 0-10 (so we can migrate the 0-10 path to the final spec without affecting clients working with the preview
  version)
 


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

1 files changed, 5 insertions, 5 deletions

diff --git a/qpid/cpp/src/tests/topic_publisher.cpp b/qpid/cpp/src/tests/topic_publisher.cpp
index 24a4fc6752..2271849c35 100644
--- a/qpid/cpp/src/tests/topic_publisher.cpp
+++ b/qpid/cpp/src/tests/topic_publisher.cpp
@@ -37,7 +37,7 @@
 #include "TestOptions.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/Session_0_10.h"
+#include "qpid/client/Session.h"
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
@@ -56,7 +56,7 @@ using namespace std;
  * back by the subscribers.
  */
 class Publisher {    
-    Session_0_10& session;
+    Session& session;
     SubscriptionManager mgr;
     LocalQueue queue;
     const string controlTopic;
@@ -66,7 +66,7 @@ class Publisher {
     string generateData(int size);
 
 public:
-    Publisher(Session_0_10& session, const string& controlTopic, bool tx, bool durable);
+    Publisher(Session& session, const string& controlTopic, bool tx, bool durable);
     int64_t publish(int msgs, int listeners, int size);
     void terminate();
 };
@@ -107,7 +107,7 @@ int main(int argc, char** argv) {
         else {
             Connection connection(args.trace);
             args.open(connection);
-            Session_0_10 session = connection.newSession(ASYNC);
+            Session session = connection.newSession(ASYNC);
             if (args.transactional) {
                 session.txSelect();
             }
@@ -150,7 +150,7 @@ int main(int argc, char** argv) {
     return 1;
 }
 
-Publisher::Publisher(Session_0_10& _session, const string& _controlTopic, bool tx, bool d) : 
+Publisher::Publisher(Session& _session, const string& _controlTopic, bool tx, bool d) : 
     session(_session), mgr(session), controlTopic(_controlTopic), transactional(tx), durable(d) 
 {
     mgr.subscribe(queue, "response");