Move clicommand.{cpp,hpp} to lib/cli

refs #7246

diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index e729e07cf6367f683a2613427c3f8c03eda58298..6960bae4d3272e94cbd4a5344be48fde4fa15ede 100644 (file)
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 add_executable(icinga-app icinga.cpp ${WindowsSources})
 
 include_directories(${Boost_INCLUDE_DIRS})
-target_link_libraries(icinga-app ${Boost_LIBRARIES} base config)
+target_link_libraries(icinga-app ${Boost_LIBRARIES} base config cli)
 
 set_target_properties (
   icinga-app PROPERTIES

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 0c6d058b042ca6f67bec2f2ec82eb59381b306b9..ea24f66a082414f4b6067c5371cc61a432e68644 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -17,6 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
+#include "cli/clicommand.hpp"
 #include "config/configcompilercontext.hpp"
 #include "config/configcompiler.hpp"
 #include "config/configitembuilder.hpp"
@@ -28,7 +29,6 @@
 #include "base/convert.hpp"
 #include "base/scriptvariable.hpp"
 #include "base/context.hpp"
-#include "base/clicommand.hpp"
 #include "base/console.hpp"
 #include "config.h"
 #include <boost/program_options.hpp>

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 41c13fc0849fe746f840e5d4a2ca0e60a1be0be7..1c831ba24ae31e40d03f4e27311b45d430180643 100644 (file)
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -23,7 +23,7 @@ mkclass_target(streamlogger.ti streamlogger.thpp)
 mkclass_target(sysloglogger.ti sysloglogger.thpp)
 
 set(base_SOURCES
-  application.cpp application.thpp array.cpp clicommand.cpp configerror.cpp console.cpp context.cpp
+  application.cpp application.thpp array.cpp configerror.cpp console.cpp context.cpp
   convert.cpp debuginfo.cpp dictionary.cpp dynamicobject.cpp dynamicobject.thpp dynamictype.cpp
   exception.cpp fifo.cpp filelogger.cpp filelogger.thpp logger.cpp logger.thpp
   netstring.cpp networkstream.cpp object.cpp objectlock.cpp process.cpp

diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt
index 49f270e0c3b854bf87724634bb2cea0e8e14f355..e1cc29afb5a65d0ee0c4897764f316902b3403f7 100644 (file)
--- a/lib/cli/CMakeLists.txt
+++ b/lib/cli/CMakeLists.txt
@@ -18,11 +18,12 @@
 set(cli_SOURCES
   agentaddcommand.cpp agentblackandwhitelistcommand.cpp agentlistcommand.cpp agentremovecommand.cpp
   agentsetcommand.cpp agentsetupcommand.cpp agentupdateconfigcommand.cpp agentwizardcommand.cpp agentutility.cpp
+  clicommand.cpp
+  daemoncommand.cpp
   featureenablecommand.cpp featuredisablecommand.cpp featurelistcommand.cpp featureutility.cpp
   objectlistcommand.cpp
   pkinewcacommand.cpp pkinewcertcommand.cpp pkisigncsrcommand.cpp pkirequestcommand.cpp pkiticketcommand.cpp
   repositoryobjectcommand.cpp
-  daemoncommand.cpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/cli/agentaddcommand.cpp b/lib/cli/agentaddcommand.cpp
index ab7e06d8aa65b91ca3bb7cbf3a80f64292fc156b..2ccf48e0769216a903a7e2147d3caa19ea3f0340 100644 (file)
--- a/lib/cli/agentaddcommand.cpp
+++ b/lib/cli/agentaddcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentaddcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentaddcommand.hpp b/lib/cli/agentaddcommand.hpp
index 88da787f5a734ac5663a3ff1b27b3bf704410f25..d1107c8655e2fcb73caa8a5867e1c3815d49957d 100644 (file)
--- a/lib/cli/agentaddcommand.hpp
+++ b/lib/cli/agentaddcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTADDCOMMAND_H
 #define AGENTADDCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp
index 6406b011d84111be1320559419d9b308da8e9c96..309911487a41d08f4ce8c97ddba3b842cffc80c1 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.cpp
+++ b/lib/cli/agentblackandwhitelistcommand.cpp
@@ -19,9 +19,7 @@
 
 #include "cli/agentblackandwhitelistcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
-#include "base/tlsutility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <fstream>
 

diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index 16a13cea3c3398e2a5410c6de01d279649eb9fda..03ef8fdb4f3c680c943733d75790bc0ba48d49e0 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef BLACKANDWHITELISTCOMMAND_H
 #define BLACKANDWHITELISTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentlistcommand.cpp b/lib/cli/agentlistcommand.cpp
index e9647e6e031a14350ed7428230365a36047db599..49abd13eb7b859f8690767fd9c0c1babf064f173 100644 (file)
--- a/lib/cli/agentlistcommand.cpp
+++ b/lib/cli/agentlistcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentlistcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentlistcommand.hpp b/lib/cli/agentlistcommand.hpp
index 8e68e9cfe537eeaa502c22a061eee0bbdb0532d2..1667a68041fa4c4c7bac34bcf570a3ca09ba8890 100644 (file)
--- a/lib/cli/agentlistcommand.hpp
+++ b/lib/cli/agentlistcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTLISTCOMMAND_H
 #define AGENTLISTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentremovecommand.cpp b/lib/cli/agentremovecommand.cpp
index 194ac1d2864fd88a4d77cf73d7eb84978a29e61f..f7565f0b267c1229308311cea8d631405e18a435 100644 (file)
--- a/lib/cli/agentremovecommand.cpp
+++ b/lib/cli/agentremovecommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentremovecommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentremovecommand.hpp b/lib/cli/agentremovecommand.hpp
index ab3551972755e0e9151e21dccdfbccd4dd4ac3c0..2363ddf4ef8c061401b1c4bd94d12197a6c9aac7 100644 (file)
--- a/lib/cli/agentremovecommand.hpp
+++ b/lib/cli/agentremovecommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTREMOVECOMMAND_H
 #define AGENTREMOVECOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentsetcommand.cpp b/lib/cli/agentsetcommand.cpp
index b6421ffaa64697670efa676e6620a09650db8466..5644b78acdd820be5dffac06a5f2aac03c0deee5 100644 (file)
--- a/lib/cli/agentsetcommand.cpp
+++ b/lib/cli/agentsetcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentsetcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentsetcommand.hpp b/lib/cli/agentsetcommand.hpp
index 2a4cf516257072f8644e913375a6806912223278..567ad4791d6bfa70e979f74ebabb071cecf126f5 100644 (file)
--- a/lib/cli/agentsetcommand.hpp
+++ b/lib/cli/agentsetcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTSETCOMMAND_H
 #define AGENTSETCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentsetupcommand.cpp b/lib/cli/agentsetupcommand.cpp
index 035e0698d3f7f8dcb88b6366e58e30625e371aae..154e3f0da6753e534eaf03b3da8c1057623f7265 100644 (file)
--- a/lib/cli/agentsetupcommand.cpp
+++ b/lib/cli/agentsetupcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentsetupcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentsetupcommand.hpp b/lib/cli/agentsetupcommand.hpp
index 1e970ea5556644abe6c2ce146cff3f37935029c9..0e5b4f50cb89111d26a97a1dc9e69bad2ccbb9a0 100644 (file)
--- a/lib/cli/agentsetupcommand.hpp
+++ b/lib/cli/agentsetupcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTSETUPCOMMAND_H
 #define AGENTSETUPCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentupdateconfigcommand.cpp b/lib/cli/agentupdateconfigcommand.cpp
index 829b74eb4ebcacdaf3af3d01d450befd6c0a32a6..472606e492e164cebb6c20bc40bb003b84134626 100644 (file)
--- a/lib/cli/agentupdateconfigcommand.cpp
+++ b/lib/cli/agentupdateconfigcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentupdateconfigcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentupdateconfigcommand.hpp b/lib/cli/agentupdateconfigcommand.hpp
index 418435edae32c89c72f3a0f6f726ecc3ed372255..8b7d2c69971592945b72148e51c1040006e39f3c 100644 (file)
--- a/lib/cli/agentupdateconfigcommand.hpp
+++ b/lib/cli/agentupdateconfigcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTUPDATECONFIGCOMMAND_H
 #define AGENTUPDATECONFIGCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/agentwizardcommand.cpp b/lib/cli/agentwizardcommand.cpp
index 3f900bff0e2be454e096e9390019b4dd5f00b1cb..2ed2ef96fc555d5769a5b7e59237dae2e14d618f 100644 (file)
--- a/lib/cli/agentwizardcommand.cpp
+++ b/lib/cli/agentwizardcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentwizardcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/agentwizardcommand.hpp b/lib/cli/agentwizardcommand.hpp
index ef8007925c8fed360608c5b3315ab060519336bb..5ae25878dc3a5585ee6f8919ee2b53a6c6c0b169 100644 (file)
--- a/lib/cli/agentwizardcommand.hpp
+++ b/lib/cli/agentwizardcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef AGENTWIZARDCOMMAND_H
 #define AGENTWIZARDCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/clicommand.cpp b/lib/cli/clicommand.cpp
similarity index 91%
rename from lib/base/clicommand.cpp
rename to lib/cli/clicommand.cpp
index b23ae8287113471d1b801f90f2450019f083d250..fb89481b52429cee11691928d65db69614f3763f 100644 (file)
--- a/lib/base/clicommand.cpp
+++ b/lib/cli/clicommand.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 #include "base/logger.hpp"
 #include "base/type.hpp"
 #include "base/serializer.hpp"
@@ -33,9 +33,6 @@
 using namespace icinga;
 namespace po = boost::program_options;
 
-boost::mutex l_RegistryMutex;
-std::map<std::vector<String>, CLICommand::Ptr> l_Registry;
-
 std::vector<String> icinga::GetBashCompletionSuggestions(const String& type, const String& word)
 {
        std::vector<String> result;
@@ -95,13 +92,25 @@ std::vector<String> icinga::GetFieldCompletionSuggestions(const Type *type, cons
        return result;
 }
 
+boost::mutex& CLICommand::GetRegistryMutex(void)
+{
+       static boost::mutex mtx;
+       return mtx;
+}
+
+std::map<std::vector<String>, CLICommand::Ptr>& CLICommand::GetRegistry(void)
+{
+       static std::map<std::vector<String>, CLICommand::Ptr> registry;
+       return registry;
+}
+
 CLICommand::Ptr CLICommand::GetByName(const std::vector<String>& name)
 {
-       boost::mutex::scoped_lock lock(l_RegistryMutex);
+       boost::mutex::scoped_lock lock(GetRegistryMutex());
 
-       std::map<std::vector<String>, CLICommand::Ptr>::const_iterator it = l_Registry.find(name);
+       std::map<std::vector<String>, CLICommand::Ptr>::const_iterator it = GetRegistry().find(name);
 
-       if (it == l_Registry.end())
+       if (it == GetRegistry().end())
                return CLICommand::Ptr();
 
        return it->second;
@@ -109,14 +118,14 @@ CLICommand::Ptr CLICommand::GetByName(const std::vector<String>& name)
 
 void CLICommand::Register(const std::vector<String>& name, const CLICommand::Ptr& function)
 {
-       boost::mutex::scoped_lock lock(l_RegistryMutex);
-       l_Registry[name] = function;
+       boost::mutex::scoped_lock lock(GetRegistryMutex());
+       GetRegistry()[name] = function;
 }
 
 void CLICommand::Unregister(const std::vector<String>& name)
 {
-       boost::mutex::scoped_lock lock(l_RegistryMutex);
-       l_Registry.erase(name);
+       boost::mutex::scoped_lock lock(GetRegistryMutex());
+       GetRegistry().erase(name);
 }
 
 RegisterCLICommandHelper::RegisterCLICommandHelper(const String& name, const CLICommand::Ptr& command)
@@ -145,14 +154,14 @@ bool CLICommand::ParseCommand(int argc, char **argv, po::options_description& vi
     po::positional_options_description& positionalDesc,
     po::variables_map& vm, String& cmdname, CLICommand::Ptr& command, bool autocomplete)
 {
-       boost::mutex::scoped_lock lock(l_RegistryMutex);
+       boost::mutex::scoped_lock lock(GetRegistryMutex());
 
        typedef std::map<std::vector<String>, CLICommand::Ptr>::value_type CLIKeyValue;
 
        std::vector<String> best_match;
        int arg_end = 1;
 
-       BOOST_FOREACH(const CLIKeyValue& kv, l_Registry) {
+       BOOST_FOREACH(const CLIKeyValue& kv, GetRegistry()) {
                const std::vector<String>& vname = kv.first;
 
                for (int i = 0, k = 1; i < vname.size() && k < argc; i++, k++) {
@@ -204,7 +213,7 @@ void CLICommand::ShowCommands(int argc, char **argv, po::options_description *vi
     ArgumentCompletionCallback globalArgCompletionCallback,
     bool autocomplete, int autoindex)
 {
-       boost::mutex::scoped_lock lock(l_RegistryMutex);
+       boost::mutex::scoped_lock lock(GetRegistryMutex());
 
        typedef std::map<std::vector<String>, CLICommand::Ptr>::value_type CLIKeyValue;
 
@@ -212,7 +221,7 @@ void CLICommand::ShowCommands(int argc, char **argv, po::options_description *vi
        int arg_begin = 0;
        CLICommand::Ptr command;
 
-       BOOST_FOREACH(const CLIKeyValue& kv, l_Registry) {
+       BOOST_FOREACH(const CLIKeyValue& kv, GetRegistry()) {
                const std::vector<String>& vname = kv.first;
 
                arg_begin = 0;
@@ -249,7 +258,7 @@ void CLICommand::ShowCommands(int argc, char **argv, po::options_description *vi
        } else
                std::cout << "Supported commands: " << std::endl;
 
-       BOOST_FOREACH(const CLIKeyValue& kv, l_Registry) {
+       BOOST_FOREACH(const CLIKeyValue& kv, GetRegistry()) {
                const std::vector<String>& vname = kv.first;
 
                if (vname.size() < best_match.size())

diff --git a/lib/base/clicommand.hpp b/lib/cli/clicommand.hpp
similarity index 96%
rename from lib/base/clicommand.hpp
rename to lib/cli/clicommand.hpp
index a324681cbe116ac7ce07f7d74716f693514be6a6..39c3aa0cbb5dbb331eba6523e8367cbae963ae69 100644 (file)
--- a/lib/base/clicommand.hpp
+++ b/lib/cli/clicommand.hpp
@@ -67,6 +67,10 @@ public:
            boost::program_options::options_description *hiddenDesc = NULL,
            ArgumentCompletionCallback globalArgCompletionCallback = NULL,
            bool autocomplete = false, int autoindex = -1);
+
+private:
+       static boost::mutex& GetRegistryMutex(void);
+       static std::map<std::vector<String>, CLICommand::Ptr>& GetRegistry(void);
 };
 
 /**

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index df9bfe81761f1f4fdcdda7e71249385ade86c5cf..f5e6de2974a34a869c30bd2ce14b46f42d314edc 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -22,7 +22,6 @@
 #include "config/configcompiler.hpp"
 #include "config/configitembuilder.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include "base/logger.hpp"
 #include "base/timer.hpp"

diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp
index 942b01f803b2aa1ae04bc597944529a561a92811..5a95d218ddea9eec3903eda3a2c6c7388e82e900 100644 (file)
--- a/lib/cli/daemoncommand.hpp
+++ b/lib/cli/daemoncommand.hpp
@@ -20,7 +20,7 @@
 #ifndef DAEMONCOMMAND_H
 #define DAEMONCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/featuredisablecommand.cpp b/lib/cli/featuredisablecommand.cpp
index 6dbf231b8914d4851d39391354e5f0baae1b5de2..111c9cc6d610a974a20cdc697a1a3440d6dbf2eb 100644 (file)
--- a/lib/cli/featuredisablecommand.cpp
+++ b/lib/cli/featuredisablecommand.cpp
@@ -20,7 +20,6 @@
 #include "cli/featuredisablecommand.hpp"
 #include "cli/featureutility.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include "base/convert.hpp"
 #include "base/console.hpp"

diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp
index 1b44288118df43651e44878ec729799173b2f8d8..b31a16f914b75df9a9f9e178cfa8fc6423eef374 100644 (file)
--- a/lib/cli/featuredisablecommand.hpp
+++ b/lib/cli/featuredisablecommand.hpp
@@ -20,7 +20,7 @@
 #ifndef FEATUREDISABLECOMMAND_H
 #define FEATUREDISABLECOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/featureenablecommand.cpp b/lib/cli/featureenablecommand.cpp
index a8399ebc4d75a02e1aaf6b550cab6922057b09f2..36f80167a54767a2d98c93a9d9e01a85e95fddbd 100644 (file)
--- a/lib/cli/featureenablecommand.cpp
+++ b/lib/cli/featureenablecommand.cpp
@@ -20,7 +20,6 @@
 #include "cli/featureenablecommand.hpp"
 #include "cli/featureutility.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include "base/convert.hpp"
 #include "base/console.hpp"

diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp
index 985bcd203a78b6b664a17239cac9b5935c6dda86..db003ab8c4b580753c884fd31083a50efa39c771 100644 (file)
--- a/lib/cli/featureenablecommand.hpp
+++ b/lib/cli/featureenablecommand.hpp
@@ -20,7 +20,7 @@
 #ifndef FEATUREENABLECOMMAND_H
 #define FEATUREENABLECOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/featurelistcommand.cpp b/lib/cli/featurelistcommand.cpp
index 03708a9aeb2bdaf1c02f8a6572afba5e356d652f..c63e63fa6052d7b1838084890b803280ccde19fc 100644 (file)
--- a/lib/cli/featurelistcommand.cpp
+++ b/lib/cli/featurelistcommand.cpp
@@ -20,7 +20,6 @@
 #include "cli/featurelistcommand.hpp"
 #include "cli/featureutility.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/convert.hpp"
 #include "base/console.hpp"
 #include <boost/foreach.hpp>
@@ -73,4 +72,4 @@ int FeatureListCommand::Run(const boost::program_options::variables_map& vm, con
            << boost::algorithm::join(enabled_features, " ") << "\n";
 
        return 0;
-}
\ No newline at end of file
+}

diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp
index 146ee36b225e61e750651e5ff1827284dded47e9..a23b97f86f16321be8d23bfcd5fe3a0e1c964666 100644 (file)
--- a/lib/cli/featurelistcommand.hpp
+++ b/lib/cli/featurelistcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef FEATURELISTCOMMAND_H
 #define FEATURELISTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/featureutility.cpp b/lib/cli/featureutility.cpp
index 10bd89110da44d600a225273d69dd5040e97b6e7..5502f20800fe6ced4be34c600bc7a23767eb71d8 100644 (file)
--- a/lib/cli/featureutility.cpp
+++ b/lib/cli/featureutility.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/featureutility.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>

diff --git a/lib/cli/objectlistcommand.cpp b/lib/cli/objectlistcommand.cpp
index a186bfe16e816b4642110d457c7e3af00de9d178..e555d3c323c864864d7e8c3db74b2475922c6675 100644 (file)
--- a/lib/cli/objectlistcommand.cpp
+++ b/lib/cli/objectlistcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/objectlistcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include "base/convert.hpp"
 #include "base/dynamicobject.hpp"

diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp
index 9bbc4f2ad07a1ac2e00df585cfc8598ff2020ec0..cbd376151691b1c83beaadd8d5db6dcb73aa38bd 100644 (file)
--- a/lib/cli/objectlistcommand.hpp
+++ b/lib/cli/objectlistcommand.hpp
@@ -22,7 +22,7 @@
 
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 #include <ostream>
 
 namespace icinga

diff --git a/lib/cli/pkinewcacommand.cpp b/lib/cli/pkinewcacommand.cpp
index 86bb27f56faeb141180d2c727564b1d7a4be4a07..5aa4adda15a916e3c3117f136b4b1b9799430c09 100644 (file)
--- a/lib/cli/pkinewcacommand.cpp
+++ b/lib/cli/pkinewcacommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/pkinewcacommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
 #include "base/tlsutility.hpp"
 #include <fstream>

diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp
index 198ae6ef2cb383041e25d7835ed57072b6ab64a0..e1a3ff57cc80eb601bb5623f851f781dfd7f7d03 100644 (file)
--- a/lib/cli/pkinewcacommand.hpp
+++ b/lib/cli/pkinewcacommand.hpp
@@ -20,7 +20,7 @@
 #ifndef PKINEWCACOMMAND_H
 #define PKINEWCACOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/pkinewcertcommand.cpp b/lib/cli/pkinewcertcommand.cpp
index 530b27f105f6fe82cadd828a9e1887578974332e..43895b5a4ce64fe662f7b80acf5079d0afca1561 100644 (file)
--- a/lib/cli/pkinewcertcommand.cpp
+++ b/lib/cli/pkinewcertcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/pkinewcertcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/tlsutility.hpp"
 
 using namespace icinga;

diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp
index 78c0e389711b49a942962d8ab1322f384c16f320..770f19c5a61cf48009d98daa628d42037a539e24 100644 (file)
--- a/lib/cli/pkinewcertcommand.hpp
+++ b/lib/cli/pkinewcertcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef PKINEWCERTCOMMAND_H
 #define PKINEWCERTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/pkirequestcommand.cpp b/lib/cli/pkirequestcommand.cpp
index bfa4aa79dd33479cde7770023e85d7ad63cd0431..73fd17880d0b28562aa92a7d1cbd7c9d39c8ff7b 100644 (file)
--- a/lib/cli/pkirequestcommand.cpp
+++ b/lib/cli/pkirequestcommand.cpp
@@ -20,7 +20,6 @@
 #include "cli/pkirequestcommand.hpp"
 #include "remote/jsonrpc.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/tlsutility.hpp"
 #include "base/tlsstream.hpp"
 #include "base/tcpsocket.hpp"

diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp
index 018bea168c32b1b00fc5ec0ab847701e3d9be0c6..225237725d8b515ef3ce69b2af8f70e219e06eaa 100644 (file)
--- a/lib/cli/pkirequestcommand.hpp
+++ b/lib/cli/pkirequestcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef PKIREQUESTCOMMAND_H
 #define PKIREQUESTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/pkisigncsrcommand.cpp b/lib/cli/pkisigncsrcommand.cpp
index 41ff0ed338a08d1c2d96628db81a1016c2878b9f..0784cfe7ce2ee0fcae25bc9503f07aba4325e18d 100644 (file)
--- a/lib/cli/pkisigncsrcommand.cpp
+++ b/lib/cli/pkisigncsrcommand.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/pkisigncsrcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/tlsutility.hpp"
 #include "base/application.hpp"
 #include <fstream>

diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp
index 7c02330fa7be189bc2ccdefca626784bab2f6dcf..8a2789f12ccbbab502ceda8863a592f47034a65a 100644 (file)
--- a/lib/cli/pkisigncsrcommand.hpp
+++ b/lib/cli/pkisigncsrcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef PKISIGNCSRCOMMAND_H
 #define PKISIGNCSRCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/pkiticketcommand.cpp b/lib/cli/pkiticketcommand.cpp
index 7510ab287fd9354f77692eeb3a755630d7cfb5d0..e83623bd2a0923082fe7ae1bfbeb9429e00edf9a 100644 (file)
--- a/lib/cli/pkiticketcommand.cpp
+++ b/lib/cli/pkiticketcommand.cpp
@@ -20,7 +20,6 @@
 #include "cli/pkiticketcommand.hpp"
 #include "remote/jsonrpc.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/tlsutility.hpp"
 #include "base/tlsstream.hpp"
 #include "base/tcpsocket.hpp"

diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp
index 13dd54bc3f6c575aca6331607e4ba965d47be46a..d8009030a094ce3da29d2404fdc75f930fd9d075 100644 (file)
--- a/lib/cli/pkiticketcommand.hpp
+++ b/lib/cli/pkiticketcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef PKITICKETCOMMAND_H
 #define PKITICKETCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {

diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp
index 8c4eeeef8435500312ac3c0c9a98d4be9e00b508..8d0339e77e7f92c67c1a2b14850f893bf43fbfdc 100644 (file)
--- a/lib/cli/repositoryobjectcommand.cpp
+++ b/lib/cli/repositoryobjectcommand.cpp
@@ -19,9 +19,7 @@
 
 #include "cli/repositoryobjectcommand.hpp"
 #include "base/logger.hpp"
-#include "base/clicommand.hpp"
 #include "base/application.hpp"
-#include "base/tlsutility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <fstream>
 

diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index 43fd0d8a8b361ad4077850af8a3501e423aef788..cb16c676a36e72caa8da88b5b9804ddbb67d857e 100644 (file)
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOSITORYOBJECTCOMMAND_H
 #define REPOSITORYOBJECTCOMMAND_H
 
-#include "base/clicommand.hpp"
+#include "cli/clicommand.hpp"
 
 namespace icinga
 {