Move url handler to /lib/remote

fixes #9647

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 5d92176e4e4176c686cce03ce6227d23d709632e..900d3535be78883769fd8b6086fd068b5408a01e 100644 (file)
--- 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 5450ceee6af84b946bdc208edbdb32319486abcb..125054940d40a8874307104bc6df74dff44444d5 100644 (file)
--- 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 619818576bc9750a7cc925b441252e753f0745b6..b04dfd09cee6e33c993eef0c60bc9569fac13ef8 100644 (file)
--- 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 c491dd35a682f173f05ab429604fc038ef6be8b0..581de9befe3b631d70ce0f37cfb277d895d9ccc3 100644 (file)
--- 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 <boost/tokenizer.hpp>
 #include <boost/foreach.hpp>
 

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 a15aa096a973b98f32a7b2202175061cdd736aec..61cb5f6a611620d317a1368396df6da9cf0ad393 100644 (file)
--- 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 <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>