Rename files, removing "gw"-prefix

Also gwdirs.h.in -> paths.h.in
2017-01-19 17:10:01 +02:00 · 2017-01-19 17:10:01 +02:00 · 6e38276a20
commit 6e38276a20
parent 568239d2b5
55 changed files with 58 additions and 58 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -117,7 +117,7 @@ endif()

 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/server/include)
 configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/version.h.in ${CMAKE_BINARY_DIR}/include/maxscale/version.h @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/gwdirs.h.in ${CMAKE_BINARY_DIR}/include/maxscale/gwdirs.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/paths.h.in ${CMAKE_BINARY_DIR}/include/maxscale/paths.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/adminusers.h.in ${CMAKE_BINARY_DIR}/include/maxscale/adminusers.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/include/maxscale/maxscale_test.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/etc/postinst.in ${CMAKE_BINARY_DIR}/postinst @ONLY)
@ -305,7 +305,7 @@ if(PACKAGE)
 endif()

 # NOTE: If you make changes here, ensure they are compatible with the
-#       situation in gwdirs.h.in.
+#       situation in paths.h.in.
 if (NOT PACKAGE)
  install(DIRECTORY DESTINATION var/cache/maxscale)
  install(DIRECTORY DESTINATION var/log/maxscale)
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@ -11,7 +11,7 @@ set(MAXSCALE_VARDIR /var CACHE PATH "Data file path (usually /var/)")
 set(MAXSCALE_CONFDIR /etc CACHE PATH "Configuration file installation path (/etc/)")

 # Default values for directories and subpaths where files are searched. These
-# are used in `server/include/gwdirs.h.in`.
+# are used in `include/maxscale/paths.h.in`.
 set(DEFAULT_PID_SUBPATH "run/maxscale" CACHE PATH "Default PID file subpath")
 set(DEFAULT_LOG_SUBPATH "log/maxscale" CACHE PATH "Default log subpath")
 set(DEFAULT_DATA_SUBPATH "lib/maxscale" CACHE PATH "Default datadir subpath")
--- a/include/maxscale/gw_authenticator.h
+++ b/include/maxscale/gw_authenticator.h
--- a/include/maxscale/gwbitmask.h
+++ b/include/maxscale/gwbitmask.h
--- a/include/maxscale/config.h
+++ b/include/maxscale/config.h
@ -32,7 +32,7 @@
 #include <limits.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/modinfo.h>

 MXS_BEGIN_DECLS
--- a/include/maxscale/dcb.h
+++ b/include/maxscale/dcb.h
@ -49,10 +49,10 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/buffer.h>
 #include <maxscale/protocol.h>
-#include <maxscale/gw_authenticator.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/authenticator.h>
+#include <maxscale/ssl.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <netinet/in.h>

 MXS_BEGIN_DECLS
--- a/include/maxscale/listener.h
+++ b/include/maxscale/listener.h
@ -28,7 +28,7 @@

 #include <maxscale/cdefs.h>
 #include <maxscale/protocol.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/hashtable.h>

 MXS_BEGIN_DECLS
--- a/include/maxscale/gwdirs.h.in
+++ b/include/maxscale/gwdirs.h.in
--- a/include/maxscale/poll.h
+++ b/include/maxscale/poll.h
@ -27,7 +27,7 @@

 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/resultset.h>
 #include <sys/epoll.h>

--- a/include/maxscale/gw_ssl.h
+++ b/include/maxscale/gw_ssl.h
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@ -64,7 +64,7 @@
 #define MYSQL_COM_INIT_DB     COM_INIT_DB
 #define MYSQL_COM_CHANGE_USER COM_CHANGE_USER
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/utils.h>

 #include <stdio.h>
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@ -17,7 +17,7 @@
 #include <string.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/utils.h>

 int main(int argc, char** argv)
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@ -20,7 +20,7 @@
 #include <maxscale/buffer.h>
 #include <mysql.h>
 #include <unistd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>

 char* append(char* types, const char* type_name, size_t* lenp)
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@ -23,7 +23,7 @@
 #define MYSQL_COM_QUIT        COM_QUIT
 #define MYSQL_COM_INIT_DB     COM_INIT_DB
 #define MYSQL_COM_CHANGE_USER COM_CHANGE_USER
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
--- a/query_classifier/test/crash_qc_sqlite.c
+++ b/query_classifier/test/crash_qc_sqlite.c
@ -13,7 +13,7 @@

 #include <stdio.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>

 #define MYSQL_HEADER_LEN 4
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@ -20,7 +20,7 @@
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <sys/stat.h>

 /**
--- a/server/core/authenticator.c
+++ b/server/core/authenticator.c
@ -11,7 +11,7 @@
 * Public License.
 */

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modutil.h>
 #include <maxscale/alloc.h>

--- a/server/core/config.c
+++ b/server/core/config.c
@ -62,7 +62,7 @@
 #include <maxscale/pcre2.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/utils.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>

 #include "maxscale/config.h"
 #include "maxscale/filter.h"
--- a/server/core/config_runtime.c
+++ b/server/core/config_runtime.c
@ -14,7 +14,7 @@
 #include <strings.h>
 #include <maxscale/atomic.h>
 #include <maxscale/config_runtime.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/spinlock.h>

 #include "maxscale/config.h"
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -55,7 +55,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/maxscale.h>
--- a/server/core/gwbitmask.c
+++ b/server/core/gwbitmask.c
@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/alloc.h>

 /**
--- a/server/core/gwdirs.c
+++ b/server/core/gwdirs.c
@ -11,7 +11,7 @@
 * Public License.
 */

