From 658acd8e14857a5c8533f06f0a109ca2230cc54e Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Wed, 22 Jul 2015 13:35:25 +0200
Subject: [PATCH] Further moved common structures out of the scheduler
 directory.

---
 common/CMakeLists.txt                            | 14 +++++++++++++-
 {scheduler => common}/SecurityIdentity.cpp       |  2 +-
 {scheduler => common}/SecurityIdentity.hpp       |  0
 {scheduler => common}/TapePool.cpp               |  2 +-
 {scheduler => common}/TapePool.hpp               |  0
 {scheduler => common}/UserIdentityTest.cpp       |  0
 {scheduler => common}/VO.cpp                     |  2 +-
 {scheduler => common}/VO.hpp                     |  0
 {scheduler => common/archiveNS}/StorageClass.cpp |  2 +-
 {scheduler => common/archiveNS}/StorageClass.hpp |  0
 {scheduler => common/archiveNS}/Tape.cpp         |  2 +-
 {scheduler => common/archiveNS}/Tape.hpp         |  0
 .../archiveNS}/TapeCopyLocation.cpp              |  2 +-
 .../archiveNS}/TapeCopyLocation.hpp              |  0
 .../exception}/DiskException.cpp                 |  0
 .../exception}/DiskException.hpp                 |  0
 .../exception}/TapeException.cpp                 |  2 +-
 .../exception}/TapeException.hpp                 |  0
 {scheduler => common/priorities}/DriveQuota.cpp  |  2 +-
 {scheduler => common/priorities}/DriveQuota.hpp  |  0
 .../priorities}/MountCriteria.cpp                |  2 +-
 .../priorities}/MountCriteria.hpp                |  0
 {scheduler => common/priorities}/UserGroup.cpp   |  2 +-
 {scheduler => common/priorities}/UserGroup.hpp   |  4 ++--
 nameserver/CastorNameServer.hpp                  |  2 +-
 nameserver/NameServer.hpp                        |  2 +-
 nameserver/mockNS/MockNameServer.hpp             |  2 +-
 scheduler/CMakeLists.txt                         | 16 ++--------------
 scheduler/OStoreDB/OStoreDB.cpp                  | 10 +++++-----
 scheduler/OStoreDB/OStoreDBFactory.hpp           |  6 +++---
 scheduler/RetrieveFromTapeCopyRequest.cpp        |  2 +-
 scheduler/RetrieveFromTapeCopyRequest.hpp        |  2 +-
 scheduler/RetrieveJob.hpp                        |  2 +-
 scheduler/RetrieveToFileRequest.cpp              |  2 +-
 scheduler/Scheduler.cpp                          |  8 ++++----
 scheduler/SchedulerDatabaseTest.cpp              |  2 +-
 scheduler/SchedulerTest.cpp                      |  8 ++++----
 scheduler/mockDB/MockSchedulerDatabase.cpp       |  8 ++++----
 scheduler/mockDB/MockSchedulerDatabase.hpp       |  2 +-
 xroot_plugins/XrdProFile.cpp                     |  8 ++++----
 xroot_plugins/XrdProFilesystem.cpp               |  6 +++---
 41 files changed, 63 insertions(+), 63 deletions(-)
 rename {scheduler => common}/SecurityIdentity.cpp (97%)
 rename {scheduler => common}/SecurityIdentity.hpp (100%)
 rename {scheduler => common}/TapePool.cpp (98%)
 rename {scheduler => common}/TapePool.hpp (100%)
 rename {scheduler => common}/UserIdentityTest.cpp (100%)
 rename {scheduler => common}/VO.cpp (98%)
 rename {scheduler => common}/VO.hpp (100%)
 rename {scheduler => common/archiveNS}/StorageClass.cpp (97%)
 rename {scheduler => common/archiveNS}/StorageClass.hpp (100%)
 rename {scheduler => common/archiveNS}/Tape.cpp (98%)
 rename {scheduler => common/archiveNS}/Tape.hpp (100%)
 rename {scheduler => common/archiveNS}/TapeCopyLocation.cpp (96%)
 rename {scheduler => common/archiveNS}/TapeCopyLocation.hpp (100%)
 rename {scheduler => common/exception}/DiskException.cpp (100%)
 rename {scheduler => common/exception}/DiskException.hpp (100%)
 rename {scheduler => common/exception}/TapeException.cpp (96%)
 rename {scheduler => common/exception}/TapeException.hpp (100%)
 rename {scheduler => common/priorities}/DriveQuota.cpp (97%)
 rename {scheduler => common/priorities}/DriveQuota.hpp (100%)
 rename {scheduler => common/priorities}/MountCriteria.cpp (97%)
 rename {scheduler => common/priorities}/MountCriteria.hpp (100%)
 rename {scheduler => common/priorities}/UserGroup.cpp (98%)
 rename {scheduler => common/priorities}/UserGroup.hpp (97%)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 6e5c76abb9..22e54c8104 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -10,24 +10,35 @@ set (COMMON_LIB_SRC_FILES
   archiveNS/ArchiveDirEntry.cpp
   archiveNS/ArchiveDirIterator.cpp
   archiveNS/ArchiveFileStatus.cpp
+  archiveNS/StorageClass.cpp
+  archiveNS/Tape.cpp
+  archiveNS/TapeCopyLocation.cpp
   archiveNS/TapeCopyLocationAndStatus.cpp
   CreationLog.cpp
   checksum/ByteArray.cpp
   checksum/Checksum.cpp
   exception/Backtrace.cpp
+  exception/DiskException.hpp
   exception/Errnum.cpp
   exception/Exception.cpp
   exception/Serrnum.cpp
+  exception/TapeException.cpp
+  priorities/DriveQuota.cpp
+  priorities/MountCriteria.cpp
+  priorities/UserGroup.cpp
   remoteFS/RemoteFileStatus.cpp
   remoteFS/RemotePath.cpp
   remoteFS/RemotePathAndStatus.cpp
+  SecurityIdentity.cpp
   strerror_r_wrapper.cpp
+  TapePool.cpp
   Timer.cpp
   threading/ChildProcess.cpp
   threading/Mutex.cpp
   threading/Threading.cpp
   UserIdentity.cpp
-  Utils.cpp)
+  Utils.cpp
+  VO.cpp)
 
 add_library (ctacommon SHARED
   ${COMMON_LIB_SRC_FILES})
@@ -42,6 +53,7 @@ set (COMMON_UNIT_TESTS_LIB_SRC_FILES
   checksum/ByteArrayTest.cpp
   checksum/ChecksumTest.cpp
   remoteFS/RemotePathTest.cpp
+  UserIdentityTest.cpp
   UtilsTest.cpp)
 
 add_library (ctacommonunittests SHARED
diff --git a/scheduler/SecurityIdentity.cpp b/common/SecurityIdentity.cpp
similarity index 97%
rename from scheduler/SecurityIdentity.cpp
rename to common/SecurityIdentity.cpp
index 196c92c4fd..77ecc733ef 100644
--- a/scheduler/SecurityIdentity.cpp
+++ b/common/SecurityIdentity.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/SecurityIdentity.hpp b/common/SecurityIdentity.hpp
similarity index 100%
rename from scheduler/SecurityIdentity.hpp
rename to common/SecurityIdentity.hpp
diff --git a/scheduler/TapePool.cpp b/common/TapePool.cpp
similarity index 98%
rename from scheduler/TapePool.cpp
rename to common/TapePool.cpp
index dc763b9ae7..efd0b846ac 100644
--- a/scheduler/TapePool.cpp
+++ b/common/TapePool.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapePool.hpp"
+#include "common/TapePool.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapePool.hpp b/common/TapePool.hpp
similarity index 100%
rename from scheduler/TapePool.hpp
rename to common/TapePool.hpp
diff --git a/scheduler/UserIdentityTest.cpp b/common/UserIdentityTest.cpp
similarity index 100%
rename from scheduler/UserIdentityTest.cpp
rename to common/UserIdentityTest.cpp
diff --git a/scheduler/VO.cpp b/common/VO.cpp
similarity index 98%
rename from scheduler/VO.cpp
rename to common/VO.cpp
index 24b592c322..1b31fd3de0 100644
--- a/scheduler/VO.cpp
+++ b/common/VO.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/VO.hpp"
+#include "common/VO.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/VO.hpp b/common/VO.hpp
similarity index 100%
rename from scheduler/VO.hpp
rename to common/VO.hpp
diff --git a/scheduler/StorageClass.cpp b/common/archiveNS/StorageClass.cpp
similarity index 97%
rename from scheduler/StorageClass.cpp
rename to common/archiveNS/StorageClass.cpp
index 6fccfd0eaa..1bd77e3efd 100644
--- a/scheduler/StorageClass.cpp
+++ b/common/archiveNS/StorageClass.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "common/CreationLog.hpp"
 
 //------------------------------------------------------------------------------
diff --git a/scheduler/StorageClass.hpp b/common/archiveNS/StorageClass.hpp
similarity index 100%
rename from scheduler/StorageClass.hpp
rename to common/archiveNS/StorageClass.hpp
diff --git a/scheduler/Tape.cpp b/common/archiveNS/Tape.cpp
similarity index 98%
rename from scheduler/Tape.cpp
rename to common/archiveNS/Tape.cpp
index 36fe0c8f7e..6109935f3b 100644
--- a/scheduler/Tape.cpp
+++ b/common/archiveNS/Tape.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/Tape.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/Tape.hpp b/common/archiveNS/Tape.hpp
similarity index 100%
rename from scheduler/Tape.hpp
rename to common/archiveNS/Tape.hpp
diff --git a/scheduler/TapeCopyLocation.cpp b/common/archiveNS/TapeCopyLocation.cpp
similarity index 96%
rename from scheduler/TapeCopyLocation.cpp
rename to common/archiveNS/TapeCopyLocation.cpp
index 3b29d19ded..064f852960 100644
--- a/scheduler/TapeCopyLocation.cpp
+++ b/common/archiveNS/TapeCopyLocation.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapeCopyLocation.hpp b/common/archiveNS/TapeCopyLocation.hpp
similarity index 100%
rename from scheduler/TapeCopyLocation.hpp
rename to common/archiveNS/TapeCopyLocation.hpp
diff --git a/scheduler/DiskException.cpp b/common/exception/DiskException.cpp
similarity index 100%
rename from scheduler/DiskException.cpp
rename to common/exception/DiskException.cpp
diff --git a/scheduler/DiskException.hpp b/common/exception/DiskException.hpp
similarity index 100%
rename from scheduler/DiskException.hpp
rename to common/exception/DiskException.hpp
diff --git a/scheduler/TapeException.cpp b/common/exception/TapeException.cpp
similarity index 96%
rename from scheduler/TapeException.cpp
rename to common/exception/TapeException.cpp
index 324472d3c5..3967f4c35c 100644
--- a/scheduler/TapeException.cpp
+++ b/common/exception/TapeException.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapeException.hpp"
+#include "common/exception/TapeException.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapeException.hpp b/common/exception/TapeException.hpp
similarity index 100%
rename from scheduler/TapeException.hpp
rename to common/exception/TapeException.hpp
diff --git a/scheduler/DriveQuota.cpp b/common/priorities/DriveQuota.cpp
similarity index 97%
rename from scheduler/DriveQuota.cpp
rename to common/priorities/DriveQuota.cpp
index 7906927891..0dddd23bdc 100644
--- a/scheduler/DriveQuota.cpp
+++ b/common/priorities/DriveQuota.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/DriveQuota.hpp"
+#include "common/priorities/DriveQuota.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/DriveQuota.hpp b/common/priorities/DriveQuota.hpp
similarity index 100%
rename from scheduler/DriveQuota.hpp
rename to common/priorities/DriveQuota.hpp
diff --git a/scheduler/MountCriteria.cpp b/common/priorities/MountCriteria.cpp
similarity index 97%
rename from scheduler/MountCriteria.cpp
rename to common/priorities/MountCriteria.cpp
index 31e212316e..58196e92f8 100644
--- a/scheduler/MountCriteria.cpp
+++ b/common/priorities/MountCriteria.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/MountCriteria.hpp"
+#include "common/priorities/MountCriteria.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/MountCriteria.hpp b/common/priorities/MountCriteria.hpp
similarity index 100%
rename from scheduler/MountCriteria.hpp
rename to common/priorities/MountCriteria.hpp
diff --git a/scheduler/UserGroup.cpp b/common/priorities/UserGroup.cpp
similarity index 98%
rename from scheduler/UserGroup.cpp
rename to common/priorities/UserGroup.cpp
index e8d78435a5..76df73aed7 100644
--- a/scheduler/UserGroup.cpp
+++ b/common/priorities/UserGroup.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/UserGroup.hpp"
+#include "common/priorities/UserGroup.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/UserGroup.hpp b/common/priorities/UserGroup.hpp
similarity index 97%
rename from scheduler/UserGroup.hpp
rename to common/priorities/UserGroup.hpp
index 9d365dfd1a..33715d13b3 100644
--- a/scheduler/UserGroup.hpp
+++ b/common/priorities/UserGroup.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include "common/CreationLog.hpp"
-#include "scheduler/DriveQuota.hpp"
-#include "scheduler/MountCriteria.hpp"
+#include "common/priorities/DriveQuota.hpp"
+#include "common/priorities/MountCriteria.hpp"
 
 #include <stdint.h>
 #include <string>
diff --git a/nameserver/CastorNameServer.hpp b/nameserver/CastorNameServer.hpp
index 31e00d133b..c0e5ba26e5 100644
--- a/nameserver/CastorNameServer.hpp
+++ b/nameserver/CastorNameServer.hpp
@@ -21,7 +21,7 @@
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/UserIdentity.hpp"
 #include "nameserver/NameServer.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <list>
 #include <string>
diff --git a/nameserver/NameServer.hpp b/nameserver/NameServer.hpp
index a35f4f9835..4144b59f87 100644
--- a/nameserver/NameServer.hpp
+++ b/nameserver/NameServer.hpp
@@ -20,7 +20,7 @@
 
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/archiveNS/ArchiveFileStatus.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <memory>
 #include <string>
diff --git a/nameserver/mockNS/MockNameServer.hpp b/nameserver/mockNS/MockNameServer.hpp
index a6db975ad5..0f5a490862 100644
--- a/nameserver/mockNS/MockNameServer.hpp
+++ b/nameserver/mockNS/MockNameServer.hpp
@@ -21,7 +21,7 @@
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/UserIdentity.hpp"
 #include "nameserver/NameServer.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <list>
 #include <string>
diff --git a/scheduler/CMakeLists.txt b/scheduler/CMakeLists.txt
index aa1ecd6833..18734bf79e 100644
--- a/scheduler/CMakeLists.txt
+++ b/scheduler/CMakeLists.txt
@@ -11,13 +11,10 @@ set (CTA_SCHEDULER_SRC_FILES
   ArchiveToDirRequest.cpp
   ArchiveToFileRequest.cpp
   ArchiveToTapeCopyRequest.cpp
-  DiskException.cpp
-  DriveQuota.cpp
   TapeJob.cpp
   LogicalLibrary.cpp
   mockDB/MockSchedulerDatabase.cpp
   mockDB/MockSchedulerDatabaseFactory.cpp
-  MountCriteria.cpp
   RetrieveJob.cpp
   RetrieveFromTapeCopyRequest.cpp
   RetrieveRequest.cpp
@@ -26,18 +23,10 @@ set (CTA_SCHEDULER_SRC_FILES
   Scheduler.cpp
   SchedulerDatabase.cpp
   SchedulerDatabaseFactory.cpp
-  SecurityIdentity.cpp
   mockDB/SqliteColumnNameToIndex.cpp
   mockDB/SQLiteStatementDeleter.cpp
-  StorageClass.cpp
-  Tape.cpp
-  TapeCopyLocation.cpp
-  TapeException.cpp
-  TapePool.cpp
   TapeSession.cpp
-  UserGroup.cpp
-  UserRequest.cpp
-  VO.cpp)
+  UserRequest.cpp)
 
 add_library (ctascheduler SHARED
   ${CTA_SCHEDULER_SRC_FILES})
@@ -49,8 +38,7 @@ add_library (ctaschedulertest SHARED
   mockDB/MockSchedulerDatabaseFactory.cpp
   SchedulerDatabaseFactory.cpp
   SchedulerDatabaseTest.cpp
-  SchedulerTest.cpp
-  UserIdentityTest.cpp)
+  SchedulerTest.cpp)
 
 target_link_libraries (ctaschedulertest ${SQLITE3_LIBRARY_RELEASE})
 
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 0b0bfa1b51..e9929f1759 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "OStoreDB.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "objectstore/RootEntry.hpp"
 #include "objectstore/TapePool.hpp"
 #include "objectstore/Tape.hpp"
