Renamed the ArchiveRequest to UserArchiveRequest to avoid conflicting names...

Renamed the ArchiveRequest to UserArchiveRequest to avoid conflicting names (will be deleted afterwards)

scheduler/ArchiveToDirRequest.cpp

@@ -39,7 +39,7 @@ cta::ArchiveToDirRequest::ArchiveToDirRequest(
   const std::list<ArchiveToFileRequest> &archiveToFileRequests,
   const uint64_t priority,
   const CreationLog & creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   m_archiveDir(archiveDir),
   m_archiveToFileRequests(archiveToFileRequests) {
 }

scheduler/ArchiveToDirRequest.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 #include <list>
 #include <string>
@@ -32,7 +32,7 @@ class ArchiveToFileRequest;
  * Class representing a user request to archive one or more remote files to an
  * archive directory.
  */
-class ArchiveToDirRequest: public ArchiveRequest {
+class ArchiveToDirRequest: public UserArchiveRequest {
 public:
 
   /**

scheduler/ArchiveToFileRequest.cpp

@@ -39,7 +39,7 @@ cta::ArchiveToFileRequest::ArchiveToFileRequest(
   const std::map<uint16_t, std::string> &copyNbToPoolMap,
   const uint64_t priority,
   const CreationLog & creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   remoteFile(remoteFile),
   archiveFile(archiveFile),
   copyNbToPoolMap(copyNbToPoolMap) {

scheduler/ArchiveToFileRequest.hpp

@@ -20,7 +20,7 @@
 
 #include "common/archiveNS/ArchiveFile.hpp"
 #include "common/remoteFS/RemotePathAndStatus.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 #include "SchedulerDatabase.hpp"
 
 #include <map>
@@ -34,7 +34,7 @@ namespace cta {
  * Class representing a user request to archive to a single remote file to a
  * single destination archive file.
  */
-struct ArchiveToFileRequest: public ArchiveRequest {
+struct ArchiveToFileRequest: public UserArchiveRequest {
 
   /**
    * Constructor.
@@ -51,7 +51,7 @@ struct ArchiveToFileRequest: public ArchiveRequest {
    * @param other
    */
   ArchiveToFileRequest(const ArchiveToFileRequest & other):
-  ArchiveRequest(other)
+  UserArchiveRequest(other)
   {
     archiveFile = other.archiveFile;
     remoteFile = other.remoteFile;

scheduler/ArchiveToTapeCopyRequest.cpp

@@ -40,7 +40,7 @@ cta::ArchiveToTapeCopyRequest::ArchiveToTapeCopyRequest(
   const std::string tapePoolName,
   const uint64_t priority,
   const CreationLog &creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   remoteFile(remoteFile),
   archiveFile(archiveFile),
   copyNb(copyNb),

scheduler/ArchiveToTapeCopyRequest.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/remoteFS/RemotePathAndStatus.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 #include <stdint.h>
 #include <string>
@@ -29,7 +29,7 @@ namespace cta {
 /**
  * A user request to archive a remote file to a copy on tape.
  */
-struct ArchiveToTapeCopyRequest: public ArchiveRequest {
+struct ArchiveToTapeCopyRequest: public UserArchiveRequest {
 
   /**
    * Constructor.

scheduler/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 set (CTA_SCHEDULER_SRC_FILES
   ArchiveJob.cpp
   ArchiveMount.cpp
-  ArchiveRequest.cpp
+  UserArchiveRequest.cpp
   ArchiveToDirRequest.cpp
   ArchiveToFileRequest.cpp
   ArchiveToTapeCopyRequest.cpp
@@ -21,7 +21,7 @@ set (CTA_SCHEDULER_SRC_FILES
   PositioningMethod.cpp
   RetrieveJob.cpp
   RetrieveMount.cpp
-  RetrieveRequest.cpp
+  UserRetrieveRequest.cpp
   RetrieveToDirRequest.cpp
   RetrieveToFileRequest.cpp
   Scheduler.cpp

scheduler/OStoreDB/OStoreDB.cpp

@@ -28,7 +28,7 @@
 #include "common/admin/AdminHost.hpp"
 #include "common/admin/AdminUser.hpp"
 #include "common/archiveRoutes/ArchiveRoute.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 #include "scheduler/ArchiveToFileRequest.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"

scheduler/RetrieveToDirRequest.cpp

@@ -37,7 +37,7 @@ cta::RetrieveToDirRequest::RetrieveToDirRequest(
   const std::string &remoteDir,
   const uint64_t priority,
   const CreationLog & creationLog):
-  RetrieveRequest(priority, creationLog),
+  UserRetrieveRequest(priority, creationLog),
   m_remoteDir(remoteDir) {
 }
 

scheduler/RetrieveToDirRequest.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
 
 #include <list>
@@ -30,7 +30,7 @@ namespace cta {
  * Class representing a user request to retrieve one or more archived files to a
  * remote directory.
  */
-class RetrieveToDirRequest: public RetrieveRequest {
+class RetrieveToDirRequest: public UserRetrieveRequest {
 public:
 
   /**

scheduler/RetrieveToFileRequest.cpp

@@ -40,7 +40,7 @@ cta::RetrieveToFileRequest::RetrieveToFileRequest(
   const std::string &remoteFile,
   const uint64_t priority,
   const CreationLog & creationLog):
-  RetrieveRequest(priority, creationLog),
+  UserRetrieveRequest(priority, creationLog),
   m_archiveFile(archiveFile),
   m_tapeCopies(tapeCopies),
   m_remoteFile(remoteFile){

scheduler/RetrieveToFileRequest.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/archiveNS/ArchiveFile.hpp"
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 
 #include <list>
 #include <string>
@@ -33,7 +33,7 @@ class TapeFileLocation;
  * Class representing a user request to retrieve a single archived file to a
  * single remote file.
  */
-class RetrieveToFileRequest: public RetrieveRequest {
+class RetrieveToFileRequest: public UserRetrieveRequest {
 public:
 
   /**

scheduler/ArchiveRequest.cpp → scheduler/UserArchiveRequest.cpp

@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::ArchiveRequest() {
+cta::UserArchiveRequest::UserArchiveRequest() {
 }
 
 //------------------------------------------------------------------------------
 // destructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::~ArchiveRequest() throw() {
+cta::UserArchiveRequest::~UserArchiveRequest() throw() {
 }
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::ArchiveRequest(
+cta::UserArchiveRequest::UserArchiveRequest(
   const uint64_t priority,
   const CreationLog &creationLog):
   UserRequest(priority, creationLog) {

scheduler/ArchiveRequest.hpp → scheduler/UserArchiveRequest.hpp

@@ -28,18 +28,18 @@ namespace cta {
 /**
  * Abstract class representing a user request to archive some data.
  */
-class ArchiveRequest: public UserRequest {
+class UserArchiveRequest: public UserRequest {
 public:
 
   /**
    * Constructor.
    */
-  ArchiveRequest();
+  UserArchiveRequest();
 
   /**
    * Destructor.
    */
-  virtual ~ArchiveRequest() throw() = 0;
+  virtual ~UserArchiveRequest() throw() = 0;
 
   /**
    * Constructor.
@@ -49,7 +49,7 @@ public:
    * @param creationTime Optionally the absolute time at which the user request
    * was created.  If no value is given then the current time is used.
    */
-  ArchiveRequest(
+  UserArchiveRequest(
     const uint64_t priority,
     const CreationLog & creationLog);
 

scheduler/RetrieveRequest.cpp → scheduler/UserRetrieveRequest.cpp

@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::RetrieveRequest() {
+cta::UserRetrieveRequest::UserRetrieveRequest() {
 }
 
 //------------------------------------------------------------------------------
 // destructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::~RetrieveRequest() throw() {
+cta::UserRetrieveRequest::~UserRetrieveRequest() throw() {
 }
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::RetrieveRequest(
+cta::UserRetrieveRequest::UserRetrieveRequest(
   const uint64_t priority,
   const CreationLog & creationLog):
   UserRequest(priority, creationLog) {

scheduler/RetrieveRequest.hpp → scheduler/UserRetrieveRequest.hpp

@@ -27,18 +27,18 @@ namespace cta {
 /**
  * Abstract class representing a user request to retrieve some data.
  */
-class RetrieveRequest: public UserRequest {
+class UserRetrieveRequest: public UserRequest {
 public:
 
   /**
    * Constructor.
    */
-  RetrieveRequest();
+  UserRetrieveRequest();
 
   /**
    * Destructor.
    */
-  virtual ~RetrieveRequest() throw() = 0;
+  virtual ~UserRetrieveRequest() throw() = 0;
 
   /**
    * Constructor.
@@ -48,7 +48,7 @@ public:
    * @param creationTime Optionally the absolute time at which the user request
    * was created.  If no value is given then the current time is used.
    */
-  RetrieveRequest(
+  UserRetrieveRequest(
     const uint64_t priority,
     const CreationLog &creationLog);