Renamed castor::exception::NotAnOwner to

cta::exception::NotAnOwner

common/CMakeLists.txt

@@ -79,6 +79,7 @@ set (COMMON_LIB_SRC_FILES
   exception/MissingOperand.cpp
   exception/NoEntry.cpp
   exception/NoPortInRange.cpp
+  exception/NotAnOwner.cpp
   log/DummyLogger.cpp
   log/LogContext.cpp
   log/Logger.cpp

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

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

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

@@ -25,7 +25,7 @@
 
 #include "common/exception/Exception.hpp"
 
-namespace castor { namespace exception {
+namespace cta { namespace exception {
 
     /**
      * Not an owner.
@@ -41,5 +41,5 @@ namespace castor { namespace exception {
 
     }; // class NotAnOwner
 
-} } // namespace castor exception
+} } // namespace cta exception
 

tapeserver/castor/messages/SmartZmqContext.cpp

@@ -94,7 +94,7 @@ void *castor::messages::SmartZmqContext::get() const throw() {
 void *castor::messages::SmartZmqContext::release() {
   // If this smart pointer does not own a ZMQ context
   if(NULL == m_zmqContext) {
-    castor::exception::NotAnOwner ex;
+    cta::exception::NotAnOwner ex;
     ex.getMessage() << "Smart pointer does not own a ZMQ context";
     throw ex;
   }

tapeserver/castor/messages/SmartZmqContext.hpp

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "castor/exception/NotAnOwner.hpp"
+#include "common/exception/NotAnOwner.hpp"
 
 #include <stdio.h>
 

tapeserver/castor/messages/ZmqMsg.hpp

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "castor/exception/NotAnOwner.hpp"
+#include "common/exception/NotAnOwner.hpp"
 
 #include <stdio.h>
 #include <zmq.h>

tapeserver/castor/utils/CMakeLists.txt

@@ -31,7 +31,6 @@ set (UTILS_LIB_SRC_FILES
   utils.cpp
   ../common/CastorConfiguration.cpp
   ../exception/Errnum.cpp
-  ../exception/NotAnOwner.cpp
   ../exception/TimeOut.cpp
   ../exception/OutOfMemory.cpp
   ../BaseObject.cpp

tapeserver/castor/utils/SmartArrayPtr.hpp

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "castor/exception/NotAnOwner.hpp"
+#include "common/exception/NotAnOwner.hpp"
 
 #include <errno.h>
 #include <stdio.h>
@@ -119,7 +119,7 @@ public:
   T *release()  {
     // If this smart pointer does not own a pointer
     if(NULL == m_arrayPtr) {
-      castor::exception::NotAnOwner ex;
+      cta::exception::NotAnOwner ex;
       ex.getMessage() << "Smart pointer does not own a pointer";
       throw(ex);
     }

tapeserver/castor/utils/SmartArrayPtrTest.cpp

@@ -77,7 +77,7 @@ TEST_F(castor_utils_SmartArrayPtrTest, assignment) {
 
 TEST_F(castor_utils_SmartArrayPtrTest, releaseNull) {
   castor::utils::SmartArrayPtr<char> smartPtr;
-  ASSERT_THROW(smartPtr.release(), castor::exception::NotAnOwner);
+  ASSERT_THROW(smartPtr.release(), cta::exception::NotAnOwner);
 }
 
 TEST_F(castor_utils_SmartArrayPtrTest, subscriptRead) {

tapeserver/castor/utils/SmartFILEPtr.cpp

@@ -87,7 +87,7 @@ FILE *castor::utils::SmartFILEPtr::get() const throw() {
 FILE *castor::utils::SmartFILEPtr::release() {
   // If this smart pointer does not own a pointer
   if(NULL == m_file) {
-    castor::exception::NotAnOwner ex;
+    cta::exception::NotAnOwner ex;
     ex.getMessage() << "Smart pointer does not own a FILE pointer";
     throw ex;
   }

tapeserver/castor/utils/SmartFILEPtr.hpp

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "castor/exception/NotAnOwner.hpp"
+#include "common/exception/NotAnOwner.hpp"
 
 #include <stdio.h>
 

tapeserver/castor/utils/SmartFd.cpp

@@ -104,7 +104,7 @@ int castor::utils::SmartFd::get() const throw() {
 int castor::utils::SmartFd::release()  {
   // If this SmartFd does not own a file descriptor
   if(m_fd < 0) {
-    castor::exception::NotAnOwner ex;
+    cta::exception::NotAnOwner ex;
     ex.getMessage() << "Smart file-descriptor does not own a file-descriptor";
     throw ex;
   }

tapeserver/castor/utils/SmartFd.hpp

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "castor/exception/NotAnOwner.hpp"
+#include "common/exception/NotAnOwner.hpp"
 
 namespace castor {
 namespace utils  {