From 8cb3a2af8a96613aca3509363faa6f225cc6a7cc Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 10 Jul 2017 17:09:21 +0200
Subject: [PATCH] [EOS-CTA] Adds SSI libs to shared object
---
frontend/start_server | 3 ---
frontend/xrd.ssi.conf | 32 --------------------------------
xroot_plugins/CMakeLists.txt | 2 +-
3 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100755 frontend/start_server
delete mode 100644 frontend/xrd.ssi.conf
diff --git a/frontend/start_server b/frontend/start_server
deleted file mode 100755
index 28f6b8cc8f..0000000000
--- a/frontend/start_server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xrootd -c xrd.ssi.conf
diff --git a/frontend/xrd.ssi.conf b/frontend/xrd.ssi.conf
deleted file mode 100644
index 06b0c6950a..0000000000
--- a/frontend/xrd.ssi.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Tell XRootD to use only the SSI framework. If you wish to
-# also use the filesystem features of XRootD then add the
-# keyword default (i.e. xrootd.fslib libXrdSsi.so default).
-
-xrootd.fslib libXrdSsi.so default
-
-# Turn off async processing as this does not work with SSI
-
-xrootd.async off
-
-# Declare the valid prefix for resource names. You can have
-# as many of these directives as you wish, each specifying a
-# different prefix.
-#
-# Allow arbitrary resource names. The question mark makes
-# XRootD scan for ? and split the resource into a name and a
-# CGI string.
-
-all.export / nolock r/w
-
-# Specify the resource lookup function to be used.
-
-#oss.statlib -2 libXrdSsi.so
-
-# Specify the location of the shared library implementing
-# you SSI service. See the SSI svclib directive for details.
-
-ssi.svclib /home/mdavis/CTA/frontend/frontend_ssi.so
-
-xrd.allow host localhost
-
-xrd.port 10400
diff --git a/xroot_plugins/CMakeLists.txt b/xroot_plugins/CMakeLists.txt
index 053837413a..8d57a437cf 100644
--- a/xroot_plugins/CMakeLists.txt
+++ b/xroot_plugins/CMakeLists.txt
@@ -32,7 +32,7 @@ set_target_properties(XrdCtaOfs PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
# XRootD SSI/CTA Frontend shared library
include_directories(../xroot_ssi_pb)
add_library(XrdSsiCta MODULE XrdSsiCtaServiceProvider.cpp XrdSsiCtaRequestProc.cpp)
-target_link_libraries(XrdSsiCta ctaeosmessages ${PROTOBUF3_LIBRARIES})
+target_link_libraries(XrdSsiCta ctaeosmessages ${PROTOBUF3_LIBRARIES} XrdSsi-4 XrdSsiLib)
set_target_properties(XrdSsiCta PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
INSTALL (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
--
GitLab