Renamed AcsProxyZmq AcsProxy

mediachanger/AcsProxyZmq.cpp → mediachanger/AcsProxy.cpp

@@ -21,7 +21,7 @@
 #include "mediachanger/AcsLibrarySlot.hpp"
 #include "mediachanger/AcsMountTapeReadOnly.pb.h"
 #include "mediachanger/AcsMountTapeReadWrite.pb.h"
-#include "mediachanger/AcsProxyZmq.hpp"
+#include "mediachanger/AcsProxy.hpp"
 #include "mediachanger/Constants.hpp"
 #include "mediachanger/MediaChangerReturnValue.pb.h"
 #include "mediachanger/messages.hpp"
@@ -168,7 +168,7 @@ Frame createAcsForceDismountTapeFrame(const std::string &vid, const AcsLibrarySl
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-AcsProxyZmq::AcsProxyZmq(void *const zmqContext, const unsigned short serverPort) throw():
+AcsProxy::AcsProxy(void *const zmqContext, const unsigned short serverPort) throw():
   m_zmqContext(zmqContext),
   m_serverPort(serverPort) {
 }
@@ -176,7 +176,7 @@ AcsProxyZmq::AcsProxyZmq(void *const zmqContext, const unsigned short serverPort
 //------------------------------------------------------------------------------
 // mountTapeReadOnly
 //------------------------------------------------------------------------------
-void AcsProxyZmq::mountTapeReadOnly(const std::string &vid, const LibrarySlot &librarySlot) {
+void AcsProxy::mountTapeReadOnly(const std::string &vid, const LibrarySlot &librarySlot) {
   std::lock_guard<std::mutex> lock(m_mutex);
   
   try {
@@ -204,7 +204,7 @@ void AcsProxyZmq::mountTapeReadOnly(const std::string &vid, const LibrarySlot &l
 //------------------------------------------------------------------------------
 // mountTapeReadWrite
 //------------------------------------------------------------------------------
-void AcsProxyZmq::mountTapeReadWrite(const std::string &vid, const LibrarySlot &librarySlot) {
+void AcsProxy::mountTapeReadWrite(const std::string &vid, const LibrarySlot &librarySlot) {
   std::lock_guard<std::mutex> lock(m_mutex);
   
   try {
@@ -232,7 +232,7 @@ void AcsProxyZmq::mountTapeReadWrite(const std::string &vid, const LibrarySlot &
 //------------------------------------------------------------------------------
 // dismountTape
 //------------------------------------------------------------------------------
-void AcsProxyZmq::dismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
+void AcsProxy::dismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
   std::lock_guard<std::mutex> lock(m_mutex);
   
   try {
@@ -260,7 +260,7 @@ void AcsProxyZmq::dismountTape(const std::string &vid, const LibrarySlot &librar
 //------------------------------------------------------------------------------
 // forceDismountTape
 //------------------------------------------------------------------------------
-void AcsProxyZmq::forceDismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
+void AcsProxy::forceDismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
   std::lock_guard<std::mutex> lock(m_mutex);
   
   try {
@@ -288,7 +288,7 @@ void AcsProxyZmq::forceDismountTape(const std::string &vid, const LibrarySlot &l
 //------------------------------------------------------------------------------
 // serverSocketInstance
 //------------------------------------------------------------------------------
-ZmqSocket &AcsProxyZmq::serverSocketInstance() {
+ZmqSocket &AcsProxy::serverSocketInstance() {
   if(nullptr == m_serverSocket) {
     m_serverSocket.reset(new ZmqSocket(m_zmqContext, ZMQ_REQ));
     connectZmqSocketToLocalhost(*m_serverSocket, m_serverPort);

mediachanger/AcsProxyZmq.hpp → mediachanger/AcsProxy.hpp

@@ -31,7 +31,7 @@ namespace mediachanger {
 /**
  * Concrete class providing a ZMQ implementation of an AcsProxy.
  */
-class AcsProxyZmq: public MediaChangerProxy {
+class AcsProxy: public MediaChangerProxy {
 public:
 
   /**
@@ -41,7 +41,7 @@ public:
    * @param serverPort The TCP/IP port on which the CASTOR ACS daemon is
    * listening for ZMQ messages.
    */
-  AcsProxyZmq(void *const zmqContext, const unsigned short serverPort = ACS_PORT) throw();
+  AcsProxy(void *const zmqContext, const unsigned short serverPort = ACS_PORT) throw();
 
   /**
    * Request the CASTOR ACS daemon to mount the specified tape for read-only
@@ -116,7 +116,7 @@ private:
    */
   ZmqSocket &serverSocketInstance();
 
-}; // class AcsProxyZmq
+}; // class AcsProxy
 
 } // namespace mediachanger
 } // namespace cta

mediachanger/CMakeLists.txt

@@ -24,7 +24,7 @@ PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
 
 set (MEDIACHANGER_LIB_SRC_FILES
   AcsLibrarySlot.cpp
-  AcsProxyZmq.cpp
+  AcsProxy.cpp
   CmdLine.cpp
   CmdLineTool.cpp
   CommonMarshal.cpp

mediachanger/MediaChangerFacade.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/log/Logger.hpp"
-#include "mediachanger/AcsProxyZmq.hpp"
+#include "mediachanger/AcsProxy.hpp"
 #include "mediachanger/LibrarySlot.hpp"
 #include "mediachanger/MediaChangerProxy.hpp"
 #include "mediachanger/MmcProxyLog.hpp"
@@ -104,7 +104,7 @@ private:
   /**
    * ACS media changer proxy.
    */
-  AcsProxyZmq m_acsProxy;
+  AcsProxy m_acsProxy;
 
   /**
    * Manual media changer proxy.