Renamed castor::exception::MissingOperand to

cta::exception::MissingOperand

common/CMakeLists.txt

@@ -76,6 +76,7 @@ set (COMMON_LIB_SRC_FILES
   exception/CommandLineNotParsed.cpp
   exception/InvalidArgument.cpp
   exception/InvalidConfigEntry.cpp
+  exception/MissingOperand.cpp
   log/DummyLogger.cpp
   log/LogContext.cpp
   log/Logger.cpp

tapeserver/castor/exception/MissingOperand.cpp → common/exception/MissingOperand.cpp

@@ -21,12 +21,12 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 
 
 // -----------------------------------------------------------------------------
 // Constructor
 // -----------------------------------------------------------------------------
-castor::exception::MissingOperand::MissingOperand():
+cta::exception::MissingOperand::MissingOperand():
   cta::exception::Exception() {
 }

tapeserver/castor/exception/MissingOperand.hpp → common/exception/MissingOperand.hpp

@@ -25,7 +25,7 @@
 
 #include "common/exception/Exception.hpp"
 
-namespace castor { namespace exception {
+namespace cta { namespace exception {
 
     /**
      * Missing operand.
@@ -41,5 +41,5 @@ namespace castor { namespace exception {
 
     }; // class MissingOperand
 
-} } // namespace castor exception
+} } // namespace cta exception
 

tapeserver/castor/mediachanger/CmdLine.cpp

@@ -23,14 +23,14 @@
 
 #include "castor/mediachanger/CmdLine.hpp"
 #include "common/exception/InvalidArgument.hpp"
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 #include <getopt.h>
 
 //------------------------------------------------------------------------------
 // handleMissingParameter
 //------------------------------------------------------------------------------
 void castor::mediachanger::CmdLine::handleMissingParameter(const int opt) {
-  castor::exception::MissingOperand ex;
+  cta::exception::MissingOperand ex;
   ex.getMessage() << "The -" << (char)opt << " option requires a parameter";
  throw ex;
 }

tapeserver/castor/mediachanger/DismountCmd.hpp

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "common/exception/InvalidArgument.hpp"
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 #include "castor/mediachanger/CmdLineTool.hpp"
 #include "castor/mediachanger/DismountCmdLine.hpp"
 

tapeserver/castor/mediachanger/DismountCmdLine.cpp

@@ -21,7 +21,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 #include "castor/mediachanger/DismountCmdLine.hpp"
 #include "castor/mediachanger/LibrarySlotParser.hpp"
 #include "common/exception/Exception.hpp"
@@ -74,7 +74,7 @@ castor::mediachanger::DismountCmdLine::DismountCmdLine(const int argc,
 
   // Check that both VID and DRIVE_SLOT has been specified
   if(nbArgs < 2) {
-    castor::exception::MissingOperand ex;
+    cta::exception::MissingOperand ex;
     ex.getMessage() << "Both VID and DRIVE_SLOT must be specified";
     throw ex;
   }

tapeserver/castor/mediachanger/MountCmd.hpp

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "common/exception/InvalidArgument.hpp"
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 #include "castor/mediachanger/CmdLineTool.hpp"
 #include "castor/mediachanger/MountCmdLine.hpp"
 

tapeserver/castor/mediachanger/MountCmdLine.cpp

@@ -21,7 +21,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "castor/exception/MissingOperand.hpp"
+#include "common/exception/MissingOperand.hpp"
 #include "castor/mediachanger/MountCmdLine.hpp"
 #include "common/exception/Exception.hpp"
 
@@ -73,7 +73,7 @@ castor::mediachanger::MountCmdLine::MountCmdLine(const int argc,
 
   // Check that both VID and DRIVE_SLOT has been specified
   if(nbArgs < 2) {
-    castor::exception::MissingOperand ex;
+    cta::exception::MissingOperand ex;
     ex.getMessage() << "Both VID and DRIVE_SLOT must be specified";
     throw ex;
   }

tapeserver/castor/utils/CMakeLists.txt

@@ -33,7 +33,6 @@ set (UTILS_LIB_SRC_FILES
   ../exception/NoEntry.cpp
   ../exception/Errnum.cpp
   ../exception/NotAnOwner.cpp
-  ../exception/MissingOperand.cpp
   ../exception/NoPortInRange.cpp
   ../exception/TimeOut.cpp
   ../exception/OutOfMemory.cpp