Author: aconway
Date: Mon Oct 29 11:35:29 2007
New Revision: 589794
URL: http://svn.apache.org/viewvc?rev=589794&view=rev
Log:
Rename client::Session as client::Session_0_10
Modified:
incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
incubator/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/Session.rb Mon Oct 29
11:35:29 2007
@@ -9,7 +9,7 @@
def initialize(outdir, amqp)
super(outdir, amqp)
@chassis="server"
- @classname="Session"
+ @classname="[EMAIL PROTECTED]"
end
def return_type(m)
@@ -82,9 +82,9 @@
params=m.signature
end
if (params.empty?)
- gen "#{return_type(m)}
Session::#{m.parent.name.lcaps}#{m.name.caps}(){\n\n"
+ gen "#{return_type(m)} [EMAIL
PROTECTED]::#{m.parent.name.lcaps}#{m.name.caps}(){\n\n"
else
- gen "#{return_type(m)} Session::#{m.parent.name.lcaps}#{m.name.caps}("
+ gen "#{return_type(m)} [EMAIL
PROTECTED]::#{m.parent.name.lcaps}#{m.name.caps}("
indent { gen params.join(",\n") }
gen "){\n\n"
end
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp Mon Oct 29
11:35:29 2007
@@ -49,9 +49,9 @@
class ScopedSync
{
- Session& session;
+ Session_0_10& session;
public:
- ScopedSync(Session& s, bool enabled = true) : session(s) {
session.setSynchronous(enabled); }
+ ScopedSync(Session_0_10& s, bool enabled = true) : session(s) {
session.setSynchronous(enabled); }
~ScopedSync() { session.setSynchronous(false); }
};
@@ -66,7 +66,7 @@
join();
}
-void Channel::open(const Session& s)
+void Channel::open(const Session_0_10& s)
{
Mutex::ScopedLock l(stopLock);
if (isOpen())
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h Mon Oct 29 11:35:29
2007
@@ -29,7 +29,7 @@
#include "Message.h"
#include "Queue.h"
#include "ConnectionImpl.h"
-#include "qpid/client/Session.h"
+#include "qpid/client/Session_0_10.h"
#include "qpid/Exception.h"
#include "qpid/sys/Mutex.h"
#include "qpid/sys/Runnable.h"
@@ -78,7 +78,7 @@
bool running;
ConsumerMap consumers;
- Session session;
+ Session_0_10 session;
framing::ChannelId channelId;
BlockingQueue<framing::FrameSet::shared_ptr> gets;
framing::Uuid uniqueId;
@@ -87,7 +87,7 @@
void stop();
- void open(const Session& session);
+ void open(const Session_0_10& session);
void closeInternal();
void join();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Mon Oct 29
11:35:29 2007
@@ -73,15 +73,15 @@
channel.open(newSession());
}
-Session Connection::newSession(uint32_t detachedLifetime) {
+Session_0_10 Connection::newSession(uint32_t detachedLifetime) {
shared_ptr<SessionCore> core(
new SessionCore(impl, ++channelIdCounter, max_frame_size));
impl->addSession(core);
core->open(detachedLifetime);
- return Session(core);
+ return Session_0_10(core);
}
-void Connection::resume(Session& session) {
+void Connection::resume(Session_0_10& session) {
session.impl->setChannel(++channelIdCounter);
impl->addSession(session.impl);
session.impl->resume(impl);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Mon Oct 29
11:35:29 2007
@@ -25,7 +25,7 @@
#include <string>
#include "Channel.h"
#include "ConnectionImpl.h"
-#include "qpid/client/Session.h"
+#include "qpid/client/Session_0_10.h"
#include "qpid/framing/AMQP_HighestVersion.h"
#include "qpid/framing/Uuid.h"
@@ -135,13 +135,13 @@
* that the broker may discard the session state. Default is 0,
* meaning the session cannot be resumed.
*/
- Session newSession(uint32_t detachedLifetime=0);
+ Session_0_10 newSession(uint32_t detachedLifetime=0);
/**
* Resume a suspendded session. A session may be resumed
* on a different connection to the one that created it.
*/
- void resume(Session& session);
+ void resume(Session_0_10& session);
};
}} // namespace qpid::client
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Mon Oct 29
11:35:29 2007
@@ -20,7 +20,7 @@
*/
#include "Dispatcher.h"
-#include "qpid/client/Session.h"
+#include "qpid/client/Session_0_10.h"
#include "qpid/framing/FrameSet.h"
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/log/Statement.h"
@@ -36,7 +36,7 @@
namespace qpid {
namespace client {
- Subscriber::Subscriber(Session& s, MessageListener* l, bool a, uint f) :
session(s), listener(l), autoAck(a), ackBatchSize(f), count(0) {}
+ Subscriber::Subscriber(Session_0_10& s, MessageListener* l, bool a, uint
f) : session(s), listener(l), autoAck(a), ackBatchSize(f), count(0) {}
void Subscriber::received(Message& msg)
{
@@ -51,7 +51,7 @@
}
- Dispatcher::Dispatcher(Session& s, const std::string& q) : session(s),
queue(q), running(false), stopped(false)
+ Dispatcher::Dispatcher(Session_0_10& s, const std::string& q) :
session(s), queue(q), running(false), stopped(false)
{
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h Mon Oct 29
11:35:29 2007
@@ -33,11 +33,11 @@
namespace qpid {
namespace client {
-class Session;
+class Session_0_10;
class Subscriber : public MessageListener
{
- Session& session;
+ Session_0_10& session;
MessageListener* const listener;
const bool autoAck;
const uint ackBatchSize;
@@ -45,7 +45,7 @@
public:
typedef boost::shared_ptr<Subscriber> shared_ptr;
- Subscriber(Session& session, MessageListener* listener, bool autoAck =
true, uint ackBatchSize = 1);
+ Subscriber(Session_0_10& session, MessageListener* listener, bool autoAck
= true, uint ackBatchSize = 1);
void received(Message& msg);
};
@@ -57,7 +57,7 @@
typedef std::map<std::string, Subscriber::shared_ptr> Listeners;
sys::Mutex lock;
sys::Thread worker;
- Session& session;
+ Session_0_10& session;
const std::string queue;
bool running;
bool stopped;
@@ -71,7 +71,7 @@
bool isStopped();
public:
- Dispatcher(Session& session, const std::string& queue = "");
+ Dispatcher(Session_0_10& session, const std::string& queue = "");
void start();
void run();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h Mon Oct 29 11:35:29
2007
@@ -22,7 +22,7 @@
*
*/
#include <string>
-#include "qpid/client/Session.h"
+#include "qpid/client/Session_0_10.h"
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/framing/TransferContent.h"
@@ -60,7 +60,7 @@
return getMessageProperties().getApplicationHeaders();
}
- void acknowledge(Session& session, bool cumulative = true, bool send =
true) const
+ void acknowledge(Session_0_10& session, bool cumulative = true, bool send
= true) const
{
session.execution().completed(id, cumulative, send);
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp?rev=589794&r1=589793&r2=589794&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp Mon Oct 29
11:35:29 2007
@@ -21,7 +21,7 @@
#include "qpid_test_plugin.h"
#include "InProcessBroker.h"
#include "qpid/client/Dispatcher.h"
-#include "qpid/client/Session.h"
+#include "qpid/client/Session_0_10.h"
#include "qpid/framing/TransferContent.h"
#include "qpid/framing/reply_exceptions.h"
@@ -42,7 +42,7 @@
uint count;
Dispatcher dispatcher;
- DummyListener(Session& session, const std::string& _name, uint _expected)
: name(_name), expected(_expected), count(0),
+ DummyListener(Session_0_10& session, const std::string& _name, uint
_expected) : name(_name), expected(_expected), count(0),
dispatcher(session) {}
void listen()
@@ -74,7 +74,7 @@
CPPUNIT_TEST_SUITE_END();
shared_ptr<broker::Broker> broker;
- Session session;
+ Session_0_10 session;
// Defer construction & thread creation to setUp
boost::optional<InProcessConnection> c;
boost::optional<InProcessConnection> c2;
