MXS-3239 Rename clustrix* to xpand*

Typenames still Clustrix.

server/modules/monitor/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_subdirectory(auroramon)
-add_subdirectory(clustrixmon)
 add_subdirectory(csmon)
 add_subdirectory(galeramon)
 add_subdirectory(grmon)
 add_subdirectory(mariadbmon)
+add_subdirectory(xpandmon)

server/modules/monitor/clustrixmon/CMakeLists.txt

@@ -1,9 +0,0 @@
-add_library(clustrixmon SHARED
-  clustrix.cc
-  clustrixmon.cc
-  clustrixmonitor.cc
-  clustrixnode.cc
-  )
-target_link_libraries(clustrixmon maxscale-common)
-set_target_properties(clustrixmon PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
-install_module(clustrixmon core)

server/modules/monitor/xpandmon/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_library(xpandmon SHARED
+  xpand.cc
+  xpandmon.cc
+  xpandmonitor.cc
+  xpandnode.cc
+  )
+target_link_libraries(xpandmon maxscale-common)
+set_target_properties(xpandmon PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
+install_module(xpandmon core)

server/modules/monitor/xpandmon/xpand.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "clustrix.hh"
+#include "xpand.hh"
 #include <maxbase/assert.h>
 
 using maxscale::Monitor;

server/modules/monitor/xpandmon/xpand.hh

@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <string>
 #include <maxscale/monitor.hh>
 #include <maxscale/server.hh>

server/modules/monitor/xpandmon/xpandmembership.hh

@@ -12,11 +12,11 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "clustrix.hh"
+#include "xpand.hh"
 
 class ClustrixMembership
 {

server/modules/monitor/xpandmon/xpandmon.cc

@@ -11,10 +11,10 @@
  * Public License.
  */
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <maxscale/modinfo.h>
 #include <maxscale/modulecmd.hh>
-#include "clustrixmonitor.hh"
+#include "xpandmonitor.hh"
 
 namespace
 {

server/modules/monitor/xpandmon/xpandmon.hh

@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#define MXS_MODULE_NAME "clustrixmon"
+#define MXS_MODULE_NAME "xpandmon"
 
 #include <maxscale/ccdefs.hh>
 #include <maxbase/log.hh>

server/modules/monitor/xpandmon/xpandmonitor.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "clustrixmonitor.hh"
+#include "xpandmonitor.hh"
 #include <algorithm>
 #include <set>
 #include <maxbase/string.hh>

server/modules/monitor/xpandmon/xpandmonitor.hh

@@ -12,15 +12,15 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <map>
 #include <set>
 #include <sqlite3.h>
 #include <maxscale/config2.hh>
 #include <maxscale/monitor.hh>
 #include <maxbase/http.hh>
-#include "clustrixmembership.hh"
+#include "xpandmembership.hh"
-#include "clustrixnode.hh"
+#include "xpandnode.hh"
 
 class ClustrixMonitor : public maxscale::MonitorWorker
                       , private ClustrixNode::Persister

server/modules/monitor/xpandmon/xpandnode.cc

@@ -11,8 +11,8 @@
  * Public License.
  */
 
-#include "clustrixnode.hh"
+#include "xpandnode.hh"
-#include "clustrix.hh"
+#include "xpand.hh"
 
 bool ClustrixNode::can_be_used_as_hub(const char* zName,
                                       const mxs::MonitorServer::ConnectionSettings& settings,

server/modules/monitor/xpandmon/xpandnode.hh

@@ -12,12 +12,12 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "clustrix.hh"
+#include "xpand.hh"
-#include "clustrixmembership.hh"
+#include "xpandmembership.hh"
 
 class ClustrixNode
 {