@@ -31,12 +31,12 @@
 #include "scheduler/ArchiveToFileRequest.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
+#include "common/archiveNS/Tape.hpp"
 #include "ArchiveToDirRequest.hpp"
 #include "RetrieveToFileRequest.hpp"
-#include "TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 #include "RetrieveToDirRequest.hpp"
 #include "ArchiveToTapeCopyRequest.hpp"
 #include <algorithm>
diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp
index 0db1e2f896..4eb369ee0a 100644
--- a/scheduler/OStoreDB/OStoreDBFactory.hpp
+++ b/scheduler/OStoreDB/OStoreDBFactory.hpp
@@ -20,9 +20,9 @@
 
 #include "scheduler/SchedulerDatabaseFactory.hpp"
 #include "scheduler/OStoreDB/OStoreDB.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
+#include "common/archiveNS/Tape.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/ArchiveToTapeCopyRequest.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
diff --git a/scheduler/RetrieveFromTapeCopyRequest.cpp b/scheduler/RetrieveFromTapeCopyRequest.cpp
index 152410f122..9168bb001f 100644
--- a/scheduler/RetrieveFromTapeCopyRequest.cpp
+++ b/scheduler/RetrieveFromTapeCopyRequest.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/RetrieveFromTapeCopyRequest.hpp b/scheduler/RetrieveFromTapeCopyRequest.hpp
index 24dda40309..440c48b606 100644
--- a/scheduler/RetrieveFromTapeCopyRequest.hpp
+++ b/scheduler/RetrieveFromTapeCopyRequest.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/RetrieveRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 #include <list>
 #include <string>
