updating include paths

build/CMakeLists.txt

@@ -8,8 +8,8 @@ set (CXX_FLAGS "-Wall -Wextra -pedantic -Weffc++ -Wshadow "
                "-ggdb -fprofile-arcs -ftest-coverage -std=c++0x")
 add_definitions( ${CXX_FLAGS} )
 
-include_directories (../include)
-aux_source_directory(../src CPP_UTILS_LIB_SOURCES)
+include_directories (../lib/cpp_utils/)
+aux_source_directory(../lib/cpp_utils/ CPP_UTILS_LIB_SOURCES)
 
 add_library (CppUtils SHARED ${CPP_UTILS_LIB_SOURCES})
 

test/CMakeLists.txt

@@ -13,40 +13,40 @@ if(CXXTEST_FOUND)
   set(CXXTEST_USE_PERL TRUE)
 #   set(CXXTEST_TESTGEN_ARGS "")
 
-  include_directories(${CXXTEST_INCLUDE_DIR} ../include)
+  include_directories(${CXXTEST_INCLUDE_DIR} ../lib/)
   enable_testing()
   CXXTEST_ADD_TEST(testCppUtils
   generated_main.cpp
-  Fixture.hpp
-
-  test_Logger.hpp
-  test_ArgParse.hpp
-  test_Common.hpp
-  test_ConditionalVariable.hpp
-  test_Multiton.hpp
-  test_Mutex.hpp
-  test_ObjectPool.hpp
-  test_ScopedLock.hpp
-  test_Semaphore.hpp
-#   test_Singleton_DCLP.hpp
-#   test_Singleton_call_once.hpp
-  # test_Singleton.hpp Cannot test private member, Ficture.hpp loads it
-#   test_Singleton_meyers.hpp
-  test_Thread.hpp
-  test_ThreadPool.hpp
-
-  test_timerUser.hpp
-  test_Timer.hpp
-  test_Connection.hpp
-  test_StreamConnection.hpp
-  test_TcpConnection.hpp
-  test_Message.hpp
+  cpp_utils/Fixture.hpp
+
+  cpp_utils/test_Logger.hpp
+  cpp_utils/test_ArgParse.hpp
+  cpp_utils/test_Common.hpp
+  cpp_utils/test_ConditionalVariable.hpp
+  cpp_utils/test_Multiton.hpp
+  cpp_utils/test_Mutex.hpp
+  cpp_utils/test_ObjectPool.hpp
+  cpp_utils/test_ScopedLock.hpp
+  cpp_utils/test_Semaphore.hpp
+#   cpp_utils/test_Singleton_DCLP.hpp
+#   cpp_utils/test_Singleton_call_once.hpp
+  # cpp_utils/test_Singleton.hpp Cannot test private member, Ficture.hpp loads it
+#   cpp_utils/test_Singleton_meyers.hpp
+  cpp_utils/test_Thread.hpp
+  cpp_utils/test_ThreadPool.hpp
+
+  cpp_utils/test_timerUser.hpp
+  cpp_utils/test_Timer.hpp
+  cpp_utils/test_Connection.hpp
+  cpp_utils/test_StreamConnection.hpp
+  cpp_utils/test_TcpConnection.hpp
+  cpp_utils/test_Message.hpp
 
   )
   target_link_libraries(testCppUtils CppUtils gcov)
 endif()
 
 add_custom_target( test
-                   COMMAND ./run_test.sh ./testCppUtils
+                   COMMAND ./tools/run_test.sh ./testCppUtils
                    DEPENDS testCppUtils
 )

test/cpp_utils/Fixture.hpp

@@ -4,7 +4,7 @@
 #include <cxxtest/TestSuite.h>
 #include <cxxtest/GlobalFixture.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include <iostream>
 
 class TestFixture : public CxxTest::GlobalFixture

test/cpp_utils/SimpleMessage.hpp

@@ -1,7 +1,7 @@
 #ifndef SIMPLEMESSAGE_HPP
 #define SIMPLEMESSAGE_HPP
 
-#include "Message.hpp"
+#include <cpp_utils/Message.hpp>
 
 class SimpleMessage : public Message
 {

test/cpp_utils/test_ArgParse.hpp

@@ -1,11 +1,11 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include "Fixture.hpp"
 
 
 #define private public
-#include "ArgParse.hpp"
+#include <cpp_utils/ArgParse.hpp>
 
 #include <string>
 #include <stdexcept>

test/cpp_utils/test_Common.hpp

@@ -1,7 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include "Fixture.hpp"
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 
 #include <time.h> // timespec
 

test/cpp_utils/test_ConditionalVariable.hpp

@@ -1,7 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Mutex.hpp"
-#include "ConditionVariable.hpp"
+#include <cpp_utils/Mutex.hpp>
+#include <cpp_utils/ConditionVariable.hpp>
 
 
 class TestConditionVariable : public CxxTest::TestSuite

test/cpp_utils/test_Connection.hpp

@@ -2,7 +2,7 @@
 
 #include "Fixture.hpp"
 
-#include "Connection.hpp"
+#include <cpp_utils/Connection.hpp>
 
 class TestConnection : public CxxTest::TestSuite
 {

test/cpp_utils/test_Logger.hpp

@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include "Fixture.hpp"
 
 

test/cpp_utils/test_Message.hpp

@@ -2,9 +2,9 @@
 
 #include "Fixture.hpp"
 
-#include "Message.hpp"
+#include <cpp_utils/Message.hpp>
 #include "SimpleMessage.hpp"
-#include "Connection.hpp"
+#include <cpp_utils/Connection.hpp>
 
 
 class TestMessage : public CxxTest::TestSuite

test/cpp_utils/test_Multiton.hpp

@@ -1,8 +1,8 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include "Fixture.hpp"
-#include "Multiton.hpp"
+#include <cpp_utils/Multiton.hpp>
 
 
 class TestMultitonSuite : public CxxTest::TestSuite

test/cpp_utils/test_Mutex.hpp

@@ -1,8 +1,8 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include "Fixture.hpp"
-#include "Mutex.hpp"
+#include <cpp_utils/Mutex.hpp>
 
 #include <errno.h> // EDEADLK, EPERM, ETIMEDOUT
 

test/cpp_utils/test_ObjectPool.hpp

@@ -2,11 +2,11 @@
 
 #include <unistd.h>
 
-#include "Common.hpp"
+#include <cpp_utils/Common.hpp>
 #include "Fixture.hpp"
 
-#include "ObjectPool.hpp"
-#include "Thread.hpp"
+#include <cpp_utils/ObjectPool.hpp>
+#include <cpp_utils/Thread.hpp>
 
 class TestObjectPool : public CxxTest::TestSuite
 {

test/cpp_utils/test_ScopedLock.hpp

@@ -1,6 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "ScopedLock.hpp"
+#include <cpp_utils/ScopedLock.hpp>
+
 #include "Fixture.hpp"
 
 

test/cpp_utils/test_Semaphore.hpp

@@ -1,8 +1,9 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Semaphore.hpp"
-#include "Thread.hpp"
-#include "Common.hpp"
+#include <cpp_utils/Semaphore.hpp>
+#include <cpp_utils/Thread.hpp>
+#include <cpp_utils/Common.hpp>
+
 #include "Fixture.hpp"
 
 class TestSemaphore : public CxxTest::TestSuite

test/cpp_utils/test_StreamConnection.hpp

@@ -2,7 +2,7 @@
 
 #include "Fixture.hpp"
 
-#include "StreamConnection.hpp"
+#include <cpp_utils/StreamConnection.hpp>
 
 class TestStreamConnection : public CxxTest::TestSuite
 {

test/cpp_utils/test_TcpConnection.hpp

@@ -4,11 +4,11 @@
 
 #include "Fixture.hpp"
 
-#include "Thread.hpp"
-#include "TcpConnection.hpp"
+#include <cpp_utils/Thread.hpp>
+#include <cpp_utils/TcpConnection.hpp>
 #include "SimpleMessage.hpp"
 
-#include "SocketClient.hpp"
+#include <cpp_utils/SocketClient.hpp>
 
 class TestTcpConnection : public CxxTest::TestSuite
 {

test/cpp_utils/test_Thread.hpp

@@ -2,10 +2,10 @@
 
 #include "Fixture.hpp"
 
-#include "Thread.hpp"
-#include "Common.hpp"
-#include "Mutex.hpp"
-#include "ScopedLock.hpp"
+#include <cpp_utils/Thread.hpp>
+#include <cpp_utils/Common.hpp>
+#include <cpp_utils/Mutex.hpp>
+#include <cpp_utils/Semaphore.hpp>
 
 #include <stdlib.h> // malloc
 #include <signal.h> // SIGINT

test/cpp_utils/test_ThreadPool.hpp

@@ -1,10 +1,11 @@
 #include <cxxtest/TestSuite.h>
 
-#include "Task.hpp"
-#include "Thread.hpp"
-#include "WorkerThread.hpp"
-#include "ThreadPool.hpp"
-#include "Common.hpp"
+#include <cpp_utils/Task.hpp>
+#include <cpp_utils/Thread.hpp>
+#include <cpp_utils/WorkerThread.hpp>
+#include <cpp_utils/ThreadPool.hpp>
+#include <cpp_utils/Common.hpp>
+
 #include "Fixture.hpp"
 
 

test/cpp_utils/test_Timer.hpp

@@ -2,7 +2,7 @@
 
 #include "Fixture.hpp"
 
-#include "Timer.hpp"
+#include <cpp_utils/Timer.hpp>
 
 
 class TestTimer : public CxxTest::TestSuite

test/cpp_utils/test_timerUser.hpp

@@ -4,7 +4,7 @@
 
 #define protected public
 
-#include "Timer.hpp"
+#include <cpp_utils/Timer.hpp>
 
 
 class TestTimerUser : public CxxTest::TestSuite