Moved all files related to Client to client/, changed the namespace and fixed...

Moved all files related to Client to client/, changed the namespace and fixed the files consequently (header,usings,...)

castor/tape/tapeserver/CMakeLists.txt

@@ -35,6 +35,7 @@ set(CTEST_OUTPUT_ON_FAILURE 1)
 #set(TEST_LIBS "")
 
 # Add parts first in dependency order
+add_subdirectory(client)
 add_subdirectory(SCSI)
 add_subdirectory(drive)
 add_subdirectory(system)

castor/tape/tapeserver/daemon/ClientInterface.hpp → castor/tape/tapeserver/client/ClientInterface.hpp

@@ -22,7 +22,7 @@
 namespace castor {
 namespace tape {
 namespace tapeserver {
-namespace daemon {
+namespace client {
   
 
 class ClientInterface {

castor/tape/tapeserver/daemon/ClientProxy.cpp → castor/tape/tapeserver/client/ClientProxy.cpp

@@ -43,13 +43,17 @@
 #include <stdlib.h>
 #include <typeinfo>
 
-using namespace castor::tape;
 
-castor::tape::tapeserver::daemon::
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace client {
+  
+
 ClientProxy::ClientProxy(const legacymsg::RtcpJobRqstMsgBody& clientRequest)
   throw (castor::tape::Exception): m_request(clientRequest) {}
 
-castor::tape::tapeserver::daemon::ClientProxy::UnexpectedResponse::
+ClientProxy::UnexpectedResponse::
     UnexpectedResponse(const castor::IObject* resp, const std::string & w):
 castor::tape::Exception(w) {
   std::string responseType = typeid(*resp).name();
@@ -62,7 +66,7 @@ castor::tape::Exception(w) {
 }
 
 tapegateway::GatewayMessage *
-  castor::tape::tapeserver::daemon::ClientProxy::requestResponseSession(
+  ClientProxy::requestResponseSession(
     const tapegateway::GatewayMessage &req,
     RequestReport & report)
 throw (castor::tape::Exception) 
@@ -106,7 +110,7 @@ throw (castor::tape::Exception)
   return ret;
 }
 
-void castor::tape::tapeserver::daemon::ClientProxy::fetchVolumeId(
+void ClientProxy::fetchVolumeId(
   VolumeInfo & volInfo, RequestReport &report) 
 throw (castor::tape::Exception) {
   // 1) Build the request
@@ -149,7 +153,7 @@ throw (castor::tape::Exception) {
   }
 }
 
-void castor::tape::tapeserver::daemon::ClientProxy::reportEndOfSession(
+void ClientProxy::reportEndOfSession(
 RequestReport &transactionReport) 
 throw (castor::tape::Exception) {
   // 1) Build the report
@@ -179,7 +183,7 @@ throw (castor::tape::Exception) {
 }
 
 
-void castor::tape::tapeserver::daemon::ClientProxy::reportEndOfSessionWithError(
+void ClientProxy::reportEndOfSessionWithError(
 const std::string & errorMsg, int errorCode, RequestReport &transactionReport) 
 throw (castor::tape::Exception) {
   // 1) Build the report
@@ -212,7 +216,7 @@ throw (castor::tape::Exception) {
 
 
 tapegateway::FilesToMigrateList * 
-    castor::tape::tapeserver::daemon::ClientProxy::getFilesToMigrate(
+    ClientProxy::getFilesToMigrate(
 uint64_t files, uint64_t bytes, RequestReport& report) 
 throw (castor::tape::Exception) {
   // 1) Build the request
@@ -249,7 +253,7 @@ throw (castor::tape::Exception) {
   }
 }
 
-void castor::tape::tapeserver::daemon::ClientProxy::reportMigrationResults(
+void ClientProxy::reportMigrationResults(
 tapegateway::FileMigrationReportList & migrationReport,
     RequestReport& report) throw (castor::tape::Exception) {
   // 1) The request is provided already fleshed out by the user. We have to
@@ -290,7 +294,7 @@ tapegateway::FileMigrationReportList & migrationReport,
 }
 
 tapegateway::FilesToRecallList * 
-    castor::tape::tapeserver::daemon::ClientProxy::getFilesToRecall(
+    ClientProxy::getFilesToRecall(
 uint64_t files, uint64_t bytes, RequestReport& report) 
 throw (castor::tape::Exception) {
   // 1) Build the request
@@ -327,7 +331,7 @@ throw (castor::tape::Exception) {
   }
 }
 
-void castor::tape::tapeserver::daemon::ClientProxy::reportRecallResults(
+void ClientProxy::reportRecallResults(
 tapegateway::FileRecallReportList & recallReport,
 RequestReport& report) throw (castor::tape::Exception) {
   // 1) The request is provided already fleshed out by the user. We have to
@@ -360,3 +364,5 @@ RequestReport& report) throw (castor::tape::Exception) {
         "Unexpected response to FileRecallReportList in reportRecallResults");
   }
 }
+
+}}}}

castor/tape/tapeserver/daemon/ClientProxy.hpp → castor/tape/tapeserver/client/ClientProxy.hpp

@@ -33,13 +33,13 @@
 #include "castor/tape/tapegateway/FileMigrationReportList.hpp"
 #include "castor/tape/tapegateway/FilesToRecallList.hpp"
 #include "castor/tape/tapegateway/FileRecallReportList.hpp"
-#include "castor/tape/tapeserver/daemon/ClientInterface.hpp"
+#include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "../threading/Threading.hpp"
 
 namespace castor {
 namespace tape {
 namespace tapeserver {
-namespace daemon {
+namespace client {
   /**
    * A class managing the communications with the tape server's client.
    * The client address will have been received from the VDQM by the main

castor/tape/tapeserver/daemon/ClientProxyTest.cpp → castor/tape/tapeserver/client/ClientProxyTest.cpp

@@ -28,7 +28,7 @@
 #include "ClientProxy.hpp"
 #include "../threading/Threading.hpp"
 #include "castor/log/StringLogger.hpp"
-#include "MountSession.hpp"
+#include "castor/tape/tapeserver/daemon/MountSession.hpp"
 #include "../system/Wrapper.hpp"
 #include "Ctape.h"
 #include "castor/tape/tapegateway/Volume.hpp"
@@ -36,19 +36,20 @@
 #include "castor/tape/tapegateway/EndNotificationErrorReport.hpp"
 #include "castor/tape/tapegateway/NotificationAcknowledge.hpp"
 
+using namespace castor::tape::tapeserver;
 using namespace castor::tape::tapeserver::daemon;
 
 namespace unitTest {
-
+  using namespace castor::tape::tapeserver::client;
 template <class Repl>
 class clientSingleReplRunner: public castor::tape::threading::Thread {
 public:
-  clientSingleReplRunner(ClientSimSingleReply<Repl> &client): m_sim(client) {}
+  clientSingleReplRunner(client::ClientSimSingleReply<Repl> &client): m_sim(client) {}
 private:
   void run() {
     m_sim.sessionLoop();
   }
-  ClientSimSingleReply<Repl> & m_sim;
+  client::ClientSimSingleReply<Repl> & m_sim;
 };
 
 TEST(tapeServerClientInterface, VolReqVol) {
@@ -57,8 +58,8 @@ TEST(tapeServerClientInterface, VolReqVol) {
   uint32_t volReq = 0xBEEF;
   std::string vid = "V12345";
   std::string density = "8000GC";
-  ClientSimSingleReply<Volume> csVol(volReq, vid, density);
-  struct ClientSimSingleReply<Volume>::ipPort clientAddr = csVol.getCallbackAddress();
+  client::ClientSimSingleReply<Volume> csVol(volReq, vid, density);
+  client::ClientSimSingleReply<Volume>::ipPort clientAddr = csVol.getCallbackAddress();
   clientSingleReplRunner<Volume> csVolRun(csVol);
   csVolRun.start();
   // Setup a clientInterface to talk to it
@@ -70,9 +71,9 @@ TEST(tapeServerClientInterface, VolReqVol) {
   VDQMjob.clientPort = clientAddr.port;
   VDQMjob.volReqId = volReq;
   // Setup an interface to it.
-  ClientProxy cInterf(VDQMjob);
-  ClientProxy::VolumeInfo volInfo;
-  ClientProxy::RequestReport reqRep;
+  client::ClientProxy cInterf(VDQMjob);
+  client::ClientProxy::VolumeInfo volInfo;
+  client::ClientProxy::RequestReport reqRep;
   ASSERT_NO_THROW(cInterf.fetchVolumeId(volInfo, reqRep));
   // Cleanup
   csVolRun.wait();
@@ -84,7 +85,7 @@ TEST(tapeServerClientInterface, VolReqNoMore) {
   uint32_t volReq = 0xBEEF;
   std::string vid = "V12345";
   std::string density = "8000GC";
-  ClientSimSingleReply<NoMoreFiles> csVol(volReq, vid, density);
+  client::ClientSimSingleReply<NoMoreFiles> csVol(volReq, vid, density);
   struct ClientSimSingleReply<NoMoreFiles>::ipPort clientAddr = 
   csVol.getCallbackAddress();
   clientSingleReplRunner<NoMoreFiles> csVolRun(csVol);
@@ -280,8 +281,8 @@ TEST(tapeServerClientInterface, EndSessionErrorNotifAck) {
   uint32_t volReq = 0xBEEF;
   std::string vid = "V12345";
   std::string density = "8000GC";
-  ClientSimSingleReply<NotificationAcknowledge> csVol(volReq, vid, density);
-  struct ClientSimSingleReply<NotificationAcknowledge>::ipPort clientAddr = 
+  client::ClientSimSingleReply<NotificationAcknowledge> csVol(volReq, vid, density);
+  client::ClientSimSingleReply<NotificationAcknowledge>::ipPort clientAddr = 
   csVol.getCallbackAddress();
   clientSingleReplRunner<NotificationAcknowledge> csVolRun(csVol);
   csVolRun.start();

castor/tape/tapeserver/daemon/ClientSimSingleReply.hpp → castor/tape/tapeserver/client/ClientSimSingleReply.hpp

@@ -34,7 +34,7 @@
 namespace castor {
 namespace tape {
 namespace tapeserver {
-namespace daemon {
+namespace client {
   /**
    * A templated class, reusing code of TpcpCommand which simulates the 
    * tapegateway part of the client communication with the server. The 

castor/tape/tapeserver/daemon/ClientSimulator.cpp → castor/tape/tapeserver/client/ClientSimulator.cpp

@@ -35,7 +35,7 @@
 namespace castor {
 namespace tape {
 namespace tapeserver {
-namespace daemon {
+namespace client {
   
 using namespace castor::tape;
 

castor/tape/tapeserver/daemon/ClientSimulator.hpp → castor/tape/tapeserver/client/ClientSimulator.hpp

@@ -29,7 +29,7 @@
 namespace castor {
 namespace tape {
 namespace tapeserver {
-namespace daemon {
+namespace client {
   /**
    * A class, reusing code of TpcpCommand which simulates the tapebridge
    * part of the client communication with the server. The constructor

castor/tape/tapeserver/daemon/FakeClient.hpp → castor/tape/tapeserver/client/FakeClient.hpp

@@ -8,7 +8,7 @@
 #ifndef FAKECLIENT_HPP
 #define	FAKECLIENT_HPP
 
-#include "castor/tape/tapeserver/daemon/ClientInterface.hpp"
+#include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/tape/tapegateway/FilesToRecallList.hpp"
 #include <memory>
 #include <gtest/gtest.h>
@@ -18,7 +18,7 @@ namespace{
   const int init_value=-1;
   const unsigned int nbFile=5;
 
-class FakeClient : public castor::tape::tapeserver::daemon::ClientInterface
+class FakeClient : public castor::tape::tapeserver::client::ClientInterface
 {
 
 public:

castor/tape/tapeserver/daemon/CMakeLists.txt

@@ -26,7 +26,7 @@ CastorInstallInitScript (tapeserverd)
 add_executable(tapeserver-mm 
   tapeserver-mm.cpp 
   RecallTaskInjector.cpp
-  ClientProxy.cpp
+  ../client/ClientProxy.cpp
   MigrationReportPacker.cpp
   RecallReportPacker.cpp)
 
@@ -36,15 +36,14 @@ castorcommon castorclient castorTapeServerThreading castortapeutils
 castortapegatewayprotocol)
 
 add_library(tapeserver 
-  ClientProxy.cpp 
+  ../client/ClientProxy.cpp 
   MountSession.cpp 
   RecallTaskInjector.cpp 
-  ClientProxy.cpp 
   MigrationReportPacker.cpp 
   RecallReportPacker.cpp)
 
 add_library(tapeserverdTest 
-  ClientSimulator.cpp 
+  ../client/ClientSimulator.cpp 
   ../../tpcp/TpcpCommand.cpp
   ../../tpcp/StreamOperators.cpp
   ../../tpcp/Helper.cpp

castor/tape/tapeserver/daemon/MigrationReportPacker.cpp

@@ -34,7 +34,7 @@ namespace tape {
 namespace tapeserver {
 namespace daemon {
   
-MigrationReportPacker::MigrationReportPacker(ClientInterface & tg,castor::log::LogContext lc):
+MigrationReportPacker::MigrationReportPacker(client::ClientInterface & tg,castor::log::LogContext lc):
 ReportPackerInterface<detail::Migration>(tg,lc),
 m_workerThread(*this),m_errorHappened(false),m_continue(true) {
 }
@@ -83,7 +83,7 @@ void MigrationReportPacker::ReportSuccessful::execute(MigrationReportPacker& _th
 void MigrationReportPacker::ReportFlush::execute(MigrationReportPacker& _this){
   if(!_this.m_errorHappened){
     _this.logReport(_this.m_listReports->successfulMigrations(),"A file was successfully written on the tape"); 
-    tapeserver::daemon::ClientInterface::RequestReport chrono;
+    tapeserver::client::ClientInterface::RequestReport chrono;
     _this.m_client.reportMigrationResults(*(_this.m_listReports),chrono);    
   }
   else {
@@ -96,7 +96,7 @@ void MigrationReportPacker::ReportFlush::execute(MigrationReportPacker& _this){
   _this.m_listReports.reset(new tapegateway::FileMigrationReportList);
 }
 void MigrationReportPacker::ReportEndofSession::execute(MigrationReportPacker& _this){
-  tapeserver::daemon::ClientInterface::RequestReport chrono;
+  client::ClientInterface::RequestReport chrono;
   if(!_this.m_errorHappened){
     _this.m_lc.log(LOG_INFO,"Nominal EndofSession has been reported without incident on tape-writing");
     _this.m_client.reportEndOfSession(chrono);
@@ -111,7 +111,7 @@ void MigrationReportPacker::ReportEndofSession::execute(MigrationReportPacker& _
 }
 
 void MigrationReportPacker::ReportEndofSessionWithErrors::execute(MigrationReportPacker& _this){
-  tapeserver::daemon::ClientInterface::RequestReport chrono;
+  client::ClientInterface::RequestReport chrono;
   
   if(_this.m_errorHappened) {
   _this.m_client.reportEndOfSessionWithError(m_message,m_error_code,chrono); 

castor/tape/tapeserver/daemon/MigrationReportPacker.hpp

@@ -26,7 +26,7 @@
 
 #include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 #include "castor/tape/tapeserver/daemon/MigrationJob.hpp"
-#include "castor/tape/tapeserver/daemon/ClientInterface.hpp"
+#include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/tape/tapegateway/FileToMigrateStruct.hpp"
 #include "castor/tape/tapeserver/daemon/ReportPackerInterface.hpp"
 
@@ -44,7 +44,7 @@ public:
    * @param tg The client who is asking for a migration of his files 
    * and to whom we have to report to the status of the operations.
    */
-  MigrationReportPacker(ClientInterface & tg,log::LogContext lc);
+  MigrationReportPacker(client::ClientInterface & tg,log::LogContext lc);
   
   ~MigrationReportPacker();
     

castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp

@@ -22,7 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 #include "castor/tape/tapeserver/daemon/MigrationReportPacker.hpp"
-#include "castor/tape/tapeserver/daemon/FakeClient.hpp"
+#include "castor/tape/tapeserver/client/FakeClient.hpp"
 #include "castor/log/StringLogger.hpp"
 #include <gtest/gtest.h>
 

castor/tape/tapeserver/daemon/MountSession.cpp

@@ -27,7 +27,7 @@
 #include "MountSession.hpp"
 #include "castor/log/LogContext.hpp"
 #include "castor/tape/tapeserver/exception/Exception.hpp"
-#include "ClientProxy.hpp"
+#include "castor/tape/tapeserver/client/ClientProxy.hpp"
 #include "log.h"
 #include "stager_client_commandline.h"
 #include "castor/tape/utils/utils.hpp"
@@ -59,10 +59,10 @@ throw (castor::tape::Exception) {
   LogContext::ScopedParam sp05(lc, Param("driveUnit", m_request.driveUnit));
   LogContext::ScopedParam sp06(lc, Param("dgn", m_request.dgn));
   // 2a) Get initial information from the client
-  ClientProxy::RequestReport reqReport;
+  client::ClientProxy::RequestReport reqReport;
   try {
     m_clientProxy.fetchVolumeId(m_volInfo, reqReport);
-  } catch(ClientProxy::EndOfSession & eof) {
+  } catch(client::ClientProxy::EndOfSession & eof) {
     std::stringstream fullError("Received end of session from client when requesting Volume");
     fullError << eof.what();
     lc.log(LOG_ERR, fullError.str());
@@ -73,7 +73,7 @@ throw (castor::tape::Exception) {
     LogContext::ScopedParam sp10(lc, Param("ErrorMsg", fullError.str()));
     lc.log(LOG_ERR, "Notified client of end session with error");
     return;
-  } catch (ClientProxy::UnexpectedResponse & unexp) {
+  } catch (client::ClientProxy::UnexpectedResponse & unexp) {
     std::stringstream fullError("Received unexpected response from client when requesting Volume");
     fullError << unexp.what();
     lc.log(LOG_ERR, fullError.str());
@@ -130,7 +130,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp08(lc, Param("density", m_volInfo.density));
     lc.log(LOG_ERR, "Drive unit not found in TPCONFIG");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Drive unit not found in TPCONFIG");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -153,7 +153,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp09(lc, Param("devFilename", configLine->devFilename));
     lc.log(LOG_ERR, "Drive not found on this path");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Drive not found on this path");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -171,7 +171,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp10(lc, Param("errorMessage", e.getMessageValue()));
     lc.log(LOG_ERR, "Error looking to path to tape drive");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Error looking to path to tape drive: ");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -188,7 +188,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp09(lc, Param("devFilename", configLine->devFilename));
     lc.log(LOG_ERR, "Unexpected exception while looking for drive");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Unexpected exception while looking for drive");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -210,7 +210,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp10(lc, Param("errorMessage", e.getMessageValue()));
     lc.log(LOG_ERR, "Error opening tape drive");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Error opening tape drive");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -227,7 +227,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
     LogContext::ScopedParam sp09(lc, Param("devFilename", configLine->devFilename));
     lc.log(LOG_ERR, "Unexpected exception while opening drive");
     
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     std::stringstream errMsg("Unexpected exception while opening drive");
     errMsg << lc;
     m_clientProxy.reportEndOfSessionWithError("Drive unit not found", SEINTERNAL, reqReport);
@@ -253,7 +253,7 @@ void castor::tape::tapeserver::daemon::MountSession::executeRead(LogContext & lc
   }
   {
     // Temporary end of session, to please the ClientSimulator
-    ClientProxy::RequestReport reqReport;
+    client::ClientProxy::RequestReport reqReport;
     m_clientProxy.reportEndOfSession(reqReport);
   }
   

castor/tape/tapeserver/daemon/MountSession.hpp

@@ -29,7 +29,7 @@
 #include "castor/log/LogContext.hpp"
 #include "castor/tape/tapeserver/system/Wrapper.hpp"
 #include "castor/tape/utils/utils.hpp"
-#include "ClientProxy.hpp"
+#include "castor/tape/tapeserver/client/ClientProxy.hpp"
 #include "TapeSingleThreadInterface.hpp"
 
 using namespace castor::tape;
@@ -98,8 +98,8 @@ namespace daemon {
   private:
     legacymsg::RtcpJobRqstMsgBody m_request;
     castor::log::Logger & m_logger;
-    ClientProxy m_clientProxy;
-    ClientProxy::VolumeInfo m_volInfo;
+    client::ClientProxy m_clientProxy;
+    client::ClientProxy::VolumeInfo m_volInfo;
     System::virtualWrapper & m_sysWrapper;
     const utils::TpconfigLines & m_tpConfig;
     const CastorConf & m_castorConf;

castor/tape/tapeserver/daemon/RecallReportPacker.cpp

@@ -35,7 +35,7 @@ namespace daemon {
 using castor::log::LogContext;
 using castor::log::Param;
 
-RecallReportPacker::RecallReportPacker(ClientInterface & tg,unsigned int reportFilePeriod,log::LogContext lc):
+RecallReportPacker::RecallReportPacker(client::ClientInterface & tg,unsigned int reportFilePeriod,log::LogContext lc):
 ReportPackerInterface<detail::Recall>(tg,lc),
         m_workerThread(*this),m_reportFilePeriod(reportFilePeriod),m_errorHappened(false),m_continue(true){
 
@@ -87,14 +87,14 @@ void RecallReportPacker::flush(){
     logReport(m_listReports->failedRecalls(),"A file failed to be recalled");
     logReport(m_listReports->successfulRecalls(),"A file was successfully recalled");
     
-    ClientInterface::RequestReport chrono;
+    client::ClientInterface::RequestReport chrono;
     m_client.reportRecallResults(*m_listReports,chrono);
     m_listReports.reset(new FileReportList);
   }
 }
 
 void RecallReportPacker::ReportEndofSession::execute(RecallReportPacker& _this){
-  tapeserver::daemon::ClientInterface::RequestReport chrono;
+  client::ClientInterface::RequestReport chrono;
   if(!_this.m_errorHappened){
     _this.m_client.reportEndOfSession(chrono);
     _this.m_lc.log(LOG_INFO,"Nominal RecallReportPacker::EndofSession has been reported");
@@ -109,7 +109,7 @@ void RecallReportPacker::ReportEndofSession::execute(RecallReportPacker& _this){
 }
 
 void RecallReportPacker::ReportEndofSessionWithErrors::execute(RecallReportPacker& _this){
-  tapeserver::daemon::ClientInterface::RequestReport chrono;
+  client::ClientInterface::RequestReport chrono;
   if(_this.m_errorHappened) {
   _this.m_client.reportEndOfSessionWithError(m_message,m_error_code,chrono); 
   LogContext::ScopedParam(_this.m_lc,Param("errorCode",m_error_code));

castor/tape/tapeserver/daemon/RecallReportPacker.hpp

@@ -27,7 +27,7 @@
 
 #include "castor/tape/tapeserver/daemon/ReportPackerInterface.hpp"
 #include "castor/log/LogContext.hpp"
-#include "castor/tape/tapeserver/daemon/ClientInterface.hpp"
+#include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/tape/tapeserver/threading/Threading.hpp"
 #include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 
@@ -38,7 +38,7 @@ namespace daemon {
   
 class RecallReportPacker : private ReportPackerInterface<detail::Recall> {
 public:
-  RecallReportPacker(ClientInterface & tg,unsigned int reportFilePeriod,log::LogContext lc);
+  RecallReportPacker(client::ClientInterface & tg,unsigned int reportFilePeriod,log::LogContext lc);
   
   ~RecallReportPacker();
   

castor/tape/tapeserver/daemon/RecallReportPackerTest.cpp

@@ -22,7 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 #include "castor/tape/tapeserver/daemon/RecallReportPacker.hpp"
-#include "castor/tape/tapeserver/daemon/FakeClient.hpp"
+#include "castor/tape/tapeserver/client/FakeClient.hpp"
 #include "castor/log/StringLogger.hpp"
 #include <gtest/gtest.h>
 

castor/tape/tapeserver/daemon/RecallTaskInjector.cpp

 #include "castor/tape/tapeserver/daemon/RecallTaskInjector.hpp"
-#include "castor/tape/tapeserver/daemon/ClientInterface.hpp"
+#include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/log/LogContext.hpp"
 #include "castor/tape/tapegateway/FilesToRecallList.hpp"
 #include "castor/tape/tapeserver/utils/suppressUnusedVariable.hpp"
@@ -24,7 +24,7 @@ namespace daemon {
 RecallTaskInjector::RecallTaskInjector(MemoryManager & mm, 
         TapeSingleThreadInterface<TapeReadTask> & tapeReader,
         DiskThreadPoolInterface<DiskWriteTask> & diskWriter,
-        ClientInterface& client,castor::log::LogContext lc) : 
+        client::ClientInterface& client,castor::log::LogContext lc) : 
         m_thread(*this),m_memManager(mm),
         m_tapeReader(tapeReader),m_diskWriter(diskWriter),
         m_client(client),m_lc(lc) 
@@ -71,7 +71,7 @@ void RecallTaskInjector::injectBulkRecalls(const std::vector<castor::tape::tapeg
 
 bool RecallTaskInjector::synchronousInjection(uint64_t maxFiles, uint64_t byteSizeThreshold)
 {
-  ClientProxy::RequestReport reqReport;  
+  client::ClientProxy::RequestReport reqReport;  
 
   std::auto_ptr<castor::tape::tapegateway::FilesToRecallList> filesToRecallList(m_client.getFilesToRecall(maxFiles,byteSizeThreshold,reqReport));
   LogContext::ScopedParam sp[]={
@@ -102,7 +102,7 @@ void RecallTaskInjector::WorkerThread::run()
       while (1) {
         Request req = _this.m_queue.pop();
 	printf("RecallJobInjector:run: about to call client interface\n");
-        ClientProxy::RequestReport reqReport;
+        client::ClientProxy::RequestReport reqReport;
         std::auto_ptr<tapegateway::FilesToRecallList> filesToRecallList(_this.m_client.getFilesToRecall(req.nbMaxFiles, req.byteSizeThreshold,reqReport));
         
         LogContext::ScopedParam sp01(_this.m_lc, Param("transactionId", reqReport.transactionId));