Moving ConfigurationFile.cpp from tapeserver/daemon to common directory

common/CMakeLists.txt

@@ -128,6 +128,7 @@ set (COMMON_LIB_SRC_FILES
   utils/strerror_r_wrapper.cpp
   CreationLog.cpp
   Configuration.cpp
+  ConfigurationFile.cpp  
   TapePool.cpp
   Timer.cpp
   UserIdentity.cpp

tapeserver/daemon/CMakeLists.txt

@@ -13,7 +13,6 @@ include_directories(${PROTOBUF3_INCLUDE_DIRS})
 add_library(ctatapedaemon
   ${WDMsgSources}
   CommandLineParams.cpp
-  ConfigurationFile.cpp
   DriveHandler.cpp
   DriveHandlerProxy.cpp
   GarbageCollectorHandler.cpp

tapeserver/daemon/ConfigurationFileTests.cpp

@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "tests/TempFile.hpp"
 
 namespace unitTests {
@@ -36,4 +36,4 @@ TEST(cta_Daemon, ConfigurationFile) {
   ASSERT_EQ(2, cf.entries.at("cat1").at("key1").line);
 }
 
-} // namespace unitTests
\ No newline at end of file
+} // namespace unitTests

tapeserver/daemon/SourcedParameter.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/exception/Exception.hpp"
-#include "tapeserver/daemon/ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "common/utils/utils.hpp"
 #include "common/log/LogContext.hpp"
 #include "common/log/Logger.hpp"
@@ -115,4 +115,4 @@ private:
 
 
 
-}}} // namespace cta::tape::daemon
\ No newline at end of file
+}}} // namespace cta::tape::daemon

tapeserver/daemon/TapedConfiguration.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "TapedConfiguration.hpp"
-#include "ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "Tpconfig.hpp"
 
 namespace cta { namespace tape { namespace daemon {

tapeserver/daemon/TapedConfigurationTests.cpp

@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "tapeserver/daemon/ConfigurationFile.hpp"
+#include "common/ConfigurationFile.hpp"
 #include "tapeserver/daemon/TapedConfiguration.hpp"
 #include "tests/TempFile.hpp"
 #include "common/log/StdoutLogger.hpp"