[3796] command_interpreter.cc|h|tests moved: src/lib/config => src/lib/cc

diff --git a/src/bin/d2/bundy_d2_controller.h b/src/bin/d2/bundy_d2_controller.h
index 91c2439a1e36976311072711d3e620cc75a3d60f..5470220f5560f68f8bd6535862dca600b4d216e0 100644 (file)
--- a/src/bin/d2/bundy_d2_controller.h
+++ b/src/bin/d2/bundy_d2_controller.h
@@ -18,7 +18,7 @@
 #include <asiolink/io_service.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <d2/d_controller.h>
 #include <d2/d_process.h>

diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index daed1b4fc84359addc9b2b43d79d1d70f9461070..b63f566c159c6144ab464d3f8ac23e4fe1986eff 100644 (file)
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <d2/d2_cfg_mgr.h>
 #include <d2/d2_process.h>

diff --git a/src/bin/d2/d_cfg_mgr.cc b/src/bin/d2/d_cfg_mgr.cc
index 06c857a7a69c15065eee019e1d4db5c2da695b0e..8c8d1b587d0ad1dfd35202a56d89eca3ba94c1cf 100644 (file)
--- a/src/bin/d2/d_cfg_mgr.cc
+++ b/src/bin/d2/d_cfg_mgr.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d2/d2_log.h>
 #include <dhcp/libdhcp++.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index 9686f936692814c750ef17df6c13de4d77a6a243..6c059c1639f60224275c1a18e61f152bda0fd2ab 100644 (file)
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 #include <d2/d2_log.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d2/d_controller.h>
 #include <exceptions/exceptions.h>
 #include <log/logger_support.h>

diff --git a/src/bin/d2/tests/bundy_d2_controller_unittests.cc b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
index acc4c5ee17ad5b433c7f67eb2e5db847d007248a..b59fe3f2b796592fca24129691b649a84659904d 100644 (file)
--- a/src/bin/d2/tests/bundy_d2_controller_unittests.cc
+++ b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/bundy_d2_controller.h>
 #include <d2/spec_config.h>

diff --git a/src/bin/d2/tests/d2_controller_unittests.cc b/src/bin/d2/tests/d2_controller_unittests.cc
index 95695ac9ecb739e8484f007f0dfa74692cea4da9..6468223b5989aa02ebdf68c9e81fc79ba271598d 100644 (file)
--- a/src/bin/d2/tests/d2_controller_unittests.cc
+++ b/src/bin/d2/tests/d2_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/d2_controller.h>
 #include <d2/d2_process.h>

diff --git a/src/bin/d2/tests/d2_process_unittests.cc b/src/bin/d2/tests/d2_process_unittests.cc
index 9cfbdbfac6e3ce048298c891da2f27ec04168cfa..8362cc15e7786170a18050fe56e71855ff0bea1a 100644 (file)
--- a/src/bin/d2/tests/d2_process_unittests.cc
+++ b/src/bin/d2/tests/d2_process_unittests.cc
@@ -15,7 +15,7 @@
 #include <config.h>
 
 #include <asiolink/io_service.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d2/d2_process.h>
 #include <dhcp_ddns/ncr_io.h>
 #include <d_test_stubs.h>

diff --git a/src/bin/d2/tests/d_cfg_mgr_unittests.cc b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
index 37e3dad988f0971c826b87a09eb7c4dd21babe85..7b06961b9dc9ed733c251c6121bdd66154d6742a 100644 (file)
--- a/src/bin/d2/tests/d_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <config/module_spec.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/d2/tests/d_controller_unittests.cc b/src/bin/d2/tests/d_controller_unittests.cc
index ef48b5bbf11b029a03f14ee8ffc9fd9fb5419856..f5612b5c38fa72cfb855129767b67c3d0c76994a 100644 (file)
--- a/src/bin/d2/tests/d_controller_unittests.cc
+++ b/src/bin/d2/tests/d_controller_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <d_test_stubs.h>
 #include <d2/spec_config.h>
 

diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index 232b93392334bbd9f40968623ba2503978196e39..e46b29f7d845591a471874a8cbe7c9e4f99e4e48 100644 (file)
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -18,7 +18,7 @@
 #include <asiolink/io_service.h>
 
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 
 #include <d2/d_controller.h>
 #include <d2/d_cfg_mgr.h>

diff --git a/src/bin/dhcp4/bundy_controller.cc b/src/bin/dhcp4/bundy_controller.cc
index 465ad663dbf07649ce81157286c166ad7946c767..7296f80e551a4b85330e3e8838d3998cef0b589a 100644 (file)
--- a/src/bin/dhcp4/bundy_controller.cc
+++ b/src/bin/dhcp4/bundy_controller.cc
@@ -17,7 +17,7 @@
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index 686098bcff3dac97c0089ea594e001e9a6e89aac..4f816eb3b06498c1181cd497a3b3f5a26e8e49d4 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -17,7 +17,7 @@
 
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp4/dhcp4_srv.h>
 
 namespace isc {

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 5b22a6a9be2855220994f18cb44885c6cdd7dd04..5c031f1d07a45d389b7fc179dace94fb96d8acb2 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp4/dhcp4_log.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option_definition.h>

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 26ecc7d98ee4cb1a72ca97693fdd7e89e3efda9a..20892cf65555e4964cfebc2e4395fb57c0f25f44 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -17,7 +17,7 @@
 #include <arpa/inet.h>
 #include <gtest/gtest.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <config/module_spec.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index d1b72ff41bcd03150fada1e80cc9aedf4b40afd5..d4bfe21968422f61fe9aeb5a3f98201a3ea814dc 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <hooks/hooks_manager.h>

diff --git a/src/bin/dhcp4/tests/d2_unittest.h b/src/bin/dhcp4/tests/d2_unittest.h
index a86086bb1e10d117abb660dc2d37b805e7a8e697..a20ec71999fc28da4a6b1c694c1838c588a2f7f7 100644 (file)
--- a/src/bin/dhcp4/tests/d2_unittest.h
+++ b/src/bin/dhcp4/tests/d2_unittest.h
@@ -18,7 +18,7 @@
 #define D2_UNITTEST_H
 
 #include <dhcp4/dhcp4_srv.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index 47ebb263a6eba77bf73a6ecba2c52516831bb05e..43c6ccfcf6ea2028c0881727b22e1b52df1d2a9f 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -16,7 +16,7 @@
 #include <sstream>
 
 #include <asiolink/io_address.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp/tests/pkt_captures.h>
 #include <dhcp/dhcp4.h>

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index ee3684bfdea0755f58f243dac9bc4f83cacf3fa4..d990d3448eb8320f25a8566fd86e67e5eea2297e 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -16,7 +16,7 @@
 
 #include <asiolink/io_address.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp/option4_addrlst.h>

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index 512e70aace5f0c3a99e1ad913b830b3781e712ff..b35cc2ab8ff6a6aa84889edc5a59d71edc46ea51 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -30,7 +30,7 @@
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <asiolink/io_address.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <list>
 
 #include <boost/shared_ptr.hpp>

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index 2235bdbbad5718cdd3a0857440552c298e82a1ba..a2e031e57ac6326b1d8d9f35b304f148354b5bb4 100644 (file)
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/bin/dhcp6/bundy_controller.cc b/src/bin/dhcp6/bundy_controller.cc
index 02f31ab57ccde60a29632db9b9bee6c6a92922e0..b7125d662546d86fd0f1f678cb5e511339c9a0f9 100644 (file)
--- a/src/bin/dhcp6/bundy_controller.cc
+++ b/src/bin/dhcp6/bundy_controller.cc
@@ -17,7 +17,7 @@
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
 #include <cc/session.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcpsrv/dhcp_config_parser.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index cf5fa18bd9174cfa052af158e887a87b3e03469a..54d1ef659a7650591561110b01c85b42eeaf63ee 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -17,7 +17,7 @@
 
 #include <asiolink/asiolink.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp6/dhcp6_srv.h>
 
 namespace isc {

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 0d960b8eb7e3e027c863e23d575c32fddb83f913..1c6e19935e36a83dceb905f865daa988242097d0 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -16,7 +16,7 @@
 
 #include <asiolink/io_address.h>
 #include <cc/data.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/dhcp6_log.h>

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index e117e364f248b4008134565bc76fcf1676ff3782..2e7aaf4632f6d8646b64a74684646a6659dcaa06 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <config/module_spec.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option6_ia.h>

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index f0b53c81ed955be4029601d2939d03bfe66a474d..0aff170acda0c32c0ae60edccd2509a244b0c7dc 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <hooks/hooks_manager.h>

diff --git a/src/bin/dhcp6/tests/d2_unittest.h b/src/bin/dhcp6/tests/d2_unittest.h
index 4a2a029e7907de58a6d3a34e72093d43c82fe2bb..96d34fc954bbbf545522cb111023dc29645853ae 100644 (file)
--- a/src/bin/dhcp6/tests/d2_unittest.h
+++ b/src/bin/dhcp6/tests/d2_unittest.h
@@ -18,7 +18,7 @@
 #define D2_UNITTEST_H
 
 #include <dhcp6/dhcp6_srv.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 4e3d13afe4b78f00c7a388aa58abb1988023f7c7..d8523ed88187ec84b943ca0e8bb1fec240917e2b 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -42,7 +42,7 @@
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp/tests/pkt_captures.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <boost/pointer_cast.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>

diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 9fe610e5724c2f13d4e6970f8496df362eb35d41..06ddd5ea96886e9485348e563a78a3217809a2ce 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/json_config_parser.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <string.h>
 
 using namespace isc::data;

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index a83ce22d1fc3b4427d3bcfbad79bf8dc7afe1992..c6197de92291b93fa77af956e6ea749ee24d0beb 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -29,7 +29,7 @@
 
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp/tests/pkt_captures.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 #include <unistd.h>

diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index 00b6182b2d449f7ab730be66b5f1fc5b6a31d524..af2adcbcc1bb2a85035926061dd86988f0433b65 100644 (file)
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcpsrv/cfgmgr.h>

diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index a86b5f430d0785cfeddd78f3da22885b82158223..418a3491e2b95241e6a6814c78198a2c1f52b347 100644 (file)
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -15,6 +15,7 @@ endif
 
 lib_LTLIBRARIES = libkea-cc.la
 libkea_cc_la_SOURCES = data.cc data.h
+libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
 libkea_cc_la_SOURCES += logger.cc logger.h
 nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h
 libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la

diff --git a/src/lib/config/command_interpreter.cc b/src/lib/cc/command_interpreter.cc
similarity index 99%
rename from src/lib/config/command_interpreter.cc
rename to src/lib/cc/command_interpreter.cc
index cba3a8eb386f58b2a8906591a635a0e00723092b..47153115778b748d56093a0829120ad95482c55f 100644 (file)
--- a/src/lib/config/command_interpreter.cc
+++ b/src/lib/cc/command_interpreter.cc
@@ -15,7 +15,7 @@
 #include <config.h>
 
 #include <exceptions/exceptions.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <string>
 #include <cc/data.h>
 

diff --git a/src/lib/config/command_interpreter.h b/src/lib/cc/command_interpreter.h
similarity index 100%
rename from src/lib/config/command_interpreter.h
rename to src/lib/cc/command_interpreter.h

diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index c53431e3bac7798a07939bf88d242cacbef9c614..5f8d0c6ecf97d3658ebfe425c3c74aca6998aa88 100644 (file)
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -20,8 +20,8 @@ TESTS =
 if HAVE_GTEST
 TESTS += run_unittests
 # (TODO: these need to be completed and moved to tests/)
-run_unittests_SOURCES = data_unittests.cc run_unittests.cc
-run_unittests_SOURCES += data_file_unittests.cc
+run_unittests_SOURCES = command_interpreter_unittests.cc data_unittests.cc
+run_unittests_SOURCES += data_file_unittests.cc run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 

diff --git a/src/lib/config/tests/command_interpreter_unittests.cc b/src/lib/cc/tests/command_interpreter_unittests.cc
similarity index 98%
rename from src/lib/config/tests/command_interpreter_unittests.cc
rename to src/lib/cc/tests/command_interpreter_unittests.cc
index bfb287ad3dd3f17f76de5971d6c5c4c00d373de6..13b83e0c536b782ee8c72c06da6e449a5eda71cf 100644 (file)
--- a/src/lib/config/tests/command_interpreter_unittests.cc
+++ b/src/lib/cc/tests/command_interpreter_unittests.cc
@@ -15,7 +15,7 @@
 #include <config.h>
 
 #include <gtest/gtest.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <config/tests/data_def_unittests_config.h>
 #include <log/logger_name.h>
 #include <boost/scoped_ptr.hpp>
@@ -29,7 +29,7 @@ using namespace std;
 namespace {
 
 
-/// @brief Shortcut method for creating elements from JSON string
+/// @brief Convenience method for creating elements from JSON string
 ///
 /// @param str string to be converted
 /// @return Element structure

diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index c295caa045b6aaad063e3e94067a29350acefa1e..fd12dddd4ae09e50a9efd061ec2bbddfcb60ff59 100644 (file)
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -17,7 +17,6 @@ BUILT_SOURCES = config_messages.h config_messages.cc
 lib_LTLIBRARIES = libkea-cfgclient.la
 libkea_cfgclient_la_SOURCES = config_data.h config_data.cc
 libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc
-libkea_cfgclient_la_SOURCES += command_interpreter.cc command_interpreter.h
 libkea_cfgclient_la_SOURCES += config_log.h config_log.cc
 
 libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 6fb947c911b022e9ace56eb34b53cb64b741f1c0..cf4062adfaad998c081f259ac297a3ad26632e4a 100644 (file)
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -17,7 +17,7 @@ TESTS_ENVIRONMENT = \
 TESTS =
 if HAVE_GTEST
 TESTS += run_unittests
-run_unittests_SOURCES = command_interpreter_unittests.cc module_spec_unittests.cc
+run_unittests_SOURCES = module_spec_unittests.cc
 run_unittests_SOURCES += config_data_unittests.cc run_unittests.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)

diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
index db8e5bb6fe5f2611e2b0a23357f72e0ccb6aca5a..899fdc7981c141424dc7254db2daf82ea8792924 100644 (file)
--- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <config.h>
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/parsers/dbaccess_parser.h>
 #include <log/logger_support.h>

diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index c5e62b136e613a9c907c612fe071801805b1dccf..2ac95ae2d7206c64b5df286268e1cb94990a79fb 100644 (file)
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <config.h>
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <dhcp/option.h>
 #include <dhcp/option_custom.h>

diff --git a/src/lib/dhcpsrv/testutils/config_result_check.cc b/src/lib/dhcpsrv/testutils/config_result_check.cc
index 0fc67d32a1ea4dd7877969fbbac80662947540d2..e100797afaad0aa5d8af57b35124ba84b8932ac6 100644 (file)
--- a/src/lib/dhcpsrv/testutils/config_result_check.cc
+++ b/src/lib/dhcpsrv/testutils/config_result_check.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <config/command_interpreter.h>
+#include <cc/command_interpreter.h>
 #include <dhcpsrv/testutils/config_result_check.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/constants.hpp>