diff --git a/scheduler/RetrieveJob.hpp b/scheduler/RetrieveJob.hpp
index eb6dcee2e7..d665f005b8 100644
--- a/scheduler/RetrieveJob.hpp
+++ b/scheduler/RetrieveJob.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/TapeJob.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 #include <string>
 
diff --git a/scheduler/RetrieveToFileRequest.cpp b/scheduler/RetrieveToFileRequest.cpp
index eaf196e6d7..a588be745a 100644
--- a/scheduler/RetrieveToFileRequest.cpp
+++ b/scheduler/RetrieveToFileRequest.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 6e6a1e2746..5470755713 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -35,10 +35,10 @@
 #include "scheduler/RetrieveToFileRequest.hpp"
 #include "scheduler/Scheduler.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 #include "scheduler/TapeMount.hpp"
 
 #include <iostream>
diff --git a/scheduler/SchedulerDatabaseTest.cpp b/scheduler/SchedulerDatabaseTest.cpp
index 494e9aeeb6..839d70d370 100644
--- a/scheduler/SchedulerDatabaseTest.cpp
+++ b/scheduler/SchedulerDatabaseTest.cpp
@@ -24,7 +24,7 @@
 #include "scheduler/mockDB/MockSchedulerDatabaseFactory.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
 #include "scheduler/SchedulerDatabaseFactory.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "OStoreDB/OStoreDBFactory.hpp"
 
 #include <exception>
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index a83bff323c..b2333083f6 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -29,10 +29,10 @@
 #include "scheduler/MountRequest.hpp"
 #include "scheduler/Scheduler.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 #include "OStoreDB/OStoreDBFactory.hpp"
 
 #include <exception>
