Minor source reorg, see README.

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

70 files changed, 233 insertions, 218 deletions

diff --git a/cpp/Makefile b/cpp/Makefile
index 95d9af73f4..36a56425ac 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -52,7 +52,7 @@ $(BUILDDIRS):
 ## Library rules
 
 LIB_common := $(call LIBFILE,common,1.0)
-$(LIB_common): $(call OBJECTS,qpid qpid/concurrent qpid/framing qpid/io) 
+$(LIB_common): $(call OBJECTS,qpid qpid/framing qpid/sys) 
 	$(LIB_COMMAND)
 
 LIB_client :=$(call LIBFILE,client,1.0)
diff --git a/cpp/README b/cpp/README
index 22eb925b91..789c535023 100644
--- a/cpp/README
+++ b/cpp/README
@@ -1,7 +1,5 @@
 = Developer guide to C++ codebase =
 
-See DESIGN for design notes, Makefile comment for build system notes.
-
 == Prerequisites ==
 
 Required to build:
@@ -14,6 +12,7 @@ Optional: to generate documentation from source code comments you need:
  * graphviz 2.8: http://www.graphviz.org/
 
 If you use yum to install packages:
+
 # yum install apr apr-devel cppunit cppunit-devel boost boost-devel doxygen graphviz
 
 == Building ==
@@ -47,10 +46,17 @@ Main targets:
  * clean: cleans the current build only. Does not clean generated code.
  * spotless: cleans up all build output and removes the build directory.
 
+=== Source Tree ===
+
 The source tree is structured as follows:
  * src/ - .h and .cpp source files, directories mirror namespaces.
- * src_apr/ - source files that depend on APR
- * src_linux/ - source files optimized for Linux.
+  * qpid/
+   * sys/ - system abstractions: threading, IO.
+    * posix/ - posix implementation
+    * apr/ - portable APR implementation (for client side)
+   * framing - encoding/decoding AMQP messages
+   * client - client classes.
+   * broker - broker classes.
  * etc/ - Non-c++ resources, e.g. stylesheets.
  * test/ 
   * unit/ - unit tests (cppunit plugins), directories mirror namespaces.
@@ -63,6 +69,20 @@ Build system principles:
  * Corresponding .cpp and .h files in same directory for easy editing.
  * Source directory structure mirrors C++ namespaces.
 
+=== Portability ===
+
+All system calls are abstracted by classes in qpid/sys. This provides
+an object-oriented C++ API and contains platform-specific code.
+
+These wrappers should be mainlly inline by-value classes so they
+impose no run-time penalty compared do direct system calls.
+
+Initially we will have a full POSIX implementation and a portable 
+implementation suffcient for the client using the APR portability
+library. The implementations may change in future but the interface
+for qpid code outside the qpid/sys namespace should remain stable.
+
+
 === Unit tests ===
 
 Unit tests are built as .so files containing CppUnit plugins. 
diff --git a/cpp/options.mk b/cpp/options.mk
index a98c42666c..ef14480113 100644
--- a/cpp/options.mk
+++ b/cpp/options.mk
@@ -14,28 +14,23 @@
  # limitations under the License.
  #
 
-## Build platform and type.
-
-# Default type
+## Build platform and type defaults
 TYPE := debug
-# Known platforms
-PLATFORMS := apr
-# TODO aconway 2006-10-30: Remove Default platform when there's more than 1.
 PLATFORM := apr
 
 # Local options, may override PLATFORM and/or TYPE
 -include options-local.mk
 
-DUMMY := $(if $(filter $(PLATFORM),$(PLATFORMS)),OK,$(error PLATFORM is not set. Use 'make PLATFORM=<name>' or create file options-local.mk with PLATFORM=<name>. Valid names: $(PLATFORMS)))
-DUMMY := $(if $(filter $(TYPE),debug release),OK,$(error TYPE must be 'debug' or 'release'))
-
-
 ## Platform specific options
 
 # apr: Apache Portable Runtime.
-CXXFLAGS_apr := -D_USE_APR_IO_ -I/usr/local/apr/include
+CXXFLAGS_apr := -I/usr/local/apr/include
 LDFLAGS_apr  := -L/usr/local/apr/lib -lapr-1 
 
+# posix: Native posix implementation
+CXXFLAGS_posix :=
+LDFLAGS_posix  :=
+
 ## Build directories.
 
 BUILD=$(PLATFORM)-$(TYPE)
@@ -46,13 +41,13 @@ OBJDIR:=build/$(BUILD)/obj
 TESTDIR:=build/$(BUILD)/test
 
 BUILDDIRS := $(BINDIR) $(LIBDIR) $(OBJDIR) $(TESTDIR) $(GENDIR)
-SRCDIRS := src src_$(PLATFORM) $(GENDIR)
+SRCDIRS := src $(GENDIR)
 
 ## External dependencies:
 
 # Add location for headers and libraries of any external dependencies here
-EXTRA_INCLUDES := -I/usr/local/apr/include
-EXTRA_LIBDIRS := -L/usr/local/apr/lib
+EXTRA_INCLUDES :=
+EXTRA_LIBDIRS  :=
 
 ## Compile flags
 
