From 1316a6a935dc2c90c8bb710065c3fc29299a62b1 Mon Sep 17 00:00:00 2001 From: Michael Davis <michael.davis@cern.ch> Date: Fri, 19 Jan 2018 11:59:00 +0100 Subject: [PATCH] Renames eoscta_stub to cta-wfe-test Use in the EOS workflow/bash scripts is deprecated. However it's useful to keep the script around for now to test the SSI workflows without needing to invoke EOS. --- cmdline/CMakeLists.txt | 14 ++++++++++++++ cmdline/EosCtaStub.cpp | 2 +- cta.spec.in | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt index 4eee6657f4..084d6b24cb 100644 --- a/cmdline/CMakeLists.txt +++ b/cmdline/CMakeLists.txt @@ -39,6 +39,20 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) #target_compile_definitions(cta-admin PUBLIC XRDSSI_DEBUG) install(TARGETS cta-admin DESTINATION usr/bin) +# +# cta-wfe-test archive|retrieve|delete <options> allows testing of the SSI WorkFlow Engine hooks +# without invoking EOS. +# +# Previously this was the eoscta_stub which was called by a script invoked by the EOS WFE. +# +find_package(cryptopp REQUIRED) +add_executable(cta-wfe-test EosCtaStub.cpp Configuration.cpp) +target_link_libraries(cta-wfe-test cryptopp ctacommon XrdSsiPbEosCta XrdSsi-4 XrdSsiLib) +set_property (TARGET cta-wfe-test APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) +# Get some extra debug messages on stdout +#target_compile_definitions(eoscta_stub PUBLIC XRDSSI_DEBUG) +install(TARGETS cta-wfe-test DESTINATION usr/bin) + # # Old cta is scheduled for deletion # diff --git a/cmdline/EosCtaStub.cpp b/cmdline/EosCtaStub.cpp index 73be6dc73e..3014a72eda 100644 --- a/cmdline/EosCtaStub.cpp +++ b/cmdline/EosCtaStub.cpp @@ -53,7 +53,7 @@ void RequestCallback<cta::xrd::Alert>::operator()(const cta::xrd::Alert &alert) //! Usage exception -const std::runtime_error Usage("Usage: eoscta_stub archive|retrieve|deletearchive [options] [--stderr]"); +const std::runtime_error Usage("Usage: cta-wfe-test archive|retrieve|deletearchive [options] [--stderr]"); diff --git a/cta.spec.in b/cta.spec.in index f0d4c17f40..3477cacb37 100644 --- a/cta.spec.in +++ b/cta.spec.in @@ -115,6 +115,7 @@ The xroot plugin %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/cta.deprecated %attr(0755,root,root) %{_bindir}/cta-admin +%attr(0755,root,root) %{_bindir}/cta-wfe-test %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf %else @@ -179,6 +180,7 @@ The xroot plugin %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/cta.deprecated %attr(0755,root,root) %{_bindir}/cta-admin +%attr(0755,root,root) %{_bindir}/cta-wfe-test %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf %package -n cta-lib -- GitLab