Minor source reorg, see README.

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

6 files changed, 22 insertions, 22 deletions

diff --git a/cpp/src/qpid/client/Channel.cpp b/cpp/src/qpid/client/Channel.cpp
index 4579b6126d..a7b30f2f94 100644
--- a/cpp/src/qpid/client/Channel.cpp
+++ b/cpp/src/qpid/client/Channel.cpp
@@ -16,15 +16,15 @@
  *
  */
 #include "qpid/client/Channel.h"
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ThreadFactory.h"
 #include "qpid/client/Message.h"
 #include "qpid/QpidError.h"
 
 using namespace boost;          //to use dynamic_pointer_cast
 using namespace qpid::client;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 Channel::Channel(bool _transactional, u_int16_t _prefetch) :
     id(0),
diff --git a/cpp/src/qpid/client/Channel.h b/cpp/src/qpid/client/Channel.h
index 0b60a827b7..fa8cd3afe0 100644
--- a/cpp/src/qpid/client/Channel.h
+++ b/cpp/src/qpid/client/Channel.h
@@ -25,7 +25,7 @@
 
 #include "qpid/framing/amqp_framing.h"
 
-#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/sys/ThreadFactory.h"
 
 #include "qpid/client/Connection.h"
 #include "qpid/client/Exchange.h"
@@ -40,7 +40,7 @@ namespace qpid {
 namespace client {
     enum ack_modes {NO_ACK=0, AUTO_ACK=1, LAZY_ACK=2, CLIENT_ACK=3};
 
-    class Channel : private virtual qpid::framing::BodyHandler, public virtual qpid::concurrent::Runnable{
+    class Channel : private virtual qpid::framing::BodyHandler, public virtual qpid::sys::Runnable{
         struct Consumer{
             MessageListener* listener;
             int ackMode;
@@ -51,15 +51,15 @@ namespace client {
 
 	u_int16_t id;
 	Connection* con;
-	qpid::concurrent::ThreadFactory* threadFactory;
-	qpid::concurrent::Thread* dispatcher;
+	qpid::sys::ThreadFactory* threadFactory;
+	qpid::sys::Thread* dispatcher;
 	qpid::framing::OutputHandler* out;
 	IncomingMessage* incoming;
 	ResponseHandler responses;
 	std::queue<IncomingMessage*> messages;//holds returned messages or those delivered for a consume
 	IncomingMessage* retrieved;//holds response to basic.get
-	qpid::concurrent::Monitor* dispatchMonitor;
-	qpid::concurrent::Monitor* retrievalMonitor;
+	qpid::sys::Monitor* dispatchMonitor;
+	qpid::sys::Monitor* retrievalMonitor;
 	std::map<std::string, Consumer*> consumers;
 	ReturnedMessageHandler* returnsHandler;
 	bool closed;
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp
index acd4488813..5a104bd302 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -17,15 +17,15 @@
  */
 #include "qpid/client/Connection.h"
 #include "qpid/client/Channel.h"
-#include "qpid/io/Connector.h"
+#include "qpid/sys/Connector.h"
 #include "qpid/client/Message.h"
 #include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::client;
 using namespace qpid::framing;
-using namespace qpid::io;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
+using namespace qpid::sys;
 
 u_int16_t Connection::channelIdCounter;
 
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index 5f0b222196..da747d0e1d 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -22,9 +22,9 @@
 #define _Connection_
 
 #include "qpid/QpidError.h"
-#include "qpid/io/Connector.h"
-#include "qpid/io/ShutdownHandler.h"
-#include "qpid/io/TimeoutHandler.h"
+#include "qpid/sys/Connector.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/client/Exchange.h"
@@ -40,8 +40,8 @@ namespace client {
     class Channel;
 
 class Connection : public virtual qpid::framing::InputHandler, 
-        public virtual qpid::io::TimeoutHandler, 
-        public virtual qpid::io::ShutdownHandler, 
+        public virtual qpid::sys::TimeoutHandler, 
+        public virtual qpid::sys::ShutdownHandler, 
         private virtual qpid::framing::BodyHandler{
 
         typedef std::map<int, Channel*>::iterator iterator;
@@ -52,7 +52,7 @@ class Connection : public virtual qpid::framing::InputHandler,
 	int port;
 	const u_int32_t max_frame_size;
 	std::map<int, Channel*> channels; 
-	qpid::io::Connector* connector;
+	qpid::sys::Connector* connector;
 	qpid::framing::OutputHandler* out;
 	ResponseHandler responses;
         volatile bool closed;
diff --git a/cpp/src/qpid/client/ResponseHandler.cpp b/cpp/src/qpid/client/ResponseHandler.cpp
index fcbc76f625..16989e2c25 100644
--- a/cpp/src/qpid/client/ResponseHandler.cpp
+++ b/cpp/src/qpid/client/ResponseHandler.cpp
@@ -16,11 +16,11 @@
  *
  */
 #include "qpid/client/ResponseHandler.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/QpidError.h"
 
 qpid::client::ResponseHandler::ResponseHandler() : waiting(false){
-    monitor = new qpid::concurrent::Monitor();
+    monitor = new qpid::sys::Monitor();
 }
 
 qpid::client::ResponseHandler::~ResponseHandler(){
diff --git a/cpp/src/qpid/client/ResponseHandler.h b/cpp/src/qpid/client/ResponseHandler.h
index 179daa1f1f..ac4c351211 100644
--- a/cpp/src/qpid/client/ResponseHandler.h
+++ b/cpp/src/qpid/client/ResponseHandler.h
@@ -17,7 +17,7 @@
  */
 #include <string>
 #include "qpid/framing/amqp_framing.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_
@@ -28,7 +28,7 @@ namespace qpid {
         class ResponseHandler{
             bool waiting;
             qpid::framing::AMQMethodBody::shared_ptr response;
-            qpid::concurrent::Monitor* monitor;
+            qpid::sys::Monitor* monitor;
 
         public:
             ResponseHandler();