Renamed RetrievalRequest to RetrieveRequest

scheduler/CMakeLists.txt

@@ -33,7 +33,7 @@ set (CTA_SCHEDULER_SRC_FILES
   RetrievalJob.cpp
   RetrievalJobState.cpp
   RetrievalMount.cpp
-  RetrievalRequest.cpp
+  RetrieveRequest.cpp
   RetrieveToDirRequest.cpp
   RetrieveToFileRequest.cpp
   Scheduler.cpp

scheduler/RetrievalRequest.cpp → scheduler/RetrieveRequest.cpp

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

scheduler/RetrievalRequest.hpp → scheduler/RetrieveRequest.hpp

@@ -27,18 +27,18 @@ namespace cta {
 /**
  * Abstract class representing a user request to retrieve some data.
  */
-class RetrievalRequest: public UserRequest {
+class RetrieveRequest: public UserRequest {
 public:
 
   /**
    * Constructor.
    */
-  RetrievalRequest();
+  RetrieveRequest();
 
   /**
    * Destructor.
    */
-  virtual ~RetrievalRequest() throw() = 0;
+  virtual ~RetrieveRequest() throw() = 0;
 
   /**
    * Constructor.
@@ -48,11 +48,11 @@ 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.
    */
-  RetrievalRequest(
+  RetrieveRequest(
     const uint64_t priority,
     const SecurityIdentity &user,
     const time_t creationTime = time(NULL));
 
-}; // class RetrievalRequest
+}; // class RetrieveRequest
 
 } // namespace cta

scheduler/RetrieveToDirRequest.cpp

@@ -38,7 +38,7 @@ cta::RetrieveToDirRequest::RetrieveToDirRequest(
   const uint64_t priority,
   const SecurityIdentity &user,
   const time_t creationTime):
-  RetrievalRequest(priority, user, creationTime),
+  RetrieveRequest(priority, user, creationTime),
   m_remoteDir(remoteDir) {
 }
 

scheduler/RetrieveToDirRequest.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/RetrievalRequest.hpp"
+#include "scheduler/RetrieveRequest.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 RetrievalRequest {
+class RetrieveToDirRequest: public RetrieveRequest {
 public:
 
   /**

scheduler/RetrieveToFileRequest.cpp

@@ -41,7 +41,7 @@ cta::RetrieveToFileRequest::RetrieveToFileRequest(
   const uint64_t priority,
   const SecurityIdentity &user, 
   const time_t creationTime):
-  RetrievalRequest(priority, user, creationTime),
+  RetrieveRequest(priority, user, creationTime),
   m_archiveFile(archiveFile),
   m_tapeCopies(tapeCopies),
   m_remoteFile(remoteFile) {

scheduler/RetrieveToFileRequest.hpp

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