Removed castor::tape::utils

castor/acs/Acs.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/Acs.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "castor/utils/utils.hpp"
 
 #include <iomanip>

castor/acs/AcsCmd.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/AcsCmd.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <stdlib.h>
 

castor/acs/AcsDismountCmd.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/AcsDismountCmd.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <getopt.h>
  

castor/acs/AcsLibraryInteraction.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/AcsLibraryInteraction.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <stdlib.h>
 

castor/acs/AcsMessageHandler.cpp

@@ -19,19 +19,18 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "castor/messages/messages.hpp"
-#include "castor/messages/ReturnValue.pb.h"
-#include "castor/messages/AcsMountTapeReadOnly.pb.h"
-#include "castor/messages/AcsMountTapeReadWrite.pb.h"
-#include "castor/messages/AcsDismountTape.pb.h"
 #include "castor/acs/Constants.hpp"
 #include "castor/acs/AcsMessageHandler.hpp"
 #include "castor/acs/AcsDismountTape.hpp"
 #include "castor/acs/AcsMountTapeReadOnly.hpp"
 #include "castor/acs/AcsMountTapeReadWrite.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "castor/acs/Acs.hpp"
 #include "castor/acs/AcsImpl.hpp"
+#include "castor/messages/messages.hpp"
+#include "castor/messages/ReturnValue.pb.h"
+#include "castor/messages/AcsMountTapeReadOnly.pb.h"
+#include "castor/messages/AcsMountTapeReadWrite.pb.h"
+#include "castor/messages/AcsDismountTape.pb.h"
 
 #include <sstream>
 
@@ -124,7 +123,7 @@ bool castor::acs::AcsMessageHandler::handleEvent(
   }
   log::Param params[] = {
       log::Param("sender identity", 
-              tape::utils::toHexString(address.getData(),address.size()))
+              utils::hexDump(address.getData(),address.size()))
      };
   m_log(LOG_DEBUG, "handling event in AcsMessageHandler", params);
  

castor/acs/AcsMountCmd.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/AcsMountCmd.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <getopt.h>
 #include <iostream>

castor/acs/AcsPendingRequests.cpp

@@ -23,9 +23,8 @@
 
 #include "castor/acs/AcsPendingRequests.hpp"
 #include "castor/acs/AcsRequestDismountTape.hpp"
-#include "castor/tape/utils/utils.hpp"
-#include "castor/messages/AcsDismountTape.pb.h"
 #include "castor/acs/Constants.hpp"
+#include "castor/messages/AcsDismountTape.pb.h"
 
 //-----------------------------------------------------------------------------
 // constructor
@@ -179,7 +178,7 @@ void castor::acs::AcsPendingRequests::checkAndAddRequest(
  const messages::Frame &rqst, messages::ZmqSocketST &socket) {
   log::Param params[] = {
     log::Param("sender identity", 
-      tape::utils::toHexString(address.getData(), address.size()))
+      utils::hexDump(address.getData(), address.size()))
   };
   m_log(LOG_DEBUG, "AcsPendingRequests::checkAndAddRequest", params);
   switch(rqst.header.msgtype()) {
@@ -231,7 +230,7 @@ void castor::acs::AcsPendingRequests::checkAndAddRequestDismountTape(
     log::Param("panel", panel),
     log::Param("drive", drive),
     log::Param("sender identity", 
-      tape::utils::toHexString(address.getData(), address.size()))
+      utils::hexDump(address.getData(), address.size()))
   };
   m_log(LOG_INFO, "Dismount tape", params);
    

castor/acs/AcsQueryVolumeCmd.cpp

@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "castor/acs/AcsQueryVolumeCmd.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <getopt.h>
 #include <iostream>

castor/acs/AcsRequest.cpp

@@ -24,7 +24,6 @@
 #include "castor/acs/AcsRequest.hpp"
 #include "castor/messages/messages.hpp"
 #include "castor/messages/ReturnValue.pb.h"
-#include "castor/tape/utils/utils.hpp"
 
 //-----------------------------------------------------------------------------
 // constructor
