Moved DirIterator from the scheduler directory to common

common/CMakeLists.txt

 cmake_minimum_required (VERSION 2.6)
 
 set (COMMON_LIB_SRC_FILES
-  FileStatus.cpp
-  SmartFd.cpp
-  Timer.cpp
-  UserIdentity.cpp
-  Utils.cpp
+  DirEntry.cpp
+  DirIterator.cpp
   exception/Backtrace.cpp
   exception/Errnum.cpp
   exception/Exception.cpp
+  FileStatus.cpp
+  SmartFd.cpp
   strerror_r_wrapper.cpp
+  Timer.cpp
   threading/ChildProcess.cpp
   threading/Mutex.cpp
-  threading/Threading.cpp)
+  threading/Threading.cpp
+  UserIdentity.cpp
+  Utils.cpp)
 
 add_library (ctacommon SHARED
   ${COMMON_LIB_SRC_FILES})

scheduler/DirEntry.cpp → common/DirEntry.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/DirEntry.hpp"
+#include "common/DirEntry.hpp"
 
 //------------------------------------------------------------------------------
 // entryTypeToStr

scheduler/DirIterator.cpp → common/DirIterator.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/DirIterator.hpp"
+#include "common/DirIterator.hpp"
 #include "common/exception/Exception.hpp"
 using cta::exception::Exception;
 

scheduler/DirIterator.hpp → common/DirIterator.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/DirEntry.hpp"
+#include "common/DirEntry.hpp"
 
 #include <list>
 

nameserver/MockNameServer.hpp

@@ -20,7 +20,7 @@
 
 #include "common/UserIdentity.hpp"
 #include "nameserver/NameServer.hpp"
-#include "scheduler/DirIterator.hpp"
+#include "common/DirIterator.hpp"
 #include "scheduler/SecurityIdentity.hpp"
 
 #include <list>

nameserver/NameServer.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/FileStatus.hpp"
-#include "scheduler/DirIterator.hpp"
+#include "common/DirIterator.hpp"
 #include "scheduler/SecurityIdentity.hpp"
 
 #include <string>

scheduler/CMakeLists.txt

@@ -17,8 +17,6 @@ set (CTA_SCHEDULER_SRC_FILES
   ArchiveToTapeCopyRequest.cpp
   ConfigurationItem.cpp
   CreationLog.cpp
-  DirEntry.cpp
-  DirIterator.cpp
   DiskException.cpp
   DriveQuota.cpp
   FileAttribute.cpp

scheduler/FileSystemDirEntry.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/DirEntry.hpp"
+#include "common/DirEntry.hpp"
 #include "scheduler/FileSystemStorageClasses.hpp"
 
 namespace cta {

scheduler/MockSchedulerDatabase.cpp

@@ -25,7 +25,7 @@
 #include "scheduler/ArchiveToFileRequest.hpp"
 #include "scheduler/ArchiveToTapeCopyRequest.hpp"
 #include "scheduler/ArchivalRoute.hpp"
-#include "scheduler/DirIterator.hpp"
+#include "common/DirIterator.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"

xroot_plugins/XrdProFile.cpp

@@ -34,7 +34,7 @@
 
 #include "XrdSec/XrdSecEntity.hh"
 #include "cmdline/CTACmd.hpp"
-#include "scheduler/DirIterator.hpp"
+#include "common/DirIterator.hpp"
 
 #include <iostream>
 #include <pwd.h>