From b9a4a6424995209db7e4c85bcf4c00603221e0ea Mon Sep 17 00:00:00 2001 From: Jean-Marcel Flach Date: Thu, 16 Jul 2015 13:34:05 +0200 Subject: [PATCH] Move url handler to /lib/remote fixes #9647 --- lib/base/CMakeLists.txt | 2 +- lib/remote/CMakeLists.txt | 1 + lib/remote/httprequest.hpp | 2 +- lib/{base => remote}/url-characters.hpp | 0 lib/{base => remote}/url.cpp | 4 ++-- lib/{base => remote}/url.hpp | 0 test/base-url.cpp | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) rename lib/{base => remote}/url-characters.hpp (100%) rename lib/{base => remote}/url.cpp (99%) rename lib/{base => remote}/url.hpp (100%) diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt index 5d92176e4..900d3535b 100644 --- a/lib/base/CMakeLists.txt +++ b/lib/base/CMakeLists.txt @@ -31,7 +31,7 @@ set(base_SOURCES scriptutils.cpp serializer.cpp socket.cpp socketevents.cpp stacktrace.cpp statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp string.cpp string-script.cpp sysloglogger.cpp sysloglogger.thpp tcpsocket.cpp thinmutex.cpp threadpool.cpp timer.cpp - tlsstream.cpp tlsutility.cpp type.cpp unixsocket.cpp url.cpp utility.cpp value.cpp + tlsstream.cpp tlsutility.cpp type.cpp unixsocket.cpp utility.cpp value.cpp value-operators.cpp workqueue.cpp ) diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt index 5450ceee6..125054940 100644 --- a/lib/remote/CMakeLists.txt +++ b/lib/remote/CMakeLists.txt @@ -26,6 +26,7 @@ set(remote_SOURCES httpchunkedencoding.cpp httpconnection.cpp httpdemohandler.cpp httphandler.cpp httprequest.cpp httpresponse.cpp jsonrpc.cpp jsonrpcconnection.cpp jsonrpcconnection-heartbeat.cpp messageorigin.cpp zone.cpp zone.thpp + url.cpp ) if(ICINGA2_UNITY_BUILD) diff --git a/lib/remote/httprequest.hpp b/lib/remote/httprequest.hpp index 619818576..b04dfd09c 100644 --- a/lib/remote/httprequest.hpp +++ b/lib/remote/httprequest.hpp @@ -22,10 +22,10 @@ #include "remote/i2-remote.hpp" #include "remote/httpchunkedencoding.hpp" +#include "remote/url.hpp" #include "base/stream.hpp" #include "base/fifo.hpp" #include "base/dictionary.hpp" -#include "base/url.hpp" namespace icinga { diff --git a/lib/base/url-characters.hpp b/lib/remote/url-characters.hpp similarity index 100% rename from lib/base/url-characters.hpp rename to lib/remote/url-characters.hpp diff --git a/lib/base/url.cpp b/lib/remote/url.cpp similarity index 99% rename from lib/base/url.cpp rename to lib/remote/url.cpp index c491dd35a..581de9bef 100644 --- a/lib/base/url.cpp +++ b/lib/remote/url.cpp @@ -17,11 +17,11 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "base/url.hpp" -#include "base/url-characters.hpp" #include "base/array.hpp" #include "base/utility.hpp" #include "base/objectlock.hpp" +#include "remote/url.hpp" +#include "remote/url-characters.hpp" #include #include diff --git a/lib/base/url.hpp b/lib/remote/url.hpp similarity index 100% rename from lib/base/url.hpp rename to lib/remote/url.hpp diff --git a/test/base-url.cpp b/test/base-url.cpp index a15aa096a..61cb5f6a6 100644 --- a/test/base-url.cpp +++ b/test/base-url.cpp @@ -17,8 +17,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "base/url.hpp" #include "base/array.hpp" +#include "remote/url.hpp" #include #include -- 2.40.0