MXS-2014 Move maxscale/jansson.h to maxbase/jansson.h

include/maxscale/authenticator.h

@@ -20,8 +20,8 @@
 
 #include <maxscale/cdefs.h>
 
+#include <maxbase/jansson.h>
 #include <maxscale/buffer.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/config.h

@@ -23,8 +23,8 @@
 #include <sys/utsname.h>
 #include <time.h>
 
+#include <maxbase/jansson.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/jansson.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/query_classifier.h>
 

include/maxscale/filter.h

@@ -18,12 +18,12 @@
 
 #include <maxscale/cdefs.h>
 #include <stdint.h>
+#include <maxbase/jansson.h>
 #include <maxscale/buffer.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/routing.h>
 #include <maxscale/session.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/jansson.hh

@@ -18,9 +18,9 @@
 #include <sstream>
 #include <string>
 
+#include <maxbase/jansson.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
-#include <maxscale/jansson.h>
 #include <maxscale/utils.hh>
 
 namespace std

include/maxscale/json_api.h

@@ -19,7 +19,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/jansson.h>
+#include <maxbase/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/listener.h

@@ -17,9 +17,9 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxbase/jansson.h>
 #include <maxscale/protocol.h>
 #include <maxscale/ssl.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/log_manager.h

@@ -19,7 +19,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include <maxscale/jansson.h>
+#include <maxbase/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/modulecmd.h

@@ -23,13 +23,13 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxbase/jansson.h>
 #include <maxscale/dcb.h>
 #include <maxscale/filter.h>
 #include <maxscale/monitor.h>
 #include <maxscale/server.h>
 #include <maxscale/service.h>
 #include <maxscale/session.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/monitor.h

@@ -20,10 +20,10 @@
 
 #include <openssl/sha.h>
 
+#include <maxbase/jansson.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/server.h>
-#include <maxscale/jansson.h>
 #include <maxscale/protocol/mysql.h>
 
 MXS_BEGIN_DECLS

include/maxscale/protocol.h

@@ -18,9 +18,9 @@
  * The protocol module interface definition.
  */
 
+#include <maxbase/jansson.h>
 #include <maxscale/cdefs.h>
 #include <maxscale/buffer.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/query_classifier.h

@@ -13,8 +13,8 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxbase/jansson.h>
 #include <maxscale/buffer.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/router.h

@@ -20,11 +20,11 @@
 
 #include <stdint.h>
 
+#include <maxbase/jansson.h>
 #include <maxscale/buffer.h>
 #include <maxscale/routing.h>
 #include <maxscale/service.h>
 #include <maxscale/session.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/server.h

@@ -19,9 +19,9 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxbase/jansson.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/service.h

@@ -26,6 +26,7 @@
 #include <openssl/err.h>
 #include <openssl/dh.h>
 
+#include <maxbase/jansson.h>
 #include <maxscale/protocol.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
@@ -33,7 +34,6 @@
 #include <maxscale/listener.h>
 #include <maxscale/filter.h>
 #include <maxscale/config.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/session.h

@@ -21,11 +21,11 @@
 #include <time.h>
 
 #include <maxbase/atomic.h>
+#include <maxbase/jansson.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 

include/maxscale/users.h

@@ -17,10 +17,10 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxbase/jansson.h>
 #include <maxscale/dcb.h>
 #include <maxscale/listener.h>
 #include <maxscale/service.h>
-#include <maxscale/jansson.h>
 #include <openssl/sha.h>
 
 MXS_BEGIN_DECLS

maxutils/maxbase/include/maxbase/jansson.h

@@ -12,5 +12,5 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxbase/cdefs.h>
 #include <jansson.h>

server/core/internal/config.hh

@@ -20,8 +20,8 @@
 
 #include <sstream>
 
+#include <maxbase/jansson.h>
 #include <maxscale/ssl.h>
-#include <maxscale/jansson.h>
 
 #define DEFAULT_NBPOLLS             3      /**< Default number of non block polls before we block */
 #define DEFAULT_POLLSLEEP           1000   /**< Default poll wait time (milliseconds) */

server/core/service.cc

@@ -33,6 +33,7 @@
 #include <vector>
 #include <unordered_set>
 
+#include <maxbase/jansson.h>
 #include <maxscale/service.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
@@ -50,7 +51,6 @@
 #include <maxscale/utils.h>
 #include <maxscale/utils.hh>
 #include <maxscale/version.h>
-#include <maxscale/jansson.h>
 #include <maxscale/json_api.h>
 #include <maxscale/routingworker.h>
 

server/modules/filter/masking/maskingrules.hh

@@ -18,7 +18,7 @@
 #include <memory>
 #include <vector>
 
-#include <maxscale/jansson.h>
+#include <maxbase/jansson.h>
 #include <maxscale/pcre2.h>
 
 #include "mysql.hh"