@@ -40,7 +39,7 @@ castor::acs::AcsRequest::AcsRequest(messages::ZmqSocketST &socket,
   m_panel(panel),
   m_drive(drive), 
   m_socket(socket),
-  m_identity(tape::utils::toHexString(address.getData(),address.size())),
+  m_identity(utils::hexDump(address.getData(),address.size())),
   m_isReplaySent(false) {
     zmq_msg_init_size (&m_addressMsg, address.size());
     memcpy (zmq_msg_data (&m_addressMsg), (const void*)&address.getZmqMsg(), 
@@ -283,4 +282,4 @@ void castor::acs::AcsRequest::setStateToExecute() throw() {
 //------------------------------------------------------------------------------
 void castor::acs::AcsRequest::setStateToDelete() throw() {
   m_state = ACS_REQUEST_TO_DELETE;       
-}
\ No newline at end of file
+}

castor/acs/CMakeLists.txt

@@ -86,7 +86,6 @@ if (STK_API_LIB AND STK_UTL_LIB AND STK_IPC_LIB AND STK_CL_LIB)
     castorcommon
     castorserver
     castormessages
-    castortapeutils
     zmq
     ${STK_API_LIB}
     ${STK_UTL_LIB}
@@ -119,7 +118,6 @@ if (STK_API_LIB AND STK_UTL_LIB AND STK_IPC_LIB AND STK_CL_LIB)
   target_link_libraries (castor-tape-acs-dismount
     castorclient
     castorcommon
-    castortapeutils
     ${STK_API_LIB}
     ${STK_UTL_LIB}
     ${STK_IPC_LIB}
@@ -146,7 +144,6 @@ if (STK_API_LIB AND STK_UTL_LIB AND STK_IPC_LIB AND STK_CL_LIB)
   target_link_libraries (castor-tape-acs-mount
     castorclient
     castorcommon
-    castortapeutils
     ${STK_API_LIB}
     ${STK_UTL_LIB}
     ${STK_IPC_LIB}
@@ -171,7 +168,6 @@ if (STK_API_LIB AND STK_UTL_LIB AND STK_IPC_LIB AND STK_CL_LIB)
   target_link_libraries (castor-tape-acs-queryvolume
     castorclient
     castorcommon
-    castortapeutils
     ${STK_API_LIB}
     ${STK_UTL_LIB}
     ${STK_IPC_LIB}

castor/legacymsg/CommonMarshal.cpp

@@ -24,7 +24,6 @@
 
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <errno.h>
 #include <iostream>

castor/legacymsg/CupvMarshal.cpp

@@ -24,7 +24,6 @@
 
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CupvMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/Cupv.h"
 
 #include <string.h>

castor/legacymsg/GenericMarshal.cpp

@@ -24,7 +24,6 @@
 
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/GenericMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 
 #include <string.h>
 

castor/legacymsg/RmcMarshal.cpp

@@ -24,7 +24,6 @@
 
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/RmcMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/rmc_constants.h"
 
 #include <string.h>

castor/legacymsg/RtcpMarshal.cpp

@@ -25,7 +25,6 @@
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
 #include "castor/legacymsg/RtcpMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/rtcp_constants.h"
 #include "h/vdqm_constants.h"
 

castor/legacymsg/TapeBridgeMarshal.cpp

@@ -25,7 +25,6 @@
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
 #include "castor/legacymsg/TapeBridgeMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/rtcp_constants.h"
 #include "h/vdqm_constants.h"
 

castor/legacymsg/TapeMarshal.cpp

@@ -25,7 +25,6 @@
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
 #include "castor/legacymsg/TapeMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/rtcp_constants.h"
 #include "h/vdqm_constants.h"
 #include "h/Ctape.h"

castor/legacymsg/VdqmMarshal.cpp

@@ -24,7 +24,6 @@
 
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/VdqmMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/vdqm_constants.h"
 
 #include <errno.h>

castor/legacymsg/VmgrMarshal.cpp

@@ -25,7 +25,6 @@
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
 #include "castor/legacymsg/VmgrMarshal.hpp"
-#include "castor/tape/utils/utils.hpp"
 #include "h/vmgr.h"
 
 #include <errno.h>

castor/messages/CMakeLists.txt

@@ -21,5 +21,5 @@ add_library(castormessages SHARED
   ZmqSocketST.cpp
 )
 
-target_link_libraries(castormessages protobuf ssl)
+target_link_libraries(castormessages castormediachangerclient protobuf ssl zmq)
 install (TARGETS castormessages DESTINATION ${CASTOR_DEST_LIB_DIR})