Commit 4582de61 authored by Steven Murray's avatar Steven Murray
Browse files

This is the first attempt at adding the bare minimum of tapeserverd to the CTA project

Please note that you will have to install the following CASTOR rpms
in order to compile:

  castor
  castor-devel
  castor-lib
  castor-lib-server
  castor-lib-tape
parent 15587fb4
......@@ -28,11 +28,11 @@
#include "castor/legacymsg/RmcUnmountMsgBody.hpp"
#include "castor/utils/SmartFd.hpp"
#include "castor/utils/utils.hpp"
#include "rmc_constants.h"
#include "serrno.h"
#include "h/rmc_constants.h"
#include <unistd.h>
#include <shift/serrno.h>
#include <sys/types.h>
#include <unistd.h>
namespace castor {
namespace legacymsg {
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -25,11 +25,11 @@
#include "castor/io/io.hpp"
#include "castor/legacymsg/CommonMarshal.hpp"
#include "castor/legacymsg/RtcpMarshal.hpp"
#include "rtcp_constants.h"
#include "vdqm_constants.h"
#include "h/rtcp_constants.h"
#include <errno.h>
#include <iostream>
#include <shift/vdqm_constants.h>
#include <string.h>
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -25,12 +25,12 @@
#include "castor/io/io.hpp"
#include "castor/legacymsg/CommonMarshal.hpp"
#include "castor/legacymsg/TapeMarshal.hpp"
#include "rtcp_constants.h"
#include "vdqm_constants.h"
#include "Ctape.h"
#include "serrno.h"
#include "h/rtcp_constants.h"
#include <errno.h>
#include <shift/Ctape.h>
#include <shift/serrno.h>
#include <shift/vdqm_constants.h>
#include <string.h>
//-----------------------------------------------------------------------------
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -24,8 +24,8 @@
#pragma once
#include "castor/legacymsg/TapeStatDriveEntry.hpp"
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
#include <string>
......
......@@ -24,9 +24,9 @@
#pragma once
#include "castor/legacymsg/RtcpErrorAppendix.hpp"
#include "Castor_limits.h"
#include "Cuuid.h"
#include <shift/Castor_limits.h>
#include <shift/Cuuid.h>
#include <stdint.h>
namespace castor {
......
......@@ -26,8 +26,9 @@
#include "castor/legacymsg/VdqmProxyTcpIp.hpp"
#include "castor/utils/SmartFd.hpp"
#include "castor/utils/utils.hpp"
#include "rtcp_constants.h"
#include "vdqm_constants.h"
#include "h/rtcp_constants.h"
#include <shift/vdqm_constants.h>
//------------------------------------------------------------------------------
// constructor
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -23,8 +23,7 @@
#pragma once
#include "Castor_limits.h"
#include <shift/Castor_limits.h>
#include <stdint.h>
namespace castor {
......
......@@ -26,10 +26,11 @@
#include "castor/legacymsg/legacymsg.hpp"
#include "castor/legacymsg/MessageHeader.hpp"
#include "castor/legacymsg/GenericReplyMsgBody.hpp"
#include "Ctape.h"
#include "castor/utils/utils.hpp"
#include "GenericMarshal.hpp"
#include <shift/Ctape.h>
//------------------------------------------------------------------------------
// writeTapeRcReplyMsg
//------------------------------------------------------------------------------
......
......@@ -19,6 +19,8 @@
#
cmake_minimum_required (VERSION 2.6)
include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
################################################################################
# Rules to build and install libcastorlegacymsg.so
################################################################################
......
......@@ -24,11 +24,11 @@
#include "castor/log/LogContext.hpp"
#include "castor/log/Param.hpp"
#include "castor/log/Logger.hpp"
#include "Ctape_constants.h"
#include <list>
#include <algorithm>
#include <bfd.h>
#include <shift/Ctape_constants.h>
castor::log::LogContext::LogContext(castor::log::Logger& logger) throw():
m_log(logger) {}
......
......@@ -40,7 +40,7 @@ protected:
TEST_F(castor_log_ParamTest, testConstructorWithAString) {
using namespace castor::log;
std::auto_ptr<Param> param;
std::unique_ptr<Param> param;
ASSERT_NO_THROW(param.reset(new Param("Name", "Value")));
ASSERT_EQ(std::string("Name"), param->getName());
......@@ -49,7 +49,7 @@ TEST_F(castor_log_ParamTest, testConstructorWithAString) {
TEST_F(castor_log_ParamTest, testConstructorWithAnInt) {
using namespace castor::log;
std::auto_ptr<Param> param;
std::unique_ptr<Param> param;
ASSERT_NO_THROW(param.reset(new Param("Name", 1234)));
ASSERT_EQ(std::string("Name"), param->getName());
......
......@@ -23,10 +23,10 @@
#include "castor/log/StringLogger.hpp"
#include "castor/utils/utils.hpp"
#include "Castor_limits.h"
#include "getconfent.h"
#include <errno.h>
#include <shift/Castor_limits.h>
#include <shift/getconfent.h>
#include <sstream>
#include <stdlib.h>
#include <string.h>
......
......@@ -23,10 +23,10 @@
#include "castor/log/SyslogLogger.hpp"
#include "castor/utils/utils.hpp"
#include "Castor_limits.h"
#include "getconfent.h"
#include <errno.h>
#include <shift/Castor_limits.h>
#include <shift/getconfent.h>
#include <sstream>
#include <stdlib.h>
#include <string.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment