From 79a44be9d1d9859479b18f98b854320a09a7c572 Mon Sep 17 00:00:00 2001
From: Anastasia Karachaliou <anastasia.karachaliou@cern.ch>
Date: Tue, 19 Dec 2017 18:11:23 +0100
Subject: [PATCH] Moving ConfigurationFile.cpp from tapeserver/daemon to common
 directory

---
 common/CMakeLists.txt                               | 1 +
 {tapeserver/daemon => common}/ConfigurationFile.cpp | 0
 {tapeserver/daemon => common}/ConfigurationFile.hpp | 0
 tapeserver/daemon/CMakeLists.txt                    | 1 -
 tapeserver/daemon/ConfigurationFileTests.cpp        | 4 ++--
 tapeserver/daemon/SourcedParameter.hpp              | 4 ++--
 tapeserver/daemon/TapedConfiguration.cpp            | 2 +-
 tapeserver/daemon/TapedConfigurationTests.cpp       | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename {tapeserver/daemon => common}/ConfigurationFile.cpp (100%)
 rename {tapeserver/daemon => common}/ConfigurationFile.hpp (100%)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index acba895f22..c0ce21437c 100644
--- a/common/CMakeLists.txt
+++ b/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
diff --git a/tapeserver/daemon/ConfigurationFile.cpp b/common/ConfigurationFile.cpp
similarity index 100%
rename from tapeserver/daemon/ConfigurationFile.cpp
rename to common/ConfigurationFile.cpp
diff --git a/tapeserver/daemon/ConfigurationFile.hpp b/common/ConfigurationFile.hpp
similarity index 100%
rename from tapeserver/daemon/ConfigurationFile.hpp
rename to common/ConfigurationFile.hpp
diff --git a/tapeserver/daemon/CMakeLists.txt b/tapeserver/daemon/CMakeLists.txt
index 41fef79f40..1168864e9d 100644
--- a/tapeserver/daemon/CMakeLists.txt
+++ b/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
diff --git a/tapeserver/daemon/ConfigurationFileTests.cpp b/tapeserver/daemon/ConfigurationFileTests.cpp
index 440c513b87..d48c62b86b 100644
--- a/tapeserver/daemon/ConfigurationFileTests.cpp
+++ b/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
diff --git a/tapeserver/daemon/SourcedParameter.hpp b/tapeserver/daemon/SourcedParameter.hpp
index 4d1fddee49..3d38550402 100644
--- a/tapeserver/daemon/SourcedParameter.hpp
+++ b/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
diff --git a/tapeserver/daemon/TapedConfiguration.cpp b/tapeserver/daemon/TapedConfiguration.cpp
index 01e0d1f16d..7f7d6831fb 100644
--- a/tapeserver/daemon/TapedConfiguration.cpp
+++ b/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 {
diff --git a/tapeserver/daemon/TapedConfigurationTests.cpp b/tapeserver/daemon/TapedConfigurationTests.cpp
index 4da6a6733f..fe0c95e5a8 100644
--- a/tapeserver/daemon/TapedConfigurationTests.cpp
+++ b/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"
-- 
GitLab