Minor source reorg, see README.

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

8 files changed, 12 insertions, 12 deletions

diff --git a/qpid/cpp/test/client/client_test.cpp b/qpid/cpp/test/client/client_test.cpp
index 2a1f1a9747..0e57babbef 100644
--- a/qpid/cpp/test/client/client_test.cpp
+++ b/qpid/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/qpid/cpp/test/client/topic_publisher.cpp b/qpid/cpp/test/client/topic_publisher.cpp
index e53b70cc75..119d275cfd 100644
--- a/qpid/cpp/test/client/topic_publisher.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp b/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 5052d4127d..796c949363 100644
--- a/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index 14fb6fc097..d20b7c171a 100644
--- a/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/qpid/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
index c432de7785..c04226647f 100644
--- a/qpid/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp b/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
index 9b4040a8ca..1dbbeda827 100644
--- a/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp b/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
index ba1427a087..ee64854dbb 100644
--- a/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/qpid/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/qpid/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp b/qpid/cpp/test/unit/qpid/sys/APRBaseTest.cpp
index 0b4fd94e10..fc0c7dd9e1 100644
--- a/qpid/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp
+++ b/qpid/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  
 {