-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>

--- a/server/core/listener.c
+++ b/server/core/listener.c
@ -32,8 +32,8 @@
 #include <string.h>
 #include <fcntl.h>
 #include <maxscale/listener.h>
-#include <maxscale/gwdirs.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/paths.h>
+#include <maxscale/ssl.h>
 #include <maxscale/protocol.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@ -41,7 +41,7 @@
 #include <curl/curl.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>

 #include "maxscale/modules.h"
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <maxscale/secrets.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>

 struct option options[] =
 {
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@ -23,7 +23,7 @@
 * @endverbatim
 */
 #include <stdio.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>

--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@ -36,7 +36,7 @@
 #include <maxscale/alloc.h>
 #include <mysqld_error.h>
 #include <maxscale/externcmd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/pcre2.h>
--- a/server/core/poll.c
+++ b/server/core/poll.c
@ -23,7 +23,7 @@
 #include <maxscale/poll.h>
 #include <maxscale/dcb.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/config.h>
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@ -16,7 +16,7 @@
 #include <maxscale/log_manager.h>
 #include <ctype.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/random_jkiss.h>
 #include <maxscale/alloc.h>

--- a/server/core/server.c
+++ b/server/core/server.c
@ -45,9 +45,9 @@
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>

 #include "maxscale/monitor.h"

--- a/server/core/service.c
+++ b/server/core/service.c
@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.h>
 #include <maxscale/log_manager.h>
--- a/server/core/test/testadminusers.c
+++ b/server/core/test/testadminusers.c
@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
--- a/server/core/test/testgwbitmask.c
+++ b/server/core/test/testgwbitmask.c
@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>

 #include <maxscale/debug.h>

--- a/server/core/test/testmodulecmd.c
+++ b/server/core/test/testmodulecmd.c
@ -17,7 +17,7 @@

 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/session.h>

--- a/server/core/test/testserver.c
+++ b/server/core/test/testserver.c
@ -36,7 +36,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/server.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>

 // This is pretty ugly but it's required to test internal functions
 #include "../config.c"
--- a/server/core/test/testservice.c
+++ b/server/core/test/testservice.c
@ -34,7 +34,7 @@
 #include <string.h>
 #include <maxscale/maxscale_test.h>
 #include "../maxscale/service.h"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include "test_utils.h"

--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <cdc.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modutil.h>
 #include <maxscale/users.h>
 #include <maxscale/utils.h>
--- a/server/modules/authenticator/HTTPAuth/http_auth.c
+++ b/server/modules/authenticator/HTTPAuth/http_auth.c
@ -26,7 +26,7 @@

 #define MXS_MODULE_NAME "HTTPAuth"

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
@ -28,7 +28,7 @@

 #define MXS_MODULE_NAME "MaxAdminAuth"

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.c
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.c
@ -29,11 +29,11 @@

 #include <mysql_auth.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include "dbusers.h"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>

--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
@ -31,7 +31,7 @@

 #define MXS_MODULE_NAME "MySQLBackendAuth"

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
@ -29,7 +29,7 @@

 #define MXS_MODULE_NAME "NullAuthAllow"

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
@ -29,7 +29,7 @@

 #define MXS_MODULE_NAME "NullAuthDeny"

-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
--- a/server/modules/filter/cache/cache.cc
+++ b/server/modules/filter/cache/cache.cc
@ -15,7 +15,7 @@
 #include "cache.hh"
 #include <new>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include "storagefactory.hh"
 #include "storage.hh"

--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefilter.hh"
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include "cachemt.hh"
 #include "cachept.hh"
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
@ -22,7 +22,7 @@
 #include <rocksdb/env.h>
 #include <rocksdb/statistics.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 #include "rocksdbinternals.hh"
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include <new>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include "cachefilter.h"
 #include "lrustoragest.hh"
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include "rules.h"
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include "storagefactory.hh"
--- a/server/modules/filter/masking/maskingfilter.cc
+++ b/server/modules/filter/masking/maskingfilter.cc
@ -13,7 +13,7 @@

 #define MXS_MODULE_NAME "masking"
 #include "maskingfilter.hh"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include "maskingrules.hh"

--- a/server/modules/filter/maxrows/maxrows.c
+++ b/server/modules/filter/maxrows/maxrows.c
@ -33,7 +33,7 @@
 #define MXS_MODULE_NAME "maxrows"
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@ -53,14 +53,14 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/poll.h>
 #include <maxscale/modinfo.h>
 #include <sys/stat.h>
 #include <maxscale/modutil.h>
 #include <netinet/tcp.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/session.h>

 static int process_init(void);
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@ -52,7 +52,7 @@
 #include <avro/errors.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modulecmd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>

 #ifndef BINLOG_NAMEFMT
 #define BINLOG_NAMEFMT      "%s.%06d"
--- a/server/modules/routing/binlogrouter/blr_file.c
+++ b/server/modules/routing/binlogrouter/blr_file.c
@ -67,7 +67,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 #include <inttypes.h>
--- a/server/modules/routing/binlogrouter/test/testbinlog.c
+++ b/server/modules/routing/binlogrouter/test/testbinlog.c
@ -38,7 +38,7 @@
 #include <maxscale/housekeeper.h>
 #include <time.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>

 #include <maxscale/protocol/mysql.h>