diff --git a/scheduler/mockDB/MockSchedulerDatabase.cpp b/scheduler/mockDB/MockSchedulerDatabase.cpp
index 8b6a881915..c677cbd8b3 100644
--- a/scheduler/mockDB/MockSchedulerDatabase.cpp
+++ b/scheduler/mockDB/MockSchedulerDatabase.cpp
@@ -30,12 +30,12 @@
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "scheduler/mockDB/SqliteColumnNameToIndex.hpp"
 #include "scheduler/mockDB/SQLiteStatementDeleter.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/scheduler/mockDB/MockSchedulerDatabase.hpp b/scheduler/mockDB/MockSchedulerDatabase.hpp
index 3030b99e6d..dca88585de 100644
--- a/scheduler/mockDB/MockSchedulerDatabase.hpp
+++ b/scheduler/mockDB/MockSchedulerDatabase.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "common/exception/Exception.hpp"
 
 #include <sqlite3.h>
diff --git a/xroot_plugins/XrdProFile.cpp b/xroot_plugins/XrdProFile.cpp
index 7fb1b51935..7acb60cc09 100644
--- a/xroot_plugins/XrdProFile.cpp
+++ b/xroot_plugins/XrdProFile.cpp
@@ -27,11 +27,11 @@
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "xroot_plugins/XrdProFile.hpp"
 
 #include "XrdSec/XrdSecEntity.hh"
diff --git a/xroot_plugins/XrdProFilesystem.cpp b/xroot_plugins/XrdProFilesystem.cpp
index bc9c7c21c7..ca896d7ba4 100644
--- a/xroot_plugins/XrdProFilesystem.cpp
+++ b/xroot_plugins/XrdProFilesystem.cpp
@@ -29,10 +29,10 @@
 #include "scheduler/OStoreDB/OStoreDB.hpp"
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
 #include "XrdProFilesystem.hpp"
 #include "XrdProFile.hpp"
 #include "XrdOuc/XrdOucString.hh"
-- 
GitLab