Commit 5d1ebffa authored by Eric Cano's avatar Eric Cano
Browse files

Extracted BackendPopulator and OStoreDBWithAgent from the XrootD plugin to...

Extracted BackendPopulator and OStoreDBWithAgent from the XrootD plugin to avoid linking the plugin too widely.
parent 68fcc291
......@@ -18,7 +18,7 @@
#include "objectstore/BackendVFS.hpp"
#include "objectstore/RootEntry.hpp"
#include "xroot_plugins/BackendPopulator.hpp"
#include "objectstore/BackendPopulator.hpp"
//------------------------------------------------------------------------------
// Constructor
......
......@@ -43,6 +43,7 @@ add_library (CTAObjectStore
DriveRegister.cpp
BackendVFS.cpp
BackendRados.cpp
BackendPopulator.cpp
BackendFactory.cpp
ObjectOps.cpp
ProtocolBuffersAlgorithms.cpp
......
......@@ -31,7 +31,8 @@ set (CTA_SCHEDULER_SRC_FILES
# mockDB/SQLiteStatementDeleter.cpp
MountType.cpp
UserRequest.cpp
OStoreDB/OStoreDB.cpp)
OStoreDB/OStoreDB.cpp
OStoreDB/OStoreDBWithAgent.cpp)
add_library (ctascheduler SHARED
${CTA_SCHEDULER_SRC_FILES})
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "xroot_plugins/OStoreDBWithAgent.hpp"
#include "scheduler/OStoreDB/OStoreDBWithAgent.hpp"
//------------------------------------------------------------------------------
// Constructor
......
......@@ -11,7 +11,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
......
......@@ -74,7 +74,7 @@ add_library(castorTapeServerDaemon
TpconfigLine.cpp
TpconfigLines.cpp)
target_link_libraries(castorTapeServerDaemon castormessages castortapereactor ctacommon ctanameserver ctaremotens protobuf ctascheduler XrdCtaOfs)
target_link_libraries(castorTapeServerDaemon castormessages castortapereactor ctacommon ctanameserver ctaremotens protobuf ctascheduler)
add_dependencies(castorTapeServerDaemon castormessagesprotobuf)
add_executable(tapeserverd TapeDaemon.cpp)
......
......@@ -56,8 +56,8 @@
#include "scheduler/Scheduler.hpp"
#include "serrno.h"
#include "nameserver/mockNS/MockNameServer.hpp"
#include "xroot_plugins/BackendPopulator.hpp"
#include "xroot_plugins/OStoreDBWithAgent.hpp"
#include "objectstore/BackendPopulator.hpp"
#include "scheduler/OStoreDB/OStoreDBWithAgent.hpp"
#include <errno.h>
#include <memory>
......
......@@ -7,7 +7,7 @@ include_directories(${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
include_directories(${CMAKE_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/tapeserver)
add_library (XrdCtaOfs MODULE XrdCtaFilesystem.cpp XrdCtaFile.cpp OStoreDBWithAgent.cpp BackendPopulator.cpp)
add_library (XrdCtaOfs MODULE XrdCtaFilesystem.cpp XrdCtaFile.cpp)
target_link_libraries (XrdCtaOfs ctascheduler ctacommon ctanameserver ctaremotens protobuf CTAObjectStore cryptopp)
INSTALL (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
......
......@@ -23,8 +23,8 @@
#include "remotens/EosNS.hpp"
#include "remotens/RemoteNS.hpp"
#include "scheduler/Scheduler.hpp"
#include "xroot_plugins/BackendPopulator.hpp"
#include "xroot_plugins/OStoreDBWithAgent.hpp"
#include "objectstore/BackendPopulator.hpp"
#include "scheduler/OStoreDB/OStoreDBWithAgent.hpp"
#include "XrdSfs/XrdSfsInterface.hh"
......
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