Removed the redundant libs directory by bringing the middletier sub-directory up

libs/middletier/UtilsTest.cpp → middletier/cta/UtilsTest.cpp

-#include "Utils.hpp"
+#include "cta/Utils.hpp"
 
 #include <gtest/gtest.h>
 

libs/middletier/Vfs.cpp → middletier/cta/Vfs.cpp

@@ -10,9 +10,9 @@
 #include <attr/xattr.h>
 #include <fcntl.h>
 
-#include "Exception.hpp"
-#include "Utils.hpp"
-#include "Vfs.hpp"
+#include "cta/Exception.hpp"
+#include "cta/Utils.hpp"
+#include "cta/Vfs.hpp"
 
 //------------------------------------------------------------------------------
 // checkDirectoryExists

libs/middletier/Vfs.hpp → middletier/cta/Vfs.hpp

 #pragma once
 
-#include "DirectoryIterator.hpp"
-#include "SecurityIdentity.hpp"
+#include "cta/DirectoryIterator.hpp"
+#include "cta/SecurityIdentity.hpp"
 
 namespace cta {
 

libs/middletier/VfsTest.cpp → middletier/cta/VfsTest.cpp

-#include "Vfs.hpp"
+#include "cta/Vfs.hpp"
 
 #include <gtest/gtest.h>
 

objectstore/AdminUsersList.hpp

 #pragma once
 
+#include "cta/AdminUser.hpp"
 #include "ObjectOps.hpp"
 #include "objectstore/cta.pb.h"
-#include "libs/middletier/AdminUser.hpp"
 
 namespace cta { namespace objectstore {
 
@@ -19,4 +19,4 @@ public:
   void add(const cta::AdminUser & adminUser);
 };
 
-}}
\ No newline at end of file
+}}

objectstore/CMakeLists.txt

 cmake_minimum_required (VERSION 2.6)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
 include_directories(${CMAKE_BINARY_DIR})
 
 find_package(Protobuf)
@@ -66,4 +67,4 @@ set(ObjectStoreUnitTests
 
 add_executable(unitTests unitTests.cpp ${ObjectStoreUnitTests})
 target_link_libraries(unitTests
-  protobuf rados CTAObjectStore gtest gmock)
\ No newline at end of file
+  protobuf rados CTAObjectStore gtest gmock)

objectstore/exception/Errnum.cpp

@@ -22,8 +22,8 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "exception/Errnum.hpp"
-#include "exception/strerror_r_wrapper.h"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/strerror_r_wrapper.h"
 #include <string.h>
 #include <errno.h>
 

objectstore/exception/Exception.cpp

@@ -22,7 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "exception/Exception.hpp"
+#include "objectstore/exception/Exception.hpp"
 
 //------------------------------------------------------------------------------
 // constructor

objectstore/threading/ChildProcess.hpp

@@ -22,8 +22,8 @@
  *****************************************************************************/
 #pragma once
 
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
 #include <unistd.h>
 
 

objectstore/threading/Mutex.cpp

-#include "threading/Mutex.hpp"
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
+#include "objectstore/threading/Mutex.hpp"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
 
 //------------------------------------------------------------------------------
 //constructor

objectstore/threading/Threading.hpp

@@ -23,11 +23,12 @@
 
 #pragma once
 
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
+#include "objectstore/threading/Mutex.hpp"
+
 #include <pthread.h>
 #include <semaphore.h>
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
-#include "threading/Mutex.hpp"
 
 namespace cta {
 namespace threading { 

objectstore_middletier/CMakeLists.txt

 cmake_minimum_required (VERSION 2.6)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
 include_directories(${CMAKE_BINARY_DIR})
 
 add_library (CTAObjectStoreMiddleTier
   ObjectStoreMiddleTier.cpp
-)
\ No newline at end of file
+)

objectstore_middletier/ObjectStoreMiddleTier.cpp

+#include "cta/Exception.hpp"
 #include "ObjectStoreMiddleTier.hpp"
 #include "objectstore/Backend.hpp"
 #include "objectstore/RootEntry.hpp"
 #include "objectstore/AdminUsersList.hpp"
-#include "../libs/middletier/Exception.hpp"
 
 namespace cta {
 

objectstore_middletier/ObjectStoreMiddleTier.hpp

 #pragma once
 
-#include "../libs/middletier/MiddleTierAdmin.hpp"
+#include "cta/MiddleTierAdmin.hpp"
 
 namespace cta {
 

xroot_plugins/CMakeLists.txt

@@ -2,7 +2,9 @@ cmake_minimum_required (VERSION 2.6)
 
 list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 find_package (xrootd REQUIRED)
-include_directories (${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
+include_directories (${CMAKE_SOURCE_DIR})
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
+include_directories (${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
 
 add_library (XrdProFst MODULE XrdProFilesystem.cpp XrdProFile.cpp XrdProDir.cpp ParsedRequest.cpp)
 target_link_libraries (XrdProFst ctamiddletier)

xroot_plugins/XrdProDir.hpp

 #pragma once
 
-#include <iostream>
-
+#include "cta/SqliteMiddleTierUser.hpp"
 #include "XrdSec/XrdSecEntity.hh"
 #include "XrdSfs/XrdSfsInterface.hh"
 
-#include "libs/middletier/SqliteMiddleTierUser.hpp"
+#include <iostream>
 
 class XrdProDir : public XrdSfsDirectory
 {

xroot_plugins/XrdProFilesystem.cpp

+#include "cta/Exception.hpp"
+
 #include "XrdProFilesystem.hpp"
 #include "XrdProFile.hpp"
 #include "XrdProDir.hpp"
@@ -5,7 +7,6 @@
 #include "XrdOuc/XrdOucString.hh"
 #include "XrdSec/XrdSecEntity.hh"
 #include "XrdVersion.hh"
-#include "libs/middletier/Exception.hpp"
 
 #include <iostream>
 #include <pwd.h>

xroot_plugins/XrdProFilesystem.hpp

 #pragma once
 
-#include "libs/middletier/SqliteMiddleTierAdmin.hpp"
-#include "libs/middletier/SqliteMiddleTierUser.hpp"
+#include "cta/SqliteMiddleTierAdmin.hpp"
+#include "cta/SqliteMiddleTierUser.hpp"
 #include "XrdSfs/XrdSfsInterface.hh"
 
 #include "ParsedRequest.hpp"