[hackathon-client] Compilation fixes after rebase

diff --git a/src/bin/client/Makefile.am b/src/bin/client/Makefile.am
index 58454af8848097cb87dc34140f2361c62cd1fe8d..bbbce85d37a347955715748419e491c66f74739e 100644 (file)
--- a/src/bin/client/Makefile.am
+++ b/src/bin/client/Makefile.am
@@ -46,7 +46,7 @@ BUILT_SOURCES = client_messages.h client_messages.cc
 noinst_LTLIBRARIES = libclient.la
 
 libclient_la_SOURCES  =
-libclient_la_SOURCES += client_interface.h client_interface.cc
+libclient_la_SOURCES += client6_interface.h client6_interface.cc
 libclient_la_SOURCES += executor.cc executor.h
 libclient_la_SOURCES += clnt_process.cc clnt_process.h
 libclient_la_SOURCES += clnt_cfg_mgr.cc clnt_cfg_mgr.h
@@ -62,7 +62,7 @@ sbin_PROGRAMS = kea-client
 
 kea_client_SOURCES = main.cc
 
-kea_client_LDADD  = libclnt.la
+kea_client_LDADD  = libclient.la
 
 kea_client_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_client_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/bin/client/clnt_cfg_mgr.cc b/src/bin/client/clnt_cfg_mgr.cc
index afadddb3ec6fd1d33cb08f0b80cd186acea779f4..68bd22697672f8470843fcd0ce86f07220662353 100644 (file)
--- a/src/bin/client/clnt_cfg_mgr.cc
+++ b/src/bin/client/clnt_cfg_mgr.cc
@@ -14,7 +14,7 @@ namespace isc {
 namespace client {
 
 ClntCfgMgr::ClntCfgMgr()
-  :DCfgMgrBase(process::DCfgContextBasePtr(new ClntConfig())) {
+  :DCfgMgrBase(process::ConfigPtr(new ClntConfig())) {
 }
 
 std::string
@@ -27,15 +27,9 @@ ClntCfgMgr::parse(isc::data::ConstElementPtr config, bool check_only) {
     return (ConstElementPtr(new MapElement()));
 }
 
-isc::dhcp::ParserPtr
-ClntCfgMgr::createConfigParser(const std::string&,
-                               const isc::data::Element::Position& pos) {
-    return (isc::dhcp::ParserPtr());
-}
-
-process::DCfgContextBasePtr
+process::ConfigPtr
 ClntCfgMgr::createNewContext() {
-  return (process::DCfgContextBasePtr(new ClntConfig()));
+  return (process::ConfigPtr(new ClntConfig()));
 }
 
 void ClntCfgMgr::ensureCurrentAllocated() {

diff --git a/src/bin/client/clnt_cfg_mgr.h b/src/bin/client/clnt_cfg_mgr.h
index d6c9f7a5577e5bd837ed698e38a8aa01f2399f03..6133f5858471f17f871f721dcbcbbd880e7e2825 100644 (file)
--- a/src/bin/client/clnt_cfg_mgr.h
+++ b/src/bin/client/clnt_cfg_mgr.h
@@ -11,7 +11,6 @@
 #include <cc/data.h>
 #include <hooks/hooks_config.h>
 #include <process/d_cfg_mgr.h>
-#include <process/base_cfg_mgr.h>
 #include <boost/pointer_cast.hpp>
 
 namespace isc {
@@ -55,14 +54,6 @@ protected:
     virtual isc::data::ConstElementPtr
     parse(isc::data::ConstElementPtr config, bool check_only);
 
-    /// @brief This is no longer used.
-    ///
-    /// @throw NotImplemented
-    /// @return nothing, always throws
-    virtual isc::dhcp::ParserPtr
-    createConfigParser(const std::string&,
-                       const isc::data::Element::Position& pos);
-
     /// @brief Creates a new, blank CtrlAgentCfgContext context.
     ///
     ///
@@ -73,7 +64,7 @@ protected:
     /// error.
     ///
     /// @return Returns a DCfgContextBasePtr to the new context instance.
-    virtual process::DCfgContextBasePtr createNewContext();
+    virtual process::ConfigPtr createNewContext();
 };
 
 };

diff --git a/src/bin/client/clnt_config.h b/src/bin/client/clnt_config.h
index 97872d29e900fbb2a566f105b333113f07067295..257231f2005128c5cfe8151a6fcb61241436824f 100644 (file)
--- a/src/bin/client/clnt_config.h
+++ b/src/bin/client/clnt_config.h
@@ -8,6 +8,7 @@
 #define CLNT_CONFIG_H
 
 #include <process/d_cfg_mgr.h>
+#include <process/config_base.h>
 
 namespace isc {
 namespace client {
@@ -15,12 +16,12 @@ namespace client {
 class ClntConfig;
 typedef boost::shared_ptr<ClntConfig> ClntConfigPtr;
 
-class ClntConfig : public process::DCfgContextBase {
+class ClntConfig : public process::ConfigBase {
 public:
   ClntConfig();
 
-  virtual process::BaseConfigPtr clone() const {
-      return (process::BaseConfigPtr(new ClntConfig(*this)));
+  virtual process::ConfigPtr clone() const {
+      return (process::ConfigPtr(new ClntConfig(*this)));
   }
 
   virtual isc::data::ElementPtr toElement() const;

diff --git a/src/bin/client/clnt_process.cc b/src/bin/client/clnt_process.cc
index 7dba35262f24e4e7910d234bd7b4e143ce835cd5..87c1926550383943afec400db2135122e9bebf66 100644 (file)
--- a/src/bin/client/clnt_process.cc
+++ b/src/bin/client/clnt_process.cc
@@ -8,6 +8,7 @@
 #include <client/clnt_cfg_mgr.h>
 #include <cc/command_interpreter.h>
 #include <process/d_cfg_mgr.h>
+#include <iostream>
 
 using namespace isc::client;
 using namespace isc::config;

diff --git a/src/bin/client/tests/Makefile.am b/src/bin/client/tests/Makefile.am
index feb3224ef7d128abcece13b70fb751d87a8d3666..d522edcaf677a06f211cb8c931b1635fe71d6d3b 100644 (file)
--- a/src/bin/client/tests/Makefile.am
+++ b/src/bin/client/tests/Makefile.am
@@ -41,7 +41,6 @@ client_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 client_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 client_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 client_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-client_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 client_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 client_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 client_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)