diff --git a/cpp/src/qpid/broker/AutoDelete.h b/cpp/src/qpid/broker/AutoDelete.h
index 509ac3bec1..f3347e6cc5 100644
--- a/cpp/src/qpid/broker/AutoDelete.h
+++ b/cpp/src/qpid/broker/AutoDelete.h
@@ -20,22 +20,22 @@
 
 #include <iostream>
 #include <queue>
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 #include "qpid/broker/QueueRegistry.h"
-#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/sys/ThreadFactory.h"
 
 namespace qpid {
     namespace broker{
-        class AutoDelete : private virtual qpid::concurrent::Runnable{
-            qpid::concurrent::ThreadFactory factory;
-            qpid::concurrent::Monitor lock;            
-            qpid::concurrent::Monitor monitor;            
+        class AutoDelete : private virtual qpid::sys::Runnable{
+            qpid::sys::ThreadFactory factory;
+            qpid::sys::Monitor lock;            
+            qpid::sys::Monitor monitor;            
             std::queue<Queue::shared_ptr> queues;
             QueueRegistry* const registry;
             const u_int32_t period;
             volatile bool stopped;
-            qpid::concurrent::Thread* runner;
+            qpid::sys::Thread* runner;
             
             Queue::shared_ptr const pop();
             void process();
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 0456b9f133..90a705f173 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -21,7 +21,7 @@
 
 
 using namespace qpid::broker;
-using namespace qpid::io;
+using namespace qpid::sys;
 
 Broker::Broker(const Configuration& config) :
     acceptor(new Acceptor(config.getPort(),
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 55ae17571a..c4a3a3fd4a 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -21,8 +21,8 @@
 
 #include "qpid/broker/Configuration.h"
 #include "qpid/broker/SessionHandlerFactoryImpl.h"
-#include "qpid/concurrent/Runnable.h"
-#include "qpid/io/Acceptor.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Acceptor.h"
 #include <qpid/SharedObject.h>
 
 namespace qpid {
@@ -30,7 +30,7 @@ namespace qpid {
         /**
          * A broker instance. 
          */
-        class Broker : public qpid::concurrent::Runnable,
+        class Broker : public qpid::sys::Runnable,
                        public qpid::SharedObject<Broker>
         {
           public:
@@ -68,7 +68,7 @@ namespace qpid {
 
           private:
             Broker(const Configuration& config); 
-            qpid::io::Acceptor::shared_ptr acceptor;
+            qpid::sys::Acceptor::shared_ptr acceptor;
             SessionHandlerFactoryImpl factory;
         };
     }
diff --git a/cpp/src/qpid/broker/Channel.cpp b/cpp/src/qpid/broker/Channel.cpp
index eae0a743db..45375a9fd3 100644
--- a/cpp/src/qpid/broker/Channel.cpp
+++ b/cpp/src/qpid/broker/Channel.cpp
@@ -25,7 +25,7 @@ using std::mem_fun_ref;
 using std::bind2nd;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 
 Channel::Channel(OutputHandler* _out, int _id, u_int32_t _framesize) :
diff --git a/cpp/src/qpid/broker/Channel.h b/cpp/src/qpid/broker/Channel.h
index 13bd4cd450..56f0e6b4af 100644
--- a/cpp/src/qpid/broker/Channel.h
+++ b/cpp/src/qpid/broker/Channel.h
@@ -37,7 +37,7 @@
 #include "qpid/broker/TxAck.h"
 #include "qpid/broker/TxBuffer.h"
 #include "qpid/broker/TxPublish.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/AMQContentBody.h"
 #include "qpid/framing/AMQHeaderBody.h"
@@ -77,7 +77,7 @@ namespace qpid {
             u_int32_t framesize;
             NameGenerator tagGenerator;
             std::list<DeliveryRecord> unacked;
-            qpid::concurrent::Monitor deliveryLock;
+            qpid::sys::Monitor deliveryLock;
             TxBuffer txBuffer;
             AccumulatedAck accumulatedAck;
             TransactionalStore* store;
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h
index 2c3143cd3c..a452fe3b4b 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/cpp/src/qpid/broker/DirectExchange.h
@@ -23,14 +23,14 @@
 #include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/broker/Message.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
     class DirectExchange : public virtual Exchange{
         std::map<string, std::vector<Queue::shared_ptr> > bindings;
-        qpid::concurrent::Monitor lock;
+        qpid::sys::Monitor lock;
 
     public:
         static const std::string typeName;
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp
index b2d2afa5f4..6f6c759aa2 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -22,7 +22,7 @@
 #include "qpid/broker/TopicExchange.h"
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 using std::pair;
 
 pair<Exchange::shared_ptr, bool> ExchangeRegistry::declare(const string& name, const string& type) throw(UnknownExchangeTypeException){
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h
index c574a97e14..33deb743f4 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -20,7 +20,7 @@
 
 #include <map>
 #include "qpid/broker/Exchange.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 
 namespace qpid {
 namespace broker {
@@ -29,7 +29,7 @@ namespace broker {
     class ExchangeRegistry{
         typedef std::map<string, Exchange::shared_ptr> ExchangeMap;
         ExchangeMap exchanges;
-        qpid::concurrent::Monitor lock;
+        qpid::sys::Monitor lock;
     public:
         std::pair<Exchange::shared_ptr, bool> declare(const string& name, const string& type) throw(UnknownExchangeTypeException);
         void destroy(const string& name);
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/cpp/src/qpid/broker/FanOutExchange.cpp
index c519771132..8f5143c8c0 100644
--- a/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/cpp/src/qpid/broker/FanOutExchange.cpp
@@ -21,7 +21,7 @@
 
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 FanOutExchange::FanOutExchange(const std::string& _name) : Exchange(_name) {}
 
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h
index 83fcdb9b34..53b5c39789 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/cpp/src/qpid/broker/FanOutExchange.h
@@ -23,7 +23,7 @@
 #include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/broker/Message.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 
 namespace qpid {
@@ -31,7 +31,7 @@ namespace broker {
 
 class FanOutExchange : public virtual Exchange {
     std::vector<Queue::shared_ptr> bindings;
-    qpid::concurrent::Monitor lock;
+    qpid::sys::Monitor lock;
 
   public:
     static const std::string typeName;
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp
index aece22a413..5d5cf2392c 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -24,7 +24,7 @@
 
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 // TODO aconway 2006-09-20: More efficient matching algorithm.
 // The current search algorithm really sucks.
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h
index cf699ac455..3cd25739f7 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/cpp/src/qpid/broker/HeadersExchange.h
@@ -22,7 +22,7 @@
 #include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/broker/Message.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 
 namespace qpid {
@@ -34,7 +34,7 @@ class HeadersExchange : public virtual Exchange {
     typedef std::vector<Binding> Bindings;
 
     Bindings bindings;
-    qpid::concurrent::Monitor lock;
+    qpid::sys::Monitor lock;
 
   public:
     static const std::string typeName;
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index baa1b0d915..24fc996f1f 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Message.h"
 #include <iostream>
 
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 Message::Message(const ConnectionToken* const _publisher, 
                  const string& _exchange, const string& _routingKey, 
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 8a81b07aef..7f3cfdc470 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -17,11 +17,11 @@
  */
 #include "qpid/broker/Queue.h"
 #include "qpid/broker/MessageStore.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include <iostream>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 Queue::Queue(const string& _name, u_int32_t _autodelete, 
              MessageStore* const _store,
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index 393ca6b196..8473465cab 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -26,8 +26,8 @@
 #include "qpid/broker/ConnectionToken.h"
 #include "qpid/broker/Consumer.h"
 #include "qpid/broker/Message.h"
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/concurrent/Time.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Time.h"
 
 namespace qpid {
     namespace broker {
@@ -55,7 +55,7 @@ namespace qpid {
             bool queueing;
             bool dispatching;
             int next;
-            mutable qpid::concurrent::Monitor lock;
+            mutable qpid::sys::Monitor lock;
             int64_t lastUsed;
             Consumer* exclusive;
 
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp
index 56452ca907..aa05db9a16 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/cpp/src/qpid/broker/QueueRegistry.cpp
@@ -16,13 +16,13 @@
  *
  */
 #include "qpid/broker/QueueRegistry.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/SessionHandlerImpl.h"
 #include <sstream>
 #include <assert.h>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 QueueRegistry::QueueRegistry(MessageStore* const _store) : counter(1), store(_store){}
 
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index fb22ef148a..c2fc1cc830 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -19,7 +19,7 @@
 #define _QueueRegistry_
 
 #include <map>
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 
 namespace qpid {
@@ -76,7 +76,7 @@ class QueueRegistry{
   private:
     typedef std::map<string, Queue::shared_ptr> QueueMap;
     QueueMap queues;
-    qpid::concurrent::Monitor lock;
+    qpid::sys::Monitor lock;
     int counter;
     MessageStore* const store;
 };
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index 76723881dc..8d4f955270 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -22,7 +22,7 @@
 #include "qpid/broker/DirectExchange.h"
 
 using namespace qpid::broker;
-using namespace qpid::io;
+using namespace qpid::sys;
 
 namespace
 {
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
index cea5c0fa00..6e679592ff 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
@@ -24,16 +24,16 @@
 #include "qpid/broker/QueueRegistry.h"
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandler.h"
-#include "qpid/io/SessionHandlerFactory.h"
-#include "qpid/io/TimeoutHandler.h"
+#include "qpid/sys/SessionContext.h"
+#include "qpid/sys/SessionHandler.h"
+#include "qpid/sys/SessionHandlerFactory.h"
+#include "qpid/sys/TimeoutHandler.h"
 #include <memory>
 
 namespace qpid {
     namespace broker {
 
-        class SessionHandlerFactoryImpl : public virtual qpid::io::SessionHandlerFactory
+        class SessionHandlerFactoryImpl : public virtual qpid::sys::SessionHandlerFactory
         {
             std::auto_ptr<MessageStore> store;
             QueueRegistry queues;
@@ -43,7 +43,7 @@ namespace qpid {
         public:
             SessionHandlerFactoryImpl(u_int32_t timeout = 30000);
             void recover();
-            virtual qpid::io::SessionHandler* create(qpid::io::SessionContext* ctxt);
+            virtual qpid::sys::SessionHandler* create(qpid::sys::SessionContext* ctxt);
             virtual ~SessionHandlerFactoryImpl();
         };
 
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.cpp b/cpp/src/qpid/broker/SessionHandlerImpl.cpp
index 7a03132671..5c46ed1b1b 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerImpl.cpp
@@ -24,9 +24,9 @@
 
 using namespace boost;
 using namespace qpid::broker;
-using namespace qpid::io;
+using namespace qpid::sys;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 SessionHandlerImpl::SessionHandlerImpl(SessionContext* _context, 
                                        QueueRegistry* _queues, 
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.h b/cpp/src/qpid/broker/SessionHandlerImpl.h
index 62e7ecd4c9..55cc2170ec 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerImpl.h
@@ -33,9 +33,9 @@
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/broker/QueueRegistry.h"
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandler.h"
-#include "qpid/io/TimeoutHandler.h"
+#include "qpid/sys/SessionContext.h"
+#include "qpid/sys/SessionHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
 #include "qpid/broker/TopicExchange.h"
 
 namespace qpid {
@@ -57,14 +57,14 @@ struct ConnectionException : public std::exception {
     const char* what() const throw() { return text.c_str(); }
 };
 
-class SessionHandlerImpl : public virtual qpid::io::SessionHandler, 
+class SessionHandlerImpl : public virtual qpid::sys::SessionHandler, 
                            public virtual qpid::framing::AMQP_ServerOperations, 
                            public virtual ConnectionToken
 {
     typedef std::map<u_int16_t, Channel*>::iterator channel_iterator;
     typedef std::vector<Queue::shared_ptr>::iterator queue_iterator;
 
-    qpid::io::SessionContext* context;
+    qpid::sys::SessionContext* context;
     qpid::framing::AMQP_ClientProxy client;
     QueueRegistry* queues;
     ExchangeRegistry* const exchanges;
@@ -100,7 +100,7 @@ class SessionHandlerImpl : public virtual qpid::io::SessionHandler,
     Exchange::shared_ptr findExchange(const string& name);
     
   public:
-    SessionHandlerImpl(qpid::io::SessionContext* context, QueueRegistry* queues, 
+    SessionHandlerImpl(qpid::sys::SessionContext* context, QueueRegistry* queues, 
                        ExchangeRegistry* exchanges, AutoDelete* cleaner, const u_int32_t timeout);
     virtual void received(qpid::framing::AMQFrame* frame);
     virtual void initiated(qpid::framing::ProtocolInitiation* header);
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h
index cb773b9a56..e3b9040cb2 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/cpp/src/qpid/broker/TopicExchange.h
@@ -23,7 +23,7 @@
 #include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/broker/Message.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/broker/Queue.h"
 
 namespace qpid {
@@ -71,7 +71,7 @@ class TopicPattern : public Tokens
 class TopicExchange : public virtual Exchange{
     typedef std::map<TopicPattern, Queue::vector> BindingMap;
     BindingMap bindings;
-    qpid::concurrent::Monitor lock;
+    qpid::sys::Monitor lock;
 
   public:
     static const std::string typeName;
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();
diff --git a/cpp/src_apr/qpid/concurrent/APRBase.cpp b/cpp/src/qpid/sys/APRBase.cpp
index 514c4d1048..91e2b9f428 100644
--- a/cpp/src_apr/qpid/concurrent/APRBase.cpp
+++ b/cpp/src/qpid/sys/APRBase.cpp
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include "qpid/QpidError.h"
 
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 APRBase* APRBase::instance = 0;
 
@@ -79,7 +79,7 @@ void APRBase::decrement(){
     getInstance()->_decrement();
 }
 
-void qpid::concurrent::check(apr_status_t status, const std::string& file, const int line){
+void qpid::sys::check(apr_status_t status, const std::string& file, const int line){
     if (status != APR_SUCCESS){
         const int size = 50;
         char tmp[size];
@@ -88,7 +88,7 @@ void qpid::concurrent::check(apr_status_t status, const std::string& file, const
     }
 }
 
-std::string qpid::concurrent::get_desc(apr_status_t status){
+std::string qpid::sys::get_desc(apr_status_t status){
     const int size = 50;
     char tmp[size];
     return std::string(apr_strerror(status, tmp, size));
diff --git a/cpp/src_apr/qpid/concurrent/APRBase.h b/cpp/src/qpid/sys/APRBase.h
index f3ff0f89c1..9eef07e4c4 100644
--- a/cpp/src_apr/qpid/concurrent/APRBase.h
+++ b/cpp/src/qpid/sys/APRBase.h
@@ -23,7 +23,7 @@
 #include "apr-1/apr_errno.h"
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
     /**
      * Use of APR libraries necessitates explicit init and terminate
diff --git a/cpp/src_apr/qpid/io/APRPool.cpp b/cpp/src/qpid/sys/APRPool.cpp
index 7105f77dd3..0f809ca93c 100644
--- a/cpp/src_apr/qpid/io/APRPool.cpp
+++ b/cpp/src/qpid/sys/APRPool.cpp
@@ -17,11 +17,11 @@
  */
 
 #include "APRPool.h"
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include <boost/pool/detail/singleton.hpp>
 
-using namespace qpid::io;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
+using namespace qpid::sys;
 
 APRPool::APRPool(){
     APRBase::increment();
diff --git a/cpp/src_apr/qpid/io/APRPool.h b/cpp/src/qpid/sys/APRPool.h
index 063eedf1ee..2196cd64e7 100644
--- a/cpp/src_apr/qpid/io/APRPool.h
+++ b/cpp/src/qpid/sys/APRPool.h
@@ -22,7 +22,7 @@
 #include <apr-1/apr_pools.h>
 
 namespace qpid {
-namespace io {
+namespace sys {
 /**
  * Singleton APR memory pool.
  */
diff --git a/cpp/src_apr/qpid/io/APRSocket.cpp b/cpp/src/qpid/sys/APRSocket.cpp
index 824c376c3b..586c03475f 100644
--- a/cpp/src_apr/qpid/io/APRSocket.cpp
+++ b/cpp/src/qpid/sys/APRSocket.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/io/APRSocket.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/APRSocket.h"
 #include <assert.h>
 #include <iostream>
 
-using namespace qpid::io;
+using namespace qpid::sys;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 APRSocket::APRSocket(apr_socket_t* _socket) : socket(_socket), closed(false){
 
diff --git a/cpp/src_apr/qpid/io/APRSocket.h b/cpp/src/qpid/sys/APRSocket.h
index 0b6644dfb6..f7e7ad107b 100644
--- a/cpp/src_apr/qpid/io/APRSocket.h
+++ b/cpp/src/qpid/sys/APRSocket.h
@@ -22,7 +22,7 @@
 #include "qpid/framing/Buffer.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class APRSocket
     {
diff --git a/cpp/src_apr/qpid/io/Acceptor.cpp b/cpp/src/qpid/sys/Acceptor.cpp
index f95d9448cf..f8e8504c6e 100644
--- a/cpp/src_apr/qpid/io/Acceptor.cpp
+++ b/cpp/src/qpid/sys/Acceptor.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  *
  */
-#include "qpid/io/Acceptor.h"
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/APRBase.h"
 #include "APRPool.h"
 
-using namespace qpid::concurrent;
-using namespace qpid::io;
+using namespace qpid::sys;
+using namespace qpid::sys;
 
 Acceptor::Acceptor(int16_t port_, int backlog, int threads) :
     port(port_),
diff --git a/cpp/src_apr/qpid/io/Acceptor.h b/cpp/src/qpid/sys/Acceptor.h
index 3c980f7f7f..f0f9d6feba 100644
--- a/cpp/src_apr/qpid/io/Acceptor.h
+++ b/cpp/src/qpid/sys/Acceptor.h
@@ -22,18 +22,18 @@
 #include "apr-1/apr_poll.h"
 #include "apr-1/apr_time.h"
 
-#include "qpid/io/Acceptor.h"
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/io/LFProcessor.h"
-#include "qpid/io/LFSessionContext.h"
-#include "qpid/concurrent/Runnable.h"
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandlerFactory.h"
-#include "qpid/concurrent/Thread.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/LFProcessor.h"
+#include "qpid/sys/LFSessionContext.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/SessionContext.h"
+#include "qpid/sys/SessionHandlerFactory.h"
+#include "qpid/sys/Thread.h"
 #include <qpid/SharedObject.h>
 
 namespace qpid {
-namespace io {
+namespace sys {
 
 /** APR Acceptor. */
 class Acceptor : public qpid::SharedObject<Acceptor>
diff --git a/cpp/src_apr/qpid/io/Connector.cpp b/cpp/src/qpid/sys/Connector.cpp
index ca487deb86..1d4b237d92 100644
--- a/cpp/src_apr/qpid/io/Connector.cpp
+++ b/cpp/src/qpid/sys/Connector.cpp
@@ -16,13 +16,13 @@
  *
  */
 #include <iostream>
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/io/Connector.h"
-#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/Connector.h"
+#include "qpid/sys/ThreadFactory.h"
 #include "qpid/QpidError.h"
 
-using namespace qpid::io;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
+using namespace qpid::sys;
 using namespace qpid::framing;
 using qpid::QpidError;
 
diff --git a/cpp/src_apr/qpid/io/Connector.h b/cpp/src/qpid/sys/Connector.h
index 7c52f7e87b..611acc417f 100644
--- a/cpp/src_apr/qpid/io/Connector.h
+++ b/cpp/src/qpid/sys/Connector.h
@@ -25,18 +25,18 @@
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/InitiationHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/io/ShutdownHandler.h"
-#include "qpid/io/TimeoutHandler.h"
-#include "qpid/concurrent/Thread.h"
-#include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/io/Connector.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/ThreadFactory.h"
+#include "qpid/sys/Connector.h"
+#include "qpid/sys/Monitor.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class Connector : public virtual qpid::framing::OutputHandler, 
-	private virtual qpid::concurrent::Runnable
+	private virtual qpid::sys::Runnable
     {
         const bool debug;
 	const int receive_buffer_size;
@@ -59,9 +59,9 @@ namespace io {
 	qpid::framing::Buffer inbuf;
 	qpid::framing::Buffer outbuf;
 
-        qpid::concurrent::Monitor* writeLock;
-	qpid::concurrent::ThreadFactory* threadFactory;
-	qpid::concurrent::Thread* receiver;
+        qpid::sys::Monitor* writeLock;
+	qpid::sys::ThreadFactory* threadFactory;
+	qpid::sys::Thread* receiver;
 
 	apr_pool_t* pool;
 	apr_socket_t* socket;
diff --git a/cpp/src_apr/qpid/io/LFProcessor.cpp b/cpp/src/qpid/sys/LFProcessor.cpp
index dabbdbecae..8c53c86392 100644
--- a/cpp/src_apr/qpid/io/LFProcessor.cpp
+++ b/cpp/src/qpid/sys/LFProcessor.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  *
  */
-#include "qpid/io/LFProcessor.h"
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/io/LFSessionContext.h"
+#include "qpid/sys/LFProcessor.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/LFSessionContext.h"
 #include "qpid/QpidError.h"
 #include <sstream>
 
-using namespace qpid::io;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
+using namespace qpid::sys;
 using qpid::QpidError;
 
 // TODO aconway 2006-10-12: stopped is read outside locks.
diff --git a/cpp/src_apr/qpid/io/LFProcessor.h b/cpp/src/qpid/sys/LFProcessor.h
index 5b61f444af..afbb9ea413 100644
--- a/cpp/src_apr/qpid/io/LFProcessor.h
+++ b/cpp/src/qpid/sys/LFProcessor.h
@@ -21,12 +21,12 @@
 #include "apr-1/apr_poll.h"
 #include <iostream>
 #include <vector>
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/concurrent/Runnable.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ThreadFactory.h"
+#include "qpid/sys/Runnable.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class LFSessionContext;
 
@@ -36,7 +36,7 @@ namespace io {
      * the poll returning, it will remove a session, promote a
      * follower to leadership, then process the session.
      */
-    class LFProcessor : private virtual qpid::concurrent::Runnable
+    class LFProcessor : private virtual qpid::sys::Runnable
     {
         typedef std::vector<LFSessionContext*>::iterator iterator;
         
@@ -49,10 +49,10 @@ namespace io {
         int count;
         const int workerCount;
         bool hasLeader;
-        qpid::concurrent::Thread** const workers;
-        qpid::concurrent::Monitor leadLock;
-        qpid::concurrent::Monitor countLock;
-        qpid::concurrent::ThreadFactory factory;
+        qpid::sys::Thread** const workers;
+        qpid::sys::Monitor leadLock;
+        qpid::sys::Monitor countLock;
+        qpid::sys::ThreadFactory factory;
         std::vector<LFSessionContext*> sessions;
         volatile bool stopped;
 
diff --git a/cpp/src_apr/qpid/io/LFSessionContext.cpp b/cpp/src/qpid/sys/LFSessionContext.cpp
index ca1e6431a6..f2dff87fd0 100644
--- a/cpp/src_apr/qpid/io/LFSessionContext.cpp
+++ b/cpp/src/qpid/sys/LFSessionContext.cpp
@@ -15,13 +15,13 @@
  * limitations under the License.
  *
  */
-#include "qpid/io/LFSessionContext.h"
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/LFSessionContext.h"
+#include "qpid/sys/APRBase.h"
 #include "qpid/QpidError.h"
 #include <assert.h>
 
-using namespace qpid::concurrent;
-using namespace qpid::io;
+using namespace qpid::sys;
+using namespace qpid::sys;
 using namespace qpid::framing;
 
 LFSessionContext::LFSessionContext(apr_pool_t* _pool, apr_socket_t* _socket, 
diff --git a/cpp/src_apr/qpid/io/LFSessionContext.h b/cpp/src/qpid/sys/LFSessionContext.h
index 8d30b54204..92f52ccf83 100644
--- a/cpp/src_apr/qpid/io/LFSessionContext.h
+++ b/cpp/src/qpid/sys/LFSessionContext.h
@@ -25,15 +25,15 @@
 #include "apr-1/apr_time.h"
 
 #include "qpid/framing/AMQFrame.h"
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/io/APRSocket.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/APRSocket.h"
 #include "qpid/framing/Buffer.h"
-#include "qpid/io/LFProcessor.h"
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandler.h"
+#include "qpid/sys/LFProcessor.h"
+#include "qpid/sys/SessionContext.h"
+#include "qpid/sys/SessionHandler.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
 
     class LFSessionContext : public virtual SessionContext
@@ -51,7 +51,7 @@ namespace io {
         apr_pollfd_t fd;
 
         std::queue<qpid::framing::AMQFrame*> framesToWrite;
-        qpid::concurrent::Monitor writeLock;
+        qpid::sys::Monitor writeLock;
         
         bool processing;
         bool closing;
@@ -60,7 +60,7 @@ namespace io {
         volatile unsigned int reading;
         volatile unsigned int writing;
 
-        static qpid::concurrent::Monitor logLock;
+        static qpid::sys::Monitor logLock;
         void log(const std::string& desc, qpid::framing::AMQFrame* const frame);
 
     public:
diff --git a/cpp/src_apr/qpid/concurrent/Monitor.cpp b/cpp/src/qpid/sys/Monitor.cpp
index ae68cf8751..79a29c219e 100644
--- a/cpp/src_apr/qpid/concurrent/Monitor.cpp
+++ b/cpp/src/qpid/sys/Monitor.cpp
@@ -15,46 +15,46 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/Monitor.h"
 #include <iostream>
 
-qpid::concurrent::Monitor::Monitor(){
+qpid::sys::Monitor::Monitor(){
     APRBase::increment();
     CHECK_APR_SUCCESS(apr_pool_create(&pool, NULL));
     CHECK_APR_SUCCESS(apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_NESTED, pool));
     CHECK_APR_SUCCESS(apr_thread_cond_create(&condition, pool));
 }
 
-qpid::concurrent::Monitor::~Monitor(){
+qpid::sys::Monitor::~Monitor(){
     CHECK_APR_SUCCESS(apr_thread_cond_destroy(condition));
     CHECK_APR_SUCCESS(apr_thread_mutex_destroy(mutex));
     apr_pool_destroy(pool);
     APRBase::decrement();
 }
 
-void qpid::concurrent::Monitor::wait(){
+void qpid::sys::Monitor::wait(){
     CHECK_APR_SUCCESS(apr_thread_cond_wait(condition, mutex));
 }
 
 
-void qpid::concurrent::Monitor::wait(u_int64_t time){
+void qpid::sys::Monitor::wait(u_int64_t time){
     apr_status_t status = apr_thread_cond_timedwait(condition, mutex, time * 1000);
     if(!status == APR_TIMEUP) CHECK_APR_SUCCESS(status);
 }
 
-void qpid::concurrent::Monitor::notify(){
+void qpid::sys::Monitor::notify(){
     CHECK_APR_SUCCESS(apr_thread_cond_signal(condition));
 }
 
-void qpid::concurrent::Monitor::notifyAll(){
+void qpid::sys::Monitor::notifyAll(){
     CHECK_APR_SUCCESS(apr_thread_cond_broadcast(condition));
 }
 
-void qpid::concurrent::Monitor::acquire(){
+void qpid::sys::Monitor::acquire(){
     CHECK_APR_SUCCESS(apr_thread_mutex_lock(mutex));
 }
 
-void qpid::concurrent::Monitor::release(){
+void qpid::sys::Monitor::release(){
     CHECK_APR_SUCCESS(apr_thread_mutex_unlock(mutex));
 }
diff --git a/cpp/src_apr/qpid/concurrent/Monitor.h b/cpp/src/qpid/sys/Monitor.h
index a2777cb2f1..ddda613b87 100644
--- a/cpp/src_apr/qpid/concurrent/Monitor.h
+++ b/cpp/src/qpid/sys/Monitor.h
@@ -20,10 +20,10 @@
 
 #include "apr-1/apr_thread_mutex.h"
 #include "apr-1/apr_thread_cond.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
 class Monitor
 {
diff --git a/cpp/src/qpid/concurrent/Runnable.cpp b/cpp/src/qpid/sys/Runnable.cpp
index 5b18ccfab6..d7d9e968cc 100644
--- a/cpp/src/qpid/concurrent/Runnable.cpp
+++ b/cpp/src/qpid/sys/Runnable.cpp
@@ -15,5 +15,5 @@
  *
  */
 
-#include "qpid/concurrent/Runnable.h"
-qpid::concurrent::Runnable::~Runnable() {}
+#include "qpid/sys/Runnable.h"
+qpid::sys::Runnable::~Runnable() {}
diff --git a/cpp/src/qpid/concurrent/Runnable.h b/cpp/src/qpid/sys/Runnable.h
index 9753a1ad0a..ce13eb2039 100644
--- a/cpp/src/qpid/concurrent/Runnable.h
+++ b/cpp/src/qpid/sys/Runnable.h
@@ -19,7 +19,7 @@
 #define _Runnable_
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
     class Runnable
     {
diff --git a/cpp/src/qpid/io/SessionContext.h b/cpp/src/qpid/sys/SessionContext.h
index c9a2ce49f2..1362b4f2f2 100644
--- a/cpp/src/qpid/io/SessionContext.h
+++ b/cpp/src/qpid/sys/SessionContext.h
@@ -21,7 +21,7 @@
 #include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
 /**
  * Provides the output handler associated with a connection.
diff --git a/cpp/src/qpid/io/SessionHandler.h b/cpp/src/qpid/sys/SessionHandler.h
index ac455122d6..130e69caf4 100644
--- a/cpp/src/qpid/io/SessionHandler.h
+++ b/cpp/src/qpid/sys/SessionHandler.h
@@ -21,10 +21,10 @@
 #include "qpid/framing/InputHandler.h"
 #include "qpid/framing/InitiationHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/io/TimeoutHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class SessionHandler :
         public qpid::framing::InitiationHandler,
diff --git a/cpp/src/qpid/io/SessionHandlerFactory.h b/cpp/src/qpid/sys/SessionHandlerFactory.h
index 441b8e9fd6..da2f3e95eb 100644
--- a/cpp/src/qpid/io/SessionHandlerFactory.h
+++ b/cpp/src/qpid/sys/SessionHandlerFactory.h
@@ -19,7 +19,7 @@
 #define _SessionHandlerFactory_
 
 namespace qpid {
-namespace io {
+namespace sys {
 
 class SessionContext;
 class SessionHandler;
diff --git a/cpp/src/qpid/io/ShutdownHandler.h b/cpp/src/qpid/sys/ShutdownHandler.h
index 186d9eeca4..4107f09f89 100644
--- a/cpp/src/qpid/io/ShutdownHandler.h
+++ b/cpp/src/qpid/sys/ShutdownHandler.h
@@ -19,7 +19,7 @@
 #define _ShutdownHandler_
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class ShutdownHandler
     {
diff --git a/cpp/src_apr/qpid/concurrent/Thread.cpp b/cpp/src/qpid/sys/Thread.cpp
index 9bbc2f8131..4fb9915993 100644
--- a/cpp/src_apr/qpid/concurrent/Thread.cpp
+++ b/cpp/src/qpid/sys/Thread.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/concurrent/Thread.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/Thread.h"
 #include "apr-1/apr_portable.h"
 
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 void* APR_THREAD_FUNC ExecRunnable(apr_thread_t* thread, void *data){
     ((Runnable*) data)->run();
@@ -45,6 +45,6 @@ void Thread::interrupt(){
     if (runner) CHECK_APR_SUCCESS(apr_thread_exit(runner, APR_SUCCESS));
 }
 
-unsigned int qpid::concurrent::Thread::currentThread(){
+unsigned int qpid::sys::Thread::currentThread(){
     return apr_os_thread_current();
 }
diff --git a/cpp/src_apr/qpid/concurrent/Thread.h b/cpp/src/qpid/sys/Thread.h
index d18bc153bf..e86bd4a8d2 100644
--- a/cpp/src_apr/qpid/concurrent/Thread.h
+++ b/cpp/src/qpid/sys/Thread.h
@@ -19,12 +19,12 @@
 #define _Thread_
 
 #include "apr-1/apr_thread_proc.h"
-#include "qpid/concurrent/Thread.h"
-#include "qpid/concurrent/Runnable.h"
-#include "qpid/concurrent/Thread.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Thread.h"
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
     class Thread
     {
diff --git a/cpp/src_apr/qpid/concurrent/ThreadFactory.cpp b/cpp/src/qpid/sys/ThreadFactory.cpp
index b20f9f2b04..d33872b9a2 100644
--- a/cpp/src_apr/qpid/concurrent/ThreadFactory.cpp
+++ b/cpp/src/qpid/sys/ThreadFactory.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
-#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/sys/APRBase.h"
+#include "qpid/sys/ThreadFactory.h"
 
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 ThreadFactory::ThreadFactory(){
     APRBase::increment();
diff --git a/cpp/src_apr/qpid/concurrent/ThreadFactory.h b/cpp/src/qpid/sys/ThreadFactory.h
index 572419cae6..9b7126272a 100644
--- a/cpp/src_apr/qpid/concurrent/ThreadFactory.h
+++ b/cpp/src/qpid/sys/ThreadFactory.h
@@ -20,13 +20,13 @@
 
 #include "apr-1/apr_thread_proc.h"
 
-#include "qpid/concurrent/Thread.h"
-#include "qpid/concurrent/Thread.h"
-#include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/concurrent/Runnable.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/ThreadFactory.h"
+#include "qpid/sys/Runnable.h"
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
     class ThreadFactory
     {
diff --git a/cpp/src_apr/qpid/concurrent/Time.cpp b/cpp/src/qpid/sys/Time.cpp
index 19f1f30140..c3512b8df3 100644
--- a/cpp/src_apr/qpid/concurrent/Time.cpp
+++ b/cpp/src/qpid/sys/Time.cpp
@@ -16,11 +16,11 @@
  *
  */
 
-#include <qpid/concurrent/Time.h>
+#include <qpid/sys/Time.h>
 #include <apr-1/apr_time.h>
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
 Time Time::now() {
     return Time(apr_time_now()*1000);
diff --git a/cpp/src/qpid/concurrent/Time.h b/cpp/src/qpid/sys/Time.h
index ec64ce8a85..5c7cdfb005 100644
--- a/cpp/src/qpid/concurrent/Time.h
+++ b/cpp/src/qpid/sys/Time.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 
 namespace qpid {
-namespace concurrent {
+namespace sys {
 
 /**
  * Time since the epoch.
diff --git a/cpp/src/qpid/io/TimeoutHandler.h b/cpp/src/qpid/sys/TimeoutHandler.h
index c92220fd6e..845bd72a12 100644
--- a/cpp/src/qpid/io/TimeoutHandler.h
+++ b/cpp/src/qpid/sys/TimeoutHandler.h
@@ -19,7 +19,7 @@
 #define _TimeoutHandler_
 
 namespace qpid {
-namespace io {
+namespace sys {
 
     class TimeoutHandler
     {
diff --git a/cpp/src/qpid/io/doxygen_summary.h b/cpp/src/qpid/sys/doxygen_summary.h
index 1086f65f63..af89154fdf 100644
--- a/cpp/src/qpid/io/doxygen_summary.h
+++ b/cpp/src/qpid/sys/doxygen_summary.h
@@ -21,7 +21,7 @@
 
 // No code just a doxygen comment for the namespace
 
-/** \namspace qpid::io
+/** \namspace qpid::sys
  * IO classes used by client and broker.
  *
  * This namespace contains platform-neutral classes.  Platform
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index e93676513a..f170aed95e 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 using namespace qpid::broker;
-using namespace qpid::io;
+using namespace qpid::sys;
 
 void handle_signal(int /*signal*/){
     std::cout << "Shutting down..." << std::endl;
diff --git a/cpp/test/client/client_test.cpp b/cpp/test/client/client_test.cpp
index 2a1f1a9747..0e57babbef 100644
--- a/cpp/test/client/client_test.cpp
+++ b/cpp/test/client/client_test.cpp
@@ -22,11 +22,11 @@
 #include "qpid/client/Connection.h"
 #include "qpid/client/Message.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "qpid/framing/FieldTable.h"
 
 using namespace qpid::client;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class SimpleListener : public virtual MessageListener{
     Monitor* monitor;
diff --git a/cpp/test/client/topic_publisher.cpp b/cpp/test/client/topic_publisher.cpp
index e53b70cc75..119d275cfd 100644
--- a/cpp/test/client/topic_publisher.cpp
+++ b/cpp/test/client/topic_publisher.cpp
@@ -21,14 +21,14 @@
 #include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/Queue.h"
-#include "qpid/concurrent/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "unistd.h"
 #include <apr-1/apr_time.h>
 #include <cstdlib>
 #include <iostream>
 
 using namespace qpid::client;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class Publisher : public MessageListener{    
     Channel* const channel;
diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 5052d4127d..796c949363 100644
--- a/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/cpp/test/unit/qpid/broker/ChannelTest.cpp
@@ -24,7 +24,7 @@
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index 14fb6fc097..d20b7c171a 100644
--- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class ExchangeTest : public CppUnit::TestCase
 {
diff --git a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
index c432de7785..c04226647f 100644
--- a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
@@ -24,7 +24,7 @@
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class MessageBuilderTest : public CppUnit::TestCase  
 {
diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp
index 9b4040a8ca..1dbbeda827 100644
--- a/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include "qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class MessageTest : public CppUnit::TestCase  
 {
diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp
index ba1427a087..ee64854dbb 100644
--- a/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/cpp/test/unit/qpid/broker/QueueTest.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 
 class TestBinding : public virtual Binding{
diff --git a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp b/cpp/test/unit/qpid/sys/APRBaseTest.cpp
index 0b4fd94e10..fc0c7dd9e1 100644
--- a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp
+++ b/cpp/test/unit/qpid/sys/APRBaseTest.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class APRBaseTest : public CppUnit::TestCase  
 {