diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config deleted file mode 100644 index 7b1f06cca..000000000 --- a/apps/emqx/rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, []}. \ No newline at end of file diff --git a/apps/emqx_auth_http/src/emqx_acl_http.erl b/apps/emqx_auth_http/src/emqx_acl_http.erl index 621b20b0d..ebe415937 100644 --- a/apps/emqx_auth_http/src/emqx_acl_http.erl +++ b/apps/emqx_auth_http/src/emqx_acl_http.erl @@ -18,8 +18,8 @@ -include("emqx_auth_http.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ACL http]"). diff --git a/apps/emqx_auth_http/src/emqx_auth_http.app.src b/apps/emqx_auth_http/src/emqx_auth_http.app.src index 7616337ac..2fc5404c5 100644 --- a/apps/emqx_auth_http/src/emqx_auth_http.app.src +++ b/apps/emqx_auth_http/src/emqx_auth_http.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_http_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_auth_http_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_http/src/emqx_auth_http.erl b/apps/emqx_auth_http/src/emqx_auth_http.erl index 02afa7f2c..54e41c989 100644 --- a/apps/emqx_auth_http/src/emqx_auth_http.erl +++ b/apps/emqx_auth_http/src/emqx_auth_http.erl @@ -18,9 +18,9 @@ -include("emqx_auth_http.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/types.hrl"). -logger_header("[Auth http]"). diff --git a/apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl b/apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl index e0984b134..25ff942c5 100644 --- a/apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl +++ b/apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl @@ -17,7 +17,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src index fe4045431..455cb2b19 100644 --- a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src +++ b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_jwt_sup]}, - {applications, [kernel,stdlib,jwerl,emqx_libs]}, + {applications, [kernel,stdlib,jwerl,emqx]}, {mod, {emqx_auth_jwt_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_jwt/src/emqx_auth_jwt.erl b/apps/emqx_auth_jwt/src/emqx_auth_jwt.erl index 551f5c6b4..a00bc2577 100644 --- a/apps/emqx_auth_jwt/src/emqx_auth_jwt.erl +++ b/apps/emqx_auth_jwt/src/emqx_auth_jwt.erl @@ -16,8 +16,8 @@ -module(emqx_auth_jwt). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[JWT]"). diff --git a/apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl b/apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl index dcb1f2758..190c3db14 100644 --- a/apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl +++ b/apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl @@ -19,7 +19,7 @@ -compile(nowarn_export_all). -compile(export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_auth_ldap/src/emqx_acl_ldap.erl b/apps/emqx_auth_ldap/src/emqx_acl_ldap.erl index e117940b1..cfd51164a 100644 --- a/apps/emqx_auth_ldap/src/emqx_acl_ldap.erl +++ b/apps/emqx_auth_ldap/src/emqx_acl_ldap.erl @@ -18,9 +18,9 @@ -include("emqx_auth_ldap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eldap/include/eldap.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ register_metrics/0 , check_acl/5 diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src index 200b086ee..3d77a9244 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src @@ -2,8 +2,8 @@ [{description, "EMQ X Authentication/ACL with LDAP"}, {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, - {registered, [emqx_auth_ldap_sup,emqx_libs]}, - {applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd,emqx_libs]}, + {registered, [emqx_auth_ldap_sup]}, + {applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd]}, {mod, {emqx_auth_ldap_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap.erl b/apps/emqx_auth_ldap/src/emqx_auth_ldap.erl index b3d6251fb..01cbb0ecb 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap.erl +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap.erl @@ -18,9 +18,9 @@ -include("emqx_auth_ldap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eldap/include/eldap.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(proplists, [get_value/2]). diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl b/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl index 8ec22848e..2f6e8099c 100644 --- a/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl +++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl @@ -20,8 +20,8 @@ -include("emqx_auth_ldap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). %% ecpool callback -export([connect/1]). diff --git a/apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl b/apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl index 4d92b9b80..513ad79e1 100644 --- a/apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl +++ b/apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl b/apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl index a9afbae45..76f049cbc 100644 --- a/apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl +++ b/apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(no_warning_export). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl index 1eb3e752d..020a94542 100644 --- a/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl +++ b/apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl @@ -17,7 +17,7 @@ -module(emqx_acl_mnesia_cli). -include("emqx_auth_mnesia.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). -define(TABLE, emqx_acl). diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src index f51395f2c..49a330fd6 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually {modules, []}, {registered, []}, - {applications, [kernel,stdlib,mnesia]}, + {applications, [kernel,stdlib,mnesia,emqx]}, {mod, {emqx_auth_mnesia_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl index f0e78ae36..bb413b6d9 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl @@ -18,9 +18,9 @@ -include("emqx_auth_mnesia.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/types.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl index 35034918c..b937eb238 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl @@ -17,7 +17,7 @@ -module(emqx_auth_mnesia_cli). -include("emqx_auth_mnesia.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). -define(TABLE, emqx_user). %% Auth APIs diff --git a/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl b/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl index 1982b13d6..c0ff5f8ac 100644 --- a/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl +++ b/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl @@ -17,8 +17,8 @@ -module(emqx_acl_mongo). -include("emqx_auth_mongo.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). %% ACL callbacks -export([ register_metrics/0 diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src b/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src index d62771f1d..b324ce7dc 100644 --- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src +++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_mongo_sup]}, - {applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd,emqx_libs]}, + {applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd]}, {mod, {emqx_auth_mongo_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl b/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl index e0a5bb4ed..4880e6fb9 100644 --- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl +++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl @@ -19,9 +19,9 @@ -behaviour(ecpool_worker). -include("emqx_auth_mongo.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/types.hrl"). -export([ register_metrics/0 , check/3 diff --git a/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl b/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl index 077dde7bd..4e76026ec 100644 --- a/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl +++ b/apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx_auth_mysql/src/emqx_acl_mysql.erl b/apps/emqx_auth_mysql/src/emqx_acl_mysql.erl index 8af659719..174e3cd27 100644 --- a/apps/emqx_auth_mysql/src/emqx_acl_mysql.erl +++ b/apps/emqx_auth_mysql/src/emqx_acl_mysql.erl @@ -18,8 +18,8 @@ -include("emqx_auth_mysql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). %% ACL Callbacks -export([ register_metrics/0 diff --git a/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src b/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src index b836723ef..7a62655e2 100644 --- a/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src +++ b/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_mysql_sup]}, - {applications, [kernel,stdlib,mysql,ecpool,emqx_passwd,emqx_libs]}, + {applications, [kernel,stdlib,mysql,ecpool,emqx_passwd]}, {mod, {emqx_auth_mysql_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_mysql/src/emqx_auth_mysql.erl b/apps/emqx_auth_mysql/src/emqx_auth_mysql.erl index aa2e31ed8..9cd9d5a25 100644 --- a/apps/emqx_auth_mysql/src/emqx_auth_mysql.erl +++ b/apps/emqx_auth_mysql/src/emqx_auth_mysql.erl @@ -18,9 +18,9 @@ -include("emqx_auth_mysql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/types.hrl"). -export([ register_metrics/0 , check/3 diff --git a/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl b/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl index 2868e83cc..c3ee3b02a 100644 --- a/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl +++ b/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl @@ -19,8 +19,8 @@ -behaviour(ecpool_worker). -include("emqx_auth_mysql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ parse_query/1 , connect/1 diff --git a/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl b/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl index 0d4c16e03..044655ac1 100644 --- a/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl +++ b/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl @@ -21,7 +21,7 @@ -define(APP, emqx_auth_mysql). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl b/apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl index fcad696e2..c1792f1e2 100644 --- a/apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl +++ b/apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl @@ -17,8 +17,8 @@ -module(emqx_acl_pgsql). -include("emqx_auth_pgsql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). %% ACL callbacks -export([ register_metrics/0 diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src index a2af025e9..a245f7df9 100644 --- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src +++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_pgsql_sup]}, - {applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd,emqx_libs]}, + {applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd]}, {mod, {emqx_auth_pgsql_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl index ad1973737..2dee5ef50 100644 --- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl +++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl @@ -18,8 +18,8 @@ -include("emqx_auth_pgsql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ register_metrics/0 , check/3 diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl index a748140ad..27d25f35b 100644 --- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl +++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl @@ -20,8 +20,8 @@ -include("emqx_auth_pgsql.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([connect/1]). -export([parse_query/2]). diff --git a/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl b/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl index 8c3b53621..e4aefdcd3 100644 --- a/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl +++ b/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl @@ -22,7 +22,7 @@ -define(APP, emqx_auth_pgsql). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx_auth_redis/src/emqx_acl_redis.erl b/apps/emqx_auth_redis/src/emqx_acl_redis.erl index efaccb461..096523487 100644 --- a/apps/emqx_auth_redis/src/emqx_acl_redis.erl +++ b/apps/emqx_auth_redis/src/emqx_acl_redis.erl @@ -18,8 +18,8 @@ -include("emqx_auth_redis.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ register_metrics/0 , check_acl/5 diff --git a/apps/emqx_auth_redis/src/emqx_auth_redis.app.src b/apps/emqx_auth_redis/src/emqx_auth_redis.app.src index 5ff33f94d..993bb77cd 100644 --- a/apps/emqx_auth_redis/src/emqx_auth_redis.app.src +++ b/apps/emqx_auth_redis/src/emqx_auth_redis.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_auth_redis_sup]}, - {applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd,emqx_libs]}, + {applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd]}, {mod, {emqx_auth_redis_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_auth_redis/src/emqx_auth_redis.erl b/apps/emqx_auth_redis/src/emqx_auth_redis.erl index 1b4b6046f..65f4d9735 100644 --- a/apps/emqx_auth_redis/src/emqx_auth_redis.erl +++ b/apps/emqx_auth_redis/src/emqx_auth_redis.erl @@ -18,8 +18,8 @@ -include("emqx_auth_redis.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ register_metrics/0 , check/3 diff --git a/apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl b/apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl index c1eb2a1bc..c6d5dea69 100644 --- a/apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl +++ b/apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl @@ -20,8 +20,8 @@ -include("emqx_auth_redis.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(proplists, [get_value/2, get_value/3]). diff --git a/apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl b/apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl index 3b827e74d..427806f4e 100644 --- a/apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl +++ b/apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl @@ -18,7 +18,7 @@ -compile(export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl index fedc2ceb2..5086ca574 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl @@ -30,7 +30,7 @@ -type(topic() :: emqx_topic:topic()). -type(qos() :: emqx_mqtt_types:qos()). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[Bridge Connect]"). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src index fe3beec52..df7d47571 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,replayq,emqtt,emqx_libs]}, + {applications, [kernel,stdlib,replayq,emqtt,emqx]}, {mod, {emqx_bridge_mqtt_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl index 52762990c..c189a2ea2 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl @@ -31,8 +31,8 @@ , ensure_unsubscribed/2 ]). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -define(ACK_REF(ClientPid, PktId), {ClientPid, PktId}). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl index bba790bbc..ca3bba095 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl @@ -18,8 +18,8 @@ -module(emqx_bridge_mqtt_actions). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(emqx_rule_utils, [str/1]). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl index e549b43ce..92d8e4083 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl @@ -18,7 +18,7 @@ -behaviour(supervisor). -include("emqx_bridge_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[Bridge]"). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl index dca69d3df..20600282e 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl @@ -27,7 +27,7 @@ -export_type([msg/0]). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("emqx_bridge_mqtt/include/emqx_bridge_mqtt.hrl"). -include_lib("emqtt/include/emqtt.hrl"). diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl index 57bd04d25..2078fe41a 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl @@ -110,8 +110,8 @@ -type ack_ref() :: term(). -type topic() :: emqx_topic:topic(). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -logger_header("[Bridge]"). diff --git a/apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl b/apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl index 37db49e95..392fa8e17 100644 --- a/apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl +++ b/apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl @@ -17,7 +17,7 @@ -module(emqx_bridge_mqtt_tests). -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). send_and_ack_test() -> %% delegate from gen_rpc to rpc for unit test diff --git a/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl b/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl index 3a2c541e7..7cbf0987c 100644 --- a/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl +++ b/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl @@ -25,8 +25,8 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). -define(wait(For, Timeout), emqx_ct_helpers:wait_for(?FUNCTION_NAME, ?LINE, fun() -> For end, Timeout)). diff --git a/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl b/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl index 1bf55d99d..1d2ed1b82 100644 --- a/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl +++ b/apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl @@ -18,8 +18,8 @@ -behaviour(emqx_bridge_connect). -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -define(BRIDGE_NAME, test). -define(BRIDGE_REG_NAME, emqx_bridge_worker_test). diff --git a/apps/emqx_coap/src/emqx_coap.app.src b/apps/emqx_coap/src/emqx_coap.app.src index 55be3567f..1ba1789d7 100644 --- a/apps/emqx_coap/src/emqx_coap.app.src +++ b/apps/emqx_coap/src/emqx_coap.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,gen_coap,emqx_libs]}, + {applications, [kernel,stdlib,gen_coap,emqx]}, {mod, {emqx_coap_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl b/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl index 6580f8677..4c508c272 100644 --- a/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl +++ b/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl @@ -20,10 +20,10 @@ -include("emqx_coap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -logger_header("[CoAP-Adpter]"). diff --git a/apps/emqx_coap/src/emqx_coap_ps_resource.erl b/apps/emqx_coap/src/emqx_coap_ps_resource.erl index 781477ac2..09d291bf5 100644 --- a/apps/emqx_coap/src/emqx_coap_ps_resource.erl +++ b/apps/emqx_coap/src/emqx_coap_ps_resource.erl @@ -20,9 +20,9 @@ -include("emqx_coap.hrl"). -include_lib("gen_coap/include/coap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[CoAP-PS-RES]"). diff --git a/apps/emqx_coap/src/emqx_coap_ps_topics.erl b/apps/emqx_coap/src/emqx_coap_ps_topics.erl index ebe9c3b28..30e9d2623 100644 --- a/apps/emqx_coap/src/emqx_coap_ps_topics.erl +++ b/apps/emqx_coap/src/emqx_coap_ps_topics.erl @@ -19,9 +19,9 @@ -behaviour(gen_server). -include("emqx_coap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[CoAP-PS-TOPICS]"). diff --git a/apps/emqx_coap/src/emqx_coap_registry.erl b/apps/emqx_coap/src/emqx_coap_registry.erl index 428dcf2a5..369bf2787 100644 --- a/apps/emqx_coap/src/emqx_coap_registry.erl +++ b/apps/emqx_coap/src/emqx_coap_registry.erl @@ -19,7 +19,7 @@ -author("Feng Lee "). -include("emqx_coap.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[CoAP-Registry]"). diff --git a/apps/emqx_coap/src/emqx_coap_resource.erl b/apps/emqx_coap/src/emqx_coap_resource.erl index fab7f2c20..e11788a04 100644 --- a/apps/emqx_coap/src/emqx_coap_resource.erl +++ b/apps/emqx_coap/src/emqx_coap_resource.erl @@ -19,9 +19,9 @@ -behaviour(coap_resource). -include("emqx_coap.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("gen_coap/include/coap.hrl"). -logger_header("[CoAP-RES]"). diff --git a/apps/emqx_coap/test/emqx_coap_SUITE.erl b/apps/emqx_coap/test/emqx_coap_SUITE.erl index 33f74c39a..866e2e203 100644 --- a/apps/emqx_coap/test/emqx_coap_SUITE.erl +++ b/apps/emqx_coap/test/emqx_coap_SUITE.erl @@ -21,7 +21,7 @@ -include_lib("gen_coap/include/coap.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -define(LOGT(Format, Args), ct:pal(Format, Args)). diff --git a/apps/emqx_coap/test/emqx_coap_ps_SUITE.erl b/apps/emqx_coap/test/emqx_coap_ps_SUITE.erl index 930a027d8..0a1cc3860 100644 --- a/apps/emqx_coap/test/emqx_coap_ps_SUITE.erl +++ b/apps/emqx_coap/test/emqx_coap_ps_SUITE.erl @@ -21,7 +21,7 @@ -include_lib("gen_coap/include/coap.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -define(LOGT(Format, Args), ct:pal(Format, Args)). diff --git a/apps/emqx_dashboard/src/emqx_dashboard.app.src b/apps/emqx_dashboard/src/emqx_dashboard.app.src index 48769a76b..17559eba1 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.app.src +++ b/apps/emqx_dashboard/src/emqx_dashboard.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_dashboard_sup]}, - {applications, [kernel,stdlib,mnesia,minirest,emqx_libs]}, + {applications, [kernel,stdlib,mnesia,minirest,emqx]}, {mod, {emqx_dashboard_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl index 4e10a5005..292f2c453 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard.erl @@ -16,8 +16,8 @@ -module(emqx_dashboard). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(proplists, [get_value/3]). diff --git a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl index 980701c84..cd3dfed0c 100644 --- a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl +++ b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl @@ -26,7 +26,7 @@ -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -define(CONTENT_TYPE, "application/x-www-form-urlencoded"). diff --git a/apps/emqx_exhook/src/emqx_exhook.app.src b/apps/emqx_exhook/src/emqx_exhook.app.src index 54c2b79a3..faeea8036 100644 --- a/apps/emqx_exhook/src/emqx_exhook.app.src +++ b/apps/emqx_exhook/src/emqx_exhook.app.src @@ -4,7 +4,7 @@ {modules, []}, {registered, []}, {mod, {emqx_exhook_app, []}}, - {applications, [kernel,stdlib,emqx_libs,grpcbox]}, + {applications, [kernel,stdlib,emqx]}, {env,[]}, {licenses, ["Apache-2.0"]}, {maintainers, ["EMQ X Team "]}, diff --git a/apps/emqx_exhook/src/emqx_exhook.erl b/apps/emqx_exhook/src/emqx_exhook.erl index c9fe6a993..c464f31b5 100644 --- a/apps/emqx_exhook/src/emqx_exhook.erl +++ b/apps/emqx_exhook/src/emqx_exhook.erl @@ -17,7 +17,7 @@ -module(emqx_exhook). -include("emqx_exhook.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExHook]"). diff --git a/apps/emqx_exhook/src/emqx_exhook_handler.erl b/apps/emqx_exhook/src/emqx_exhook_handler.erl index 272f3f08f..3a35073ca 100644 --- a/apps/emqx_exhook/src/emqx_exhook_handler.erl +++ b/apps/emqx_exhook/src/emqx_exhook_handler.erl @@ -17,8 +17,8 @@ -module(emqx_exhook_handler). -include("emqx_exhook.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExHook]"). diff --git a/apps/emqx_exhook/src/emqx_exhook_server.erl b/apps/emqx_exhook/src/emqx_exhook_server.erl index 21bc46889..365edf533 100644 --- a/apps/emqx_exhook/src/emqx_exhook_server.erl +++ b/apps/emqx_exhook/src/emqx_exhook_server.erl @@ -16,7 +16,7 @@ -module(emqx_exhook_server). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExHook Svr]"). diff --git a/apps/emqx_exproto/src/emqx_exproto.app.src b/apps/emqx_exproto/src/emqx_exproto.app.src index 003e0ba03..6ac404f47 100644 --- a/apps/emqx_exproto/src/emqx_exproto.app.src +++ b/apps/emqx_exproto/src/emqx_exproto.app.src @@ -4,7 +4,7 @@ {modules, []}, {registered, []}, {mod, {emqx_exproto_app, []}}, - {applications, [kernel,stdlib,grpcbox]}, + {applications, [kernel,stdlib]}, {env,[]}, {licenses, ["Apache-2.0"]}, {maintainers, ["EMQ X Team "]}, diff --git a/apps/emqx_exproto/src/emqx_exproto_channel.erl b/apps/emqx_exproto/src/emqx_exproto_channel.erl index ee76cfd93..9786c12c2 100644 --- a/apps/emqx_exproto/src/emqx_exproto_channel.erl +++ b/apps/emqx_exproto/src/emqx_exproto_channel.erl @@ -17,10 +17,10 @@ -module(emqx_exproto_channel). -include("emqx_exproto.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/types.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExProto Channel]"). diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl index 6b3b83ba8..d3ce75f0b 100644 --- a/apps/emqx_exproto/src/emqx_exproto_conn.erl +++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl @@ -17,8 +17,8 @@ %% TCP/TLS/UDP/DTLS Connection -module(emqx_exproto_conn). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/types.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExProto Conn]"). diff --git a/apps/emqx_exproto/src/emqx_exproto_gcli.erl b/apps/emqx_exproto/src/emqx_exproto_gcli.erl index b4e654bd5..41af21fb8 100644 --- a/apps/emqx_exproto/src/emqx_exproto_gcli.erl +++ b/apps/emqx_exproto/src/emqx_exproto_gcli.erl @@ -19,7 +19,7 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExProto gClient]"). diff --git a/apps/emqx_exproto/src/emqx_exproto_gsvr.erl b/apps/emqx_exproto/src/emqx_exproto_gsvr.erl index 0c0dc3a25..4b5fbd076 100644 --- a/apps/emqx_exproto/src/emqx_exproto_gsvr.erl +++ b/apps/emqx_exproto/src/emqx_exproto_gsvr.erl @@ -20,7 +20,7 @@ -behavior(emqx_exproto_v_1_connection_adapter_bhvr). -include("emqx_exproto.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[ExProto gServer]"). diff --git a/apps/emqx_exproto/test/emqx_exproto_SUITE.erl b/apps/emqx_exproto/test/emqx_exproto_SUITE.erl index a5309b305..dc6a25c06 100644 --- a/apps/emqx_exproto/test/emqx_exproto_SUITE.erl +++ b/apps/emqx_exproto/test/emqx_exproto_SUITE.erl @@ -31,8 +31,8 @@ , frame_disconnect/0 ]). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -define(TCPOPTS, [binary, {active, false}]). -define(DTLSOPTS, [binary, {active, false}, {protocol, dtls}]). diff --git a/apps/emqx_libs/.gitignore b/apps/emqx_libs/.gitignore deleted file mode 100644 index f1c455451..000000000 --- a/apps/emqx_libs/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -.rebar3 -_* -.eunit -*.o -*.beam -*.plt -*.swp -*.swo -.erlang.cookie -ebin -log -erl_crash.dump -.rebar -logs -_build -.idea -*.iml -rebar3.crashdump -*~ diff --git a/apps/emqx_libs/README.md b/apps/emqx_libs/README.md deleted file mode 100644 index 5ad8bad88..000000000 --- a/apps/emqx_libs/README.md +++ /dev/null @@ -1,9 +0,0 @@ -emqx_libs -===== - -Common libs for emqx - -Build ------ - - $ rebar3 compile diff --git a/apps/emqx_libs/rebar.config b/apps/emqx_libs/rebar.config deleted file mode 100644 index f618f3e40..000000000 --- a/apps/emqx_libs/rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{erl_opts, [debug_info]}. -{deps, []}. \ No newline at end of file diff --git a/apps/emqx_libs/src/emqx_libs.app.src b/apps/emqx_libs/src/emqx_libs.app.src deleted file mode 100644 index a573ad591..000000000 --- a/apps/emqx_libs/src/emqx_libs.app.src +++ /dev/null @@ -1,14 +0,0 @@ -{application, emqx_libs, - [{description, "EMQ X library"}, - {vsn, "5.0"}, - {registered, []}, - {applications, - [kernel, - stdlib - ]}, - {env,[]}, - {modules, []}, - {licenses, ["Apache 2.0"]}, - {maintainers, ["EMQ X Team "]}, - {links, []} - ]}. diff --git a/apps/emqx_libs/src/emqx_libs.erl b/apps/emqx_libs/src/emqx_libs.erl deleted file mode 100644 index 96ab91dc6..000000000 --- a/apps/emqx_libs/src/emqx_libs.erl +++ /dev/null @@ -1,3 +0,0 @@ --module(emqx_libs). - --export([]). diff --git a/apps/emqx_lua_hook/src/emqx_lua_hook.app.src b/apps/emqx_lua_hook/src/emqx_lua_hook.app.src index befe8df8f..06a19095c 100644 --- a/apps/emqx_lua_hook/src/emqx_lua_hook.app.src +++ b/apps/emqx_lua_hook/src/emqx_lua_hook.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_lua_hook_app,[]}}, {env,[]}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_lua_hook/src/emqx_lua_script.erl b/apps/emqx_lua_hook/src/emqx_lua_script.erl index aa3d2d38b..9b86be247 100644 --- a/apps/emqx_lua_hook/src/emqx_lua_script.erl +++ b/apps/emqx_lua_hook/src/emqx_lua_script.erl @@ -17,8 +17,8 @@ -module(emqx_lua_script). -include("emqx_lua_hook.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -export([ register_on_message_publish/2 , register_on_client_connected/2 diff --git a/apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl b/apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl index 8c52ca0b8..c47083ae0 100644 --- a/apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl +++ b/apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src index faf75e978..93ce4d75c 100644 --- a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src +++ b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src @@ -3,5 +3,5 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules,[]}, {registered,[emqx_lwm2m_sup]}, - {applications,[kernel,stdlib,lwm2m_coap,emqx_libs]}, + {applications,[kernel,stdlib,lwm2m_coap,emqx]}, {mod,{emqx_lwm2m_app,[]}}]}. diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl b/apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl index 16c0494b3..b1bb8e9eb 100644 --- a/apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl +++ b/apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl @@ -16,9 +16,9 @@ -module(emqx_lwm2m_coap_resource). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("lwm2m_coap/include/coap.hrl"). diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl b/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl index 5d5cecf31..a1cbddee0 100644 --- a/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl +++ b/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl @@ -18,9 +18,9 @@ -include("emqx_lwm2m.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). %% API. -export([ send_ul_data/3 diff --git a/apps/emqx_lwm2m/test/test_mqtt_broker.erl b/apps/emqx_lwm2m/test/test_mqtt_broker.erl index 341985712..96aa33686 100644 --- a/apps/emqx_lwm2m/test/test_mqtt_broker.erl +++ b/apps/emqx_lwm2m/test/test_mqtt_broker.erl @@ -22,9 +22,9 @@ -record(state, {subscriber}). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src index 7e3a62793..63cf734e1 100644 --- a/apps/emqx_management/src/emqx_management.app.src +++ b/apps/emqx_management/src/emqx_management.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_management_sup]}, - {applications, [kernel,stdlib,minirest,emqx_libs]}, + {applications, [kernel,stdlib,minirest,emqx]}, {mod, {emqx_mgmt_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_management/src/emqx_mgmt.erl b/apps/emqx_management/src/emqx_mgmt.erl index 3bf33f3b9..36d4b8e73 100644 --- a/apps/emqx_management/src/emqx_mgmt.erl +++ b/apps/emqx_management/src/emqx_mgmt.erl @@ -19,8 +19,8 @@ -include("emqx_mgmt.hrl"). -include_lib("stdlib/include/qlc.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -import(proplists, [get_value/2]). diff --git a/apps/emqx_management/src/emqx_mgmt_api_alarms.erl b/apps/emqx_management/src/emqx_mgmt_api_alarms.erl index dac191e02..db4e518d3 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_alarms.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_alarms.erl @@ -18,7 +18,7 @@ -include("emqx_mgmt.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -rest_api(#{name => list_all_alarms, method => 'GET', diff --git a/apps/emqx_management/src/emqx_mgmt_api_banned.erl b/apps/emqx_management/src/emqx_mgmt_api_banned.erl index cf00d7d38..0e6439163 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_banned.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_banned.erl @@ -16,7 +16,7 @@ -module(emqx_mgmt_api_banned). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include("emqx_mgmt.hrl"). diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl index bb87b00bd..db0884383 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl @@ -18,8 +18,8 @@ -include("emqx_mgmt.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). -import(minirest, [ return/0 , return/1 diff --git a/apps/emqx_management/src/emqx_mgmt_api_data.erl b/apps/emqx_management/src/emqx_mgmt_api_data.erl index 501d6ccf4..6fc44add0 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_data.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_data.erl @@ -16,7 +16,7 @@ -module(emqx_mgmt_api_data). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("kernel/include/file.hrl"). diff --git a/apps/emqx_management/src/emqx_mgmt_api_plugins.erl b/apps/emqx_management/src/emqx_mgmt_api_plugins.erl index e6bb2dad5..991dffad9 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_plugins.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_plugins.erl @@ -18,7 +18,7 @@ -include("emqx_mgmt.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -import(minirest, [return/1]). diff --git a/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl b/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl index 3cab9ddc9..956f2a45f 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl @@ -16,8 +16,8 @@ -module(emqx_mgmt_api_pubsub). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include("emqx_mgmt.hrl"). -import(proplists, [ get_value/2 diff --git a/apps/emqx_management/src/emqx_mgmt_api_routes.erl b/apps/emqx_management/src/emqx_mgmt_api_routes.erl index 549989dfa..3a58a26a2 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_routes.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_routes.erl @@ -16,7 +16,7 @@ -module(emqx_mgmt_api_routes). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -import(minirest, [return/1]). diff --git a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl index 9f2546f26..51f7a6dec 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl @@ -16,7 +16,7 @@ -module(emqx_mgmt_api_subscriptions). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -import(minirest, [return/1]). diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl index 649282b73..ae9b16459 100644 --- a/apps/emqx_management/src/emqx_mgmt_cli.erl +++ b/apps/emqx_management/src/emqx_mgmt_cli.erl @@ -16,8 +16,8 @@ -module(emqx_mgmt_cli). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include("emqx_mgmt.hrl"). diff --git a/apps/emqx_management/src/emqx_mgmt_http.erl b/apps/emqx_management/src/emqx_mgmt_http.erl index 15aeb8bf5..3d91a26ad 100644 --- a/apps/emqx_management/src/emqx_mgmt_http.erl +++ b/apps/emqx_management/src/emqx_mgmt_http.erl @@ -25,7 +25,7 @@ -export([init/2]). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -define(APP, emqx_management). -define(EXCEPT_PLUGIN, [emqx_dashboard]). diff --git a/apps/emqx_management/test/emqx_mgmt_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_SUITE.erl index 2e6b6443e..c987d8ca2 100644 --- a/apps/emqx_management/test/emqx_mgmt_SUITE.erl +++ b/apps/emqx_management/test/emqx_mgmt_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl index 2098143e6..2b39b95cb 100644 --- a/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl +++ b/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl @@ -21,8 +21,8 @@ -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include("emqx_mgmt.hrl"). diff --git a/apps/emqx_passwd/src/emqx_passwd.app.src b/apps/emqx_passwd/src/emqx_passwd.app.src index cca2edace..7d384a2ad 100644 --- a/apps/emqx_passwd/src/emqx_passwd.app.src +++ b/apps/emqx_passwd/src/emqx_passwd.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, ['emqx_passwd']}, {registered, []}, - {applications, [kernel,stdlib,ssl,pbkdf2,bcrypt]}, + {applications, [kernel,stdlib,ssl,pbkdf2,bcrypt,emqx]}, {env, []}, {licenses, ["Apache-2.0"]}, {maintainers, ["EMQ X Team "]}, diff --git a/apps/emqx_plugin_template/src/emqx_plugin_template.app.src b/apps/emqx_plugin_template/src/emqx_plugin_template.app.src index 6dd1aa21d..a194fa953 100644 --- a/apps/emqx_plugin_template/src/emqx_plugin_template.app.src +++ b/apps/emqx_plugin_template/src/emqx_plugin_template.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_plugin_template_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_plugin_template_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_plugin_template/src/emqx_plugin_template.erl b/apps/emqx_plugin_template/src/emqx_plugin_template.erl index 3be037f59..4c8f2c84a 100644 --- a/apps/emqx_plugin_template/src/emqx_plugin_template.erl +++ b/apps/emqx_plugin_template/src/emqx_plugin_template.erl @@ -16,7 +16,7 @@ -module(emqx_plugin_template). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -export([ load/1 , unload/0 diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 382701dbb..4caff04d0 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_prometheus_sup]}, - {applications, [kernel,stdlib,prometheus,emqx_libs]}, + {applications, [kernel,stdlib,prometheus,emqx]}, {mod, {emqx_prometheus_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_psk_file/src/emqx_psk_file.app.src b/apps/emqx_psk_file/src/emqx_psk_file.app.src index 53d37618f..4d015b65d 100644 --- a/apps/emqx_psk_file/src/emqx_psk_file.app.src +++ b/apps/emqx_psk_file/src/emqx_psk_file.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules,[]}, {registered,[emqx_psk_file_sup]}, - {applications,[kernel,stdlib,emqx_libs]}, + {applications,[kernel,stdlib,emqx]}, {mod,{emqx_psk_file_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_psk_file/src/emqx_psk_file.erl b/apps/emqx_psk_file/src/emqx_psk_file.erl index 6bf67ca44..1f9ad5a4b 100644 --- a/apps/emqx_psk_file/src/emqx_psk_file.erl +++ b/apps/emqx_psk_file/src/emqx_psk_file.erl @@ -16,8 +16,8 @@ -module(emqx_psk_file). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(proplists, [get_value/2]). diff --git a/apps/emqx_recon/src/emqx_recon.app.src b/apps/emqx_recon/src/emqx_recon.app.src index c587d8499..01272c9c9 100644 --- a/apps/emqx_recon/src/emqx_recon.app.src +++ b/apps/emqx_recon/src/emqx_recon.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,recon,emqx_libs]}, + {applications, [kernel,stdlib,recon,emqx]}, {mod, {emqx_recon,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src index 6fb0d4341..b4965786b 100644 --- a/apps/emqx_retainer/src/emqx_retainer.app.src +++ b/apps/emqx_retainer/src/emqx_retainer.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_retainer_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_retainer_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_retainer/src/emqx_retainer.erl b/apps/emqx_retainer/src/emqx_retainer.erl index 941e24aef..3531d7ecb 100644 --- a/apps/emqx_retainer/src/emqx_retainer.erl +++ b/apps/emqx_retainer/src/emqx_retainer.erl @@ -19,8 +19,8 @@ -behaviour(gen_server). -include("emqx_retainer.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). -logger_header("[Retainer]"). diff --git a/apps/emqx_rule_engine/src/emqx_rule_actions.erl b/apps/emqx_rule_engine/src/emqx_rule_actions.erl index 317808579..5ee860e94 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_actions.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_actions.erl @@ -18,8 +18,8 @@ -module(emqx_rule_actions). -include("rule_engine.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -define(REPUBLISH_PARAMS_SPEC, #{ target_topic => #{ diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src index c4008d3d1..547e19464 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_rule_engine_sup, emqx_rule_registry]}, - {applications, [kernel,stdlib,rulesql,getopt,emqx_libs]}, + {applications, [kernel,stdlib,rulesql,getopt,emqx]}, {mod, {emqx_rule_engine_app, []}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/apps/emqx_rule_engine/src/emqx_rule_engine.erl index 30e08d67a..41b961230 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl @@ -17,7 +17,7 @@ -module(emqx_rule_engine). -include("rule_engine.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ load_providers/0 , load_provider/1 diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl index 3f9fa328d..f38ff4b10 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl @@ -18,7 +18,7 @@ -include("rule_engine.hrl"). -include("rule_events.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -import(minirest, [return/1]). diff --git a/apps/emqx_rule_engine/src/emqx_rule_events.erl b/apps/emqx_rule_engine/src/emqx_rule_events.erl index 21c4a98e6..2ad383475 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_events.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_events.erl @@ -16,8 +16,8 @@ -module(emqx_rule_events). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -logger_header("[RuleEvents]"). diff --git a/apps/emqx_rule_engine/src/emqx_rule_registry.erl b/apps/emqx_rule_engine/src/emqx_rule_registry.erl index 3a0188a66..9681f8daa 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_registry.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_registry.erl @@ -20,7 +20,7 @@ -include("rule_engine.hrl"). -include("rule_events.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([start_link/0]). diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl index 1b69c3cc2..ff094d74c 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl @@ -17,8 +17,8 @@ -module(emqx_rule_runtime). -include("rule_engine.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ apply_rule/2 , apply_rules/2 diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl index 34ab225b2..b77093da6 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl @@ -16,7 +16,7 @@ -include("rule_engine.hrl"). -include("rule_events.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ test/1 ]). diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl index 78a0feb54..9836b96f0 100644 --- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl +++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl @@ -20,7 +20,7 @@ -compile(nowarn_export_all). -include_lib("emqx_rule_engine/include/rule_engine.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx_sasl/src/emqx_sasl.app.src b/apps/emqx_sasl/src/emqx_sasl.app.src index 53c0b8fe3..4f137e1d2 100644 --- a/apps/emqx_sasl/src/emqx_sasl.app.src +++ b/apps/emqx_sasl/src/emqx_sasl.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_sasl_sup]}, - {applications, [kernel,stdlib,pbkdf2,emqx_libs]}, + {applications, [kernel,stdlib,pbkdf2,emqx]}, {mod, {emqx_sasl_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_sasl/src/emqx_sasl.erl b/apps/emqx_sasl/src/emqx_sasl.erl index bea50c73f..711518ce2 100644 --- a/apps/emqx_sasl/src/emqx_sasl.erl +++ b/apps/emqx_sasl/src/emqx_sasl.erl @@ -16,7 +16,7 @@ -module(emqx_sasl). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/logger.hrl"). -export([ load/0 , unload/0 diff --git a/apps/emqx_sn/src/emqx_sn.app.src b/apps/emqx_sn/src/emqx_sn.app.src index b95d3976e..ea17ee0c7 100644 --- a/apps/emqx_sn/src/emqx_sn.app.src +++ b/apps/emqx_sn/src/emqx_sn.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,esockd,emqx_libs]}, + {applications, [kernel,stdlib,esockd,emqx]}, {mod, {emqx_sn_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_sn/src/emqx_sn_gateway.erl b/apps/emqx_sn/src/emqx_sn_gateway.erl index f5d1d9519..aa1f090bb 100644 --- a/apps/emqx_sn/src/emqx_sn_gateway.erl +++ b/apps/emqx_sn/src/emqx_sn_gateway.erl @@ -19,8 +19,8 @@ -behaviour(gen_statem). -include("emqx_sn.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). %% API. -export([start_link/3]). diff --git a/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl b/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl index 9bf5df2c5..35ad84193 100644 --- a/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl +++ b/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl @@ -24,8 +24,8 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -define(HOST, {127,0,0,1}). diff --git a/apps/emqx_stomp/src/emqx_stomp.app.src b/apps/emqx_stomp/src/emqx_stomp.app.src index dda7b242b..4235fa706 100644 --- a/apps/emqx_stomp/src/emqx_stomp.app.src +++ b/apps/emqx_stomp/src/emqx_stomp.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_stomp_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_stomp,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_stomp/src/emqx_stomp_protocol.erl b/apps/emqx_stomp/src/emqx_stomp_protocol.erl index 685d90d8f..fa75f08e3 100644 --- a/apps/emqx_stomp/src/emqx_stomp_protocol.erl +++ b/apps/emqx_stomp/src/emqx_stomp_protocol.erl @@ -18,8 +18,8 @@ -module(emqx_stomp_protocol). -include("emqx_stomp.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -import(proplists, [get_value/2, get_value/3]). diff --git a/apps/emqx_telemetry/src/emqx_telemetry.app.src b/apps/emqx_telemetry/src/emqx_telemetry.app.src index b36503e0e..2ce4fd039 100644 --- a/apps/emqx_telemetry/src/emqx_telemetry.app.src +++ b/apps/emqx_telemetry/src/emqx_telemetry.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_telemetry_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_telemetry_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_telemetry/src/emqx_telemetry.erl b/apps/emqx_telemetry/src/emqx_telemetry.erl index 72fe8e510..0dbb2fc19 100644 --- a/apps/emqx_telemetry/src/emqx_telemetry.erl +++ b/apps/emqx_telemetry/src/emqx_telemetry.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -include_lib("kernel/include/file.hrl"). diff --git a/apps/emqx_web_hook/src/emqx_web_hook.app.src b/apps/emqx_web_hook/src/emqx_web_hook.app.src index 78f828e67..4c1f69f89 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook.app.src +++ b/apps/emqx_web_hook/src/emqx_web_hook.app.src @@ -3,7 +3,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_web_hook_sup]}, - {applications, [kernel,stdlib,emqx_libs]}, + {applications, [kernel,stdlib,emqx]}, {mod, {emqx_web_hook_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx_web_hook/src/emqx_web_hook.erl b/apps/emqx_web_hook/src/emqx_web_hook.erl index 5b25624be..3a6f785c7 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook.erl @@ -16,8 +16,8 @@ -module(emqx_web_hook). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -define(APP, emqx_web_hook). diff --git a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl index a78d6c4f8..a2cb1dec5 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl @@ -17,8 +17,8 @@ %% Define the default actions. -module(emqx_web_hook_actions). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/logger.hrl"). -define(RESOURCE_TYPE_WEBHOOK, 'web_hook'). -define(RESOURCE_CONFIG_SPEC, #{ diff --git a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl index 87e5c63ad..cd370a57b 100644 --- a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl +++ b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/data/emqx_vars b/data/emqx_vars similarity index 100% rename from apps/emqx/data/emqx_vars rename to data/emqx_vars diff --git a/apps/emqx/data/loaded_modules.tmpl b/data/loaded_modules.tmpl similarity index 100% rename from apps/emqx/data/loaded_modules.tmpl rename to data/loaded_modules.tmpl diff --git a/apps/emqx/data/loaded_plugins.tmpl b/data/loaded_plugins.tmpl similarity index 100% rename from apps/emqx/data/loaded_plugins.tmpl rename to data/loaded_plugins.tmpl diff --git a/apps/emqx/etc/acl.conf b/etc/acl.conf similarity index 100% rename from apps/emqx/etc/acl.conf rename to etc/acl.conf diff --git a/apps/emqx/etc/acl.conf.paho b/etc/acl.conf.paho similarity index 100% rename from apps/emqx/etc/acl.conf.paho rename to etc/acl.conf.paho diff --git a/apps/emqx/etc/certs/README b/etc/certs/README similarity index 100% rename from apps/emqx/etc/certs/README rename to etc/certs/README diff --git a/apps/emqx/etc/certs/cacert.pem b/etc/certs/cacert.pem similarity index 100% rename from apps/emqx/etc/certs/cacert.pem rename to etc/certs/cacert.pem diff --git a/apps/emqx/etc/certs/cert.pem b/etc/certs/cert.pem similarity index 100% rename from apps/emqx/etc/certs/cert.pem rename to etc/certs/cert.pem diff --git a/apps/emqx/etc/certs/client-cert.pem b/etc/certs/client-cert.pem similarity index 100% rename from apps/emqx/etc/certs/client-cert.pem rename to etc/certs/client-cert.pem diff --git a/apps/emqx/etc/certs/client-key.pem b/etc/certs/client-key.pem similarity index 100% rename from apps/emqx/etc/certs/client-key.pem rename to etc/certs/client-key.pem diff --git a/apps/emqx/etc/certs/key.pem b/etc/certs/key.pem similarity index 100% rename from apps/emqx/etc/certs/key.pem rename to etc/certs/key.pem diff --git a/apps/emqx/etc/emqx.conf b/etc/emqx.conf similarity index 100% rename from apps/emqx/etc/emqx.conf rename to etc/emqx.conf diff --git a/apps/emqx/etc/emqx.d/acl.conf b/etc/emqx.d/acl.conf similarity index 100% rename from apps/emqx/etc/emqx.d/acl.conf rename to etc/emqx.d/acl.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_clientid.conf b/etc/emqx.d/emqx_auth_clientid.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_clientid.conf rename to etc/emqx.d/emqx_auth_clientid.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_http.conf b/etc/emqx.d/emqx_auth_http.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_http.conf rename to etc/emqx.d/emqx_auth_http.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_jwt.conf b/etc/emqx.d/emqx_auth_jwt.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_jwt.conf rename to etc/emqx.d/emqx_auth_jwt.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_mnesia.conf b/etc/emqx.d/emqx_auth_mnesia.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_mnesia.conf rename to etc/emqx.d/emqx_auth_mnesia.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_mysql.conf b/etc/emqx.d/emqx_auth_mysql.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_mysql.conf rename to etc/emqx.d/emqx_auth_mysql.conf diff --git a/apps/emqx/etc/emqx.d/emqx_auth_username.conf b/etc/emqx.d/emqx_auth_username.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_auth_username.conf rename to etc/emqx.d/emqx_auth_username.conf diff --git a/apps/emqx/etc/emqx.d/emqx_bridge_mqtt.conf b/etc/emqx.d/emqx_bridge_mqtt.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_bridge_mqtt.conf rename to etc/emqx.d/emqx_bridge_mqtt.conf diff --git a/apps/emqx/etc/emqx.d/emqx_coap.conf b/etc/emqx.d/emqx_coap.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_coap.conf rename to etc/emqx.d/emqx_coap.conf diff --git a/apps/emqx/etc/emqx.d/emqx_dashboard.conf b/etc/emqx.d/emqx_dashboard.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_dashboard.conf rename to etc/emqx.d/emqx_dashboard.conf diff --git a/apps/emqx/etc/emqx.d/emqx_management.conf b/etc/emqx.d/emqx_management.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_management.conf rename to etc/emqx.d/emqx_management.conf diff --git a/apps/emqx/etc/emqx.d/emqx_recon.conf b/etc/emqx.d/emqx_recon.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_recon.conf rename to etc/emqx.d/emqx_recon.conf diff --git a/apps/emqx/etc/emqx.d/emqx_retainer.conf b/etc/emqx.d/emqx_retainer.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_retainer.conf rename to etc/emqx.d/emqx_retainer.conf diff --git a/apps/emqx/etc/emqx.d/emqx_rule_engine.conf b/etc/emqx.d/emqx_rule_engine.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_rule_engine.conf rename to etc/emqx.d/emqx_rule_engine.conf diff --git a/apps/emqx/etc/emqx.d/emqx_sasl.conf b/etc/emqx.d/emqx_sasl.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_sasl.conf rename to etc/emqx.d/emqx_sasl.conf diff --git a/apps/emqx/etc/emqx.d/emqx_sn.conf b/etc/emqx.d/emqx_sn.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_sn.conf rename to etc/emqx.d/emqx_sn.conf diff --git a/apps/emqx/etc/emqx.d/emqx_stomp.conf b/etc/emqx.d/emqx_stomp.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_stomp.conf rename to etc/emqx.d/emqx_stomp.conf diff --git a/apps/emqx/etc/emqx.d/emqx_telemetry.conf b/etc/emqx.d/emqx_telemetry.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_telemetry.conf rename to etc/emqx.d/emqx_telemetry.conf diff --git a/apps/emqx/etc/emqx.d/emqx_web_hook.conf b/etc/emqx.d/emqx_web_hook.conf similarity index 100% rename from apps/emqx/etc/emqx.d/emqx_web_hook.conf rename to etc/emqx.d/emqx_web_hook.conf diff --git a/apps/emqx/etc/emqx.d/ssl_dist.conf b/etc/emqx.d/ssl_dist.conf similarity index 100% rename from apps/emqx/etc/emqx.d/ssl_dist.conf rename to etc/emqx.d/ssl_dist.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_auth_ldap.conf b/etc/emqx_cloud.d/emqx_auth_ldap.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_auth_ldap.conf rename to etc/emqx_cloud.d/emqx_auth_ldap.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_auth_mongo.conf b/etc/emqx_cloud.d/emqx_auth_mongo.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_auth_mongo.conf rename to etc/emqx_cloud.d/emqx_auth_mongo.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_auth_pgsql.conf b/etc/emqx_cloud.d/emqx_auth_pgsql.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_auth_pgsql.conf rename to etc/emqx_cloud.d/emqx_auth_pgsql.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_auth_redis.conf b/etc/emqx_cloud.d/emqx_auth_redis.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_auth_redis.conf rename to etc/emqx_cloud.d/emqx_auth_redis.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_exhook.conf b/etc/emqx_cloud.d/emqx_exhook.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_exhook.conf rename to etc/emqx_cloud.d/emqx_exhook.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_exproto.conf b/etc/emqx_cloud.d/emqx_exproto.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_exproto.conf rename to etc/emqx_cloud.d/emqx_exproto.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_lua_hook.conf b/etc/emqx_cloud.d/emqx_lua_hook.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_lua_hook.conf rename to etc/emqx_cloud.d/emqx_lua_hook.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_lwm2m.conf b/etc/emqx_cloud.d/emqx_lwm2m.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_lwm2m.conf rename to etc/emqx_cloud.d/emqx_lwm2m.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_prometheus.conf b/etc/emqx_cloud.d/emqx_prometheus.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_prometheus.conf rename to etc/emqx_cloud.d/emqx_prometheus.conf diff --git a/apps/emqx/etc/emqx_cloud.d/emqx_psk_file.conf b/etc/emqx_cloud.d/emqx_psk_file.conf similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/emqx_psk_file.conf rename to etc/emqx_cloud.d/emqx_psk_file.conf diff --git a/apps/emqx/etc/emqx_cloud.d/vm.args b/etc/emqx_cloud.d/vm.args similarity index 100% rename from apps/emqx/etc/emqx_cloud.d/vm.args rename to etc/emqx_cloud.d/vm.args diff --git a/apps/emqx/etc/emqx_edge.d/vm.args.edge b/etc/emqx_edge.d/vm.args.edge similarity index 100% rename from apps/emqx/etc/emqx_edge.d/vm.args.edge rename to etc/emqx_edge.d/vm.args.edge diff --git a/apps/emqx/etc/ssl_dist.conf b/etc/ssl_dist.conf similarity index 100% rename from apps/emqx/etc/ssl_dist.conf rename to etc/ssl_dist.conf diff --git a/apps/emqx/etc/vm.args b/etc/vm.args similarity index 100% rename from apps/emqx/etc/vm.args rename to etc/vm.args diff --git a/apps/emqx/etc/vm.args.edge b/etc/vm.args.edge similarity index 100% rename from apps/emqx/etc/vm.args.edge rename to etc/vm.args.edge diff --git a/apps/emqx_libs/include/emqx.hrl b/include/emqx.hrl similarity index 100% rename from apps/emqx_libs/include/emqx.hrl rename to include/emqx.hrl diff --git a/apps/emqx_libs/include/emqx_mqtt.hrl b/include/emqx_mqtt.hrl similarity index 100% rename from apps/emqx_libs/include/emqx_mqtt.hrl rename to include/emqx_mqtt.hrl diff --git a/apps/emqx_libs/include/logger.hrl b/include/logger.hrl similarity index 100% rename from apps/emqx_libs/include/logger.hrl rename to include/logger.hrl diff --git a/apps/emqx_libs/include/types.hrl b/include/types.hrl similarity index 100% rename from apps/emqx_libs/include/types.hrl rename to include/types.hrl diff --git a/apps/emqx/priv/emqx.schema b/priv/emqx.schema similarity index 100% rename from apps/emqx/priv/emqx.schema rename to priv/emqx.schema diff --git a/rebar.config b/rebar.config index 2ea0e984b..0026218f3 100644 --- a/rebar.config +++ b/rebar.config @@ -20,7 +20,7 @@ {post,[{release,{relup_helper,otp_vsn}}, {release,{relup_helper,untar}}]}]}. {post_hooks,[]}. -{erl_first_files, ["apps/emqx/src/emqx_logger.erl"]}. +{erl_first_files, ["emqx_logger.erl"]}. "${COVERALL_CONFIGS}". @@ -75,7 +75,6 @@ , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.7.4"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.0"}}} , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.0.0"}}} - , {emqx_passwd, {git, "https://github.com/emqx/emqx-passwd", {tag, "v1.1.1"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.1"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "v0.4.2"}}} , {replayq, {git, "https://github.com/emqx/replayq", {tag, "v0.2.0"}}} diff --git a/apps/emqx/src/emqx.app.src b/src/emqx.app.src similarity index 95% rename from apps/emqx/src/emqx.app.src rename to src/emqx.app.src index adb374325..40c0ff955 100644 --- a/apps/emqx/src/emqx.app.src +++ b/src/emqx.app.src @@ -4,7 +4,7 @@ {vsn, "4.3.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, - {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon,emqx_libs]}, + {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]}, {mod, {emqx_app,[]}}, {env, []}, {licenses, ["Apache-2.0"]}, diff --git a/apps/emqx/src/emqx.appup.src b/src/emqx.appup.src similarity index 100% rename from apps/emqx/src/emqx.appup.src rename to src/emqx.appup.src diff --git a/apps/emqx/src/emqx.erl b/src/emqx.erl similarity index 98% rename from apps/emqx/src/emqx.erl rename to src/emqx.erl index 4f4f4964f..2c6d444e7 100644 --- a/apps/emqx/src/emqx.erl +++ b/src/emqx.erl @@ -16,9 +16,9 @@ -module(emqx). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[EMQ X]"). diff --git a/apps/emqx/src/emqx_access_control.erl b/src/emqx_access_control.erl similarity index 98% rename from apps/emqx/src/emqx_access_control.erl rename to src/emqx_access_control.erl index 2495d3579..32383b3f0 100644 --- a/apps/emqx/src/emqx_access_control.erl +++ b/src/emqx_access_control.erl @@ -16,7 +16,7 @@ -module(emqx_access_control). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -export([authenticate/1]). diff --git a/apps/emqx/src/emqx_access_rule.erl b/src/emqx_access_rule.erl similarity index 99% rename from apps/emqx/src/emqx_access_rule.erl rename to src/emqx_access_rule.erl index a5bc2aad9..89943cdbd 100644 --- a/apps/emqx/src/emqx_access_rule.erl +++ b/src/emqx_access_rule.erl @@ -16,7 +16,7 @@ -module(emqx_access_rule). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). %% APIs -export([ match/3 diff --git a/apps/emqx/src/emqx_acl_cache.erl b/src/emqx_acl_cache.erl similarity index 99% rename from apps/emqx/src/emqx_acl_cache.erl rename to src/emqx_acl_cache.erl index 0f8693d72..ef549d8d3 100644 --- a/apps/emqx/src/emqx_acl_cache.erl +++ b/src/emqx_acl_cache.erl @@ -16,7 +16,7 @@ -module(emqx_acl_cache). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -export([ list_acl_cache/0 , get_acl_cache/2 diff --git a/apps/emqx/src/emqx_alarm.erl b/src/emqx_alarm.erl similarity index 99% rename from apps/emqx/src/emqx_alarm.erl rename to src/emqx_alarm.erl index f3f696adb..37d6fe1e8 100644 --- a/apps/emqx/src/emqx_alarm.erl +++ b/src/emqx_alarm.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[Alarm Handler]"). diff --git a/apps/emqx/src/emqx_alarm_handler.erl b/src/emqx_alarm_handler.erl similarity index 96% rename from apps/emqx/src/emqx_alarm_handler.erl rename to src/emqx_alarm_handler.erl index 8c73b5605..7f66f6eb1 100644 --- a/apps/emqx/src/emqx_alarm_handler.erl +++ b/src/emqx_alarm_handler.erl @@ -18,8 +18,8 @@ -behaviour(gen_event). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[Alarm Handler]"). diff --git a/apps/emqx/src/emqx_app.erl b/src/emqx_app.erl similarity index 100% rename from apps/emqx/src/emqx_app.erl rename to src/emqx_app.erl diff --git a/apps/emqx/src/emqx_banned.erl b/src/emqx_banned.erl similarity index 97% rename from apps/emqx/src/emqx_banned.erl rename to src/emqx_banned.erl index f4c5d728f..80f93be70 100644 --- a/apps/emqx/src/emqx_banned.erl +++ b/src/emqx_banned.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Banned]"). diff --git a/apps/emqx/src/emqx_base62.erl b/src/emqx_base62.erl similarity index 100% rename from apps/emqx/src/emqx_base62.erl rename to src/emqx_base62.erl diff --git a/apps/emqx/src/emqx_batch.erl b/src/emqx_batch.erl similarity index 100% rename from apps/emqx/src/emqx_batch.erl rename to src/emqx_batch.erl diff --git a/apps/emqx/src/emqx_boot.erl b/src/emqx_boot.erl similarity index 100% rename from apps/emqx/src/emqx_boot.erl rename to src/emqx_boot.erl diff --git a/apps/emqx/src/emqx_broker.erl b/src/emqx_broker.erl similarity index 98% rename from apps/emqx/src/emqx_broker.erl rename to src/emqx_broker.erl index 5a1c1d9d3..85c6ad070 100644 --- a/apps/emqx/src/emqx_broker.erl +++ b/src/emqx_broker.erl @@ -18,10 +18,10 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). +-include("emqx_mqtt.hrl"). -logger_header("[Broker]"). diff --git a/apps/emqx/src/emqx_broker_helper.erl b/src/emqx_broker_helper.erl similarity index 98% rename from apps/emqx/src/emqx_broker_helper.erl rename to src/emqx_broker_helper.erl index 535d81a35..18ebbccf2 100644 --- a/apps/emqx/src/emqx_broker_helper.erl +++ b/src/emqx_broker_helper.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Broker Helper]"). diff --git a/apps/emqx/src/emqx_broker_sup.erl b/src/emqx_broker_sup.erl similarity index 100% rename from apps/emqx/src/emqx_broker_sup.erl rename to src/emqx_broker_sup.erl diff --git a/apps/emqx/src/emqx_channel.erl b/src/emqx_channel.erl similarity index 99% rename from apps/emqx/src/emqx_channel.erl rename to src/emqx_channel.erl index 312fe60c9..71b89f153 100644 --- a/apps/emqx/src/emqx_channel.erl +++ b/src/emqx_channel.erl @@ -17,10 +17,10 @@ %% MQTT Channel -module(emqx_channel). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Channel]"). diff --git a/apps/emqx/src/emqx_cm.erl b/src/emqx_cm.erl similarity index 99% rename from apps/emqx/src/emqx_cm.erl rename to src/emqx_cm.erl index 1654f4b4e..200a5f08e 100644 --- a/apps/emqx/src/emqx_cm.erl +++ b/src/emqx_cm.erl @@ -19,9 +19,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[CM]"). diff --git a/apps/emqx/src/emqx_cm_locker.erl b/src/emqx_cm_locker.erl similarity index 96% rename from apps/emqx/src/emqx_cm_locker.erl rename to src/emqx_cm_locker.erl index 84e24a568..b5979c706 100644 --- a/apps/emqx/src/emqx_cm_locker.erl +++ b/src/emqx_cm_locker.erl @@ -16,8 +16,8 @@ -module(emqx_cm_locker). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("types.hrl"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_cm_registry.erl b/src/emqx_cm_registry.erl similarity index 97% rename from apps/emqx/src/emqx_cm_registry.erl rename to src/emqx_cm_registry.erl index fb53d571d..6609d70f4 100644 --- a/apps/emqx/src/emqx_cm_registry.erl +++ b/src/emqx_cm_registry.erl @@ -19,9 +19,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Registry]"). diff --git a/apps/emqx/src/emqx_cm_sup.erl b/src/emqx_cm_sup.erl similarity index 100% rename from apps/emqx/src/emqx_cm_sup.erl rename to src/emqx_cm_sup.erl diff --git a/apps/emqx/src/emqx_connection.erl b/src/emqx_connection.erl similarity index 99% rename from apps/emqx/src/emqx_connection.erl rename to src/emqx_connection.erl index 632357f83..2ab7f6c1e 100644 --- a/apps/emqx/src/emqx_connection.erl +++ b/src/emqx_connection.erl @@ -17,10 +17,10 @@ %% MQTT/TCP|TLS Connection -module(emqx_connection). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[MQTT]"). diff --git a/apps/emqx/src/emqx_ctl.erl b/src/emqx_ctl.erl similarity index 98% rename from apps/emqx/src/emqx_ctl.erl rename to src/emqx_ctl.erl index ffe3537b5..45cf34543 100644 --- a/apps/emqx/src/emqx_ctl.erl +++ b/src/emqx_ctl.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("types.hrl"). +-include("logger.hrl"). -logger_header("[Ctl]"). diff --git a/apps/emqx/src/emqx_flapping.erl b/src/emqx_flapping.erl similarity index 97% rename from apps/emqx/src/emqx_flapping.erl rename to src/emqx_flapping.erl index 7a0602647..0c1b60ddd 100644 --- a/apps/emqx/src/emqx_flapping.erl +++ b/src/emqx_flapping.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("types.hrl"). +-include("logger.hrl"). -logger_header("[Flapping]"). diff --git a/apps/emqx/src/emqx_frame.erl b/src/emqx_frame.erl similarity index 99% rename from apps/emqx/src/emqx_frame.erl rename to src/emqx_frame.erl index 5fb893e57..1c27548f7 100644 --- a/apps/emqx/src/emqx_frame.erl +++ b/src/emqx_frame.erl @@ -16,8 +16,8 @@ -module(emqx_frame). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -export([ initial_parse_state/0 , initial_parse_state/1 diff --git a/apps/emqx/src/emqx_gc.erl b/src/emqx_gc.erl similarity index 98% rename from apps/emqx/src/emqx_gc.erl rename to src/emqx_gc.erl index 908ab50b6..3bf826f73 100644 --- a/apps/emqx/src/emqx_gc.erl +++ b/src/emqx_gc.erl @@ -26,7 +26,7 @@ -module(emqx_gc). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([ init/1 , run/2 diff --git a/apps/emqx/src/emqx_gen_mod.erl b/src/emqx_gen_mod.erl similarity index 100% rename from apps/emqx/src/emqx_gen_mod.erl rename to src/emqx_gen_mod.erl diff --git a/apps/emqx/src/emqx_global_gc.erl b/src/emqx_global_gc.erl similarity index 98% rename from apps/emqx/src/emqx_global_gc.erl rename to src/emqx_global_gc.erl index 7c7fdc461..da953e347 100644 --- a/apps/emqx/src/emqx_global_gc.erl +++ b/src/emqx_global_gc.erl @@ -18,7 +18,7 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([start_link/0, stop/0]). diff --git a/apps/emqx/src/emqx_guid.erl b/src/emqx_guid.erl similarity index 100% rename from apps/emqx/src/emqx_guid.erl rename to src/emqx_guid.erl diff --git a/apps/emqx/src/emqx_hooks.erl b/src/emqx_hooks.erl similarity index 98% rename from apps/emqx/src/emqx_hooks.erl rename to src/emqx_hooks.erl index 3325ca87c..273071d75 100644 --- a/apps/emqx/src/emqx_hooks.erl +++ b/src/emqx_hooks.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Hooks]"). diff --git a/apps/emqx/src/emqx_inflight.erl b/src/emqx_inflight.erl similarity index 100% rename from apps/emqx/src/emqx_inflight.erl rename to src/emqx_inflight.erl diff --git a/apps/emqx/src/emqx_json.erl b/src/emqx_json.erl similarity index 100% rename from apps/emqx/src/emqx_json.erl rename to src/emqx_json.erl diff --git a/apps/emqx/src/emqx_keepalive.erl b/src/emqx_keepalive.erl similarity index 100% rename from apps/emqx/src/emqx_keepalive.erl rename to src/emqx_keepalive.erl diff --git a/apps/emqx/src/emqx_kernel_sup.erl b/src/emqx_kernel_sup.erl similarity index 100% rename from apps/emqx/src/emqx_kernel_sup.erl rename to src/emqx_kernel_sup.erl diff --git a/apps/emqx/src/emqx_limiter.erl b/src/emqx_limiter.erl similarity index 99% rename from apps/emqx/src/emqx_limiter.erl rename to src/emqx_limiter.erl index ddcff03f4..e3ff7512f 100644 --- a/apps/emqx/src/emqx_limiter.erl +++ b/src/emqx_limiter.erl @@ -17,7 +17,7 @@ %% Ratelimit or Quota checker -module(emqx_limiter). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([ init/2 , init/4 %% XXX: Compatible with before 4.2 version diff --git a/apps/emqx/src/emqx_listeners.erl b/src/emqx_listeners.erl similarity index 99% rename from apps/emqx/src/emqx_listeners.erl rename to src/emqx_listeners.erl index 456c06f6e..ce256d147 100644 --- a/apps/emqx/src/emqx_listeners.erl +++ b/src/emqx_listeners.erl @@ -17,7 +17,7 @@ %% @doc Start/Stop MQTT listeners. -module(emqx_listeners). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). %% APIs -export([ start/0 diff --git a/apps/emqx_libs/src/emqx_logger.erl b/src/emqx_logger.erl similarity index 100% rename from apps/emqx_libs/src/emqx_logger.erl rename to src/emqx_logger.erl diff --git a/apps/emqx/src/emqx_logger_formatter.erl b/src/emqx_logger_formatter.erl similarity index 100% rename from apps/emqx/src/emqx_logger_formatter.erl rename to src/emqx_logger_formatter.erl diff --git a/apps/emqx/src/emqx_message.erl b/src/emqx_message.erl similarity index 98% rename from apps/emqx/src/emqx_message.erl rename to src/emqx_message.erl index db85c5f79..decbb0c18 100644 --- a/apps/emqx/src/emqx_message.erl +++ b/src/emqx_message.erl @@ -18,9 +18,9 @@ -compile(inline). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("types.hrl"). %% Create -export([ make/2 diff --git a/apps/emqx/src/emqx_metrics.erl b/src/emqx_metrics.erl similarity index 99% rename from apps/emqx/src/emqx_metrics.erl rename to src/emqx_metrics.erl index 8ce8e084e..46db21608 100644 --- a/apps/emqx/src/emqx_metrics.erl +++ b/src/emqx_metrics.erl @@ -18,10 +18,10 @@ -behavior(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). +-include("emqx_mqtt.hrl"). -logger_header("[Metrics]"). diff --git a/apps/emqx/src/emqx_misc.erl b/src/emqx_misc.erl similarity index 98% rename from apps/emqx/src/emqx_misc.erl rename to src/emqx_misc.erl index dc2aac0a5..88e3c91a6 100644 --- a/apps/emqx/src/emqx_misc.erl +++ b/src/emqx_misc.erl @@ -18,8 +18,8 @@ -compile(inline). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("types.hrl"). +-include("logger.hrl"). -export([ merge_opts/2 , maybe_apply/2 diff --git a/apps/emqx/src/emqx_mod_acl_internal.erl b/src/emqx_mod_acl_internal.erl similarity index 97% rename from apps/emqx/src/emqx_mod_acl_internal.erl rename to src/emqx_mod_acl_internal.erl index e7b498463..7d5dd82c6 100644 --- a/apps/emqx/src/emqx_mod_acl_internal.erl +++ b/src/emqx_mod_acl_internal.erl @@ -18,8 +18,8 @@ -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[ACL_INTERNAL]"). diff --git a/apps/emqx/src/emqx_mod_delayed.erl b/src/emqx_mod_delayed.erl similarity index 98% rename from apps/emqx/src/emqx_mod_delayed.erl rename to src/emqx_mod_delayed.erl index 524d9015a..6818c16cc 100644 --- a/apps/emqx/src/emqx_mod_delayed.erl +++ b/src/emqx_mod_delayed.erl @@ -19,8 +19,8 @@ -behaviour(gen_server). -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_mod_presence.erl b/src/emqx_mod_presence.erl similarity index 98% rename from apps/emqx/src/emqx_mod_presence.erl rename to src/emqx_mod_presence.erl index 08e1be9d1..f5aa2279e 100644 --- a/apps/emqx/src/emqx_mod_presence.erl +++ b/src/emqx_mod_presence.erl @@ -18,8 +18,8 @@ -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[Presence]"). diff --git a/apps/emqx/src/emqx_mod_rewrite.erl b/src/emqx_mod_rewrite.erl similarity index 97% rename from apps/emqx/src/emqx_mod_rewrite.erl rename to src/emqx_mod_rewrite.erl index 007f8fde4..41f9020c9 100644 --- a/apps/emqx/src/emqx_mod_rewrite.erl +++ b/src/emqx_mod_rewrite.erl @@ -18,8 +18,8 @@ -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -ifdef(TEST). -export([ compile/1 diff --git a/apps/emqx/src/emqx_mod_subscription.erl b/src/emqx_mod_subscription.erl similarity index 96% rename from apps/emqx/src/emqx_mod_subscription.erl rename to src/emqx_mod_subscription.erl index 7fcac81cc..1da281bf1 100644 --- a/apps/emqx/src/emqx_mod_subscription.erl +++ b/src/emqx_mod_subscription.erl @@ -18,8 +18,8 @@ -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). %% emqx_gen_mod callbacks -export([ load/1 diff --git a/apps/emqx/src/emqx_mod_sup.erl b/src/emqx_mod_sup.erl similarity index 97% rename from apps/emqx/src/emqx_mod_sup.erl rename to src/emqx_mod_sup.erl index dfae8125d..b5512013c 100644 --- a/apps/emqx/src/emqx_mod_sup.erl +++ b/src/emqx_mod_sup.erl @@ -18,7 +18,7 @@ -behaviour(supervisor). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([ start_link/0 , start_child/1 diff --git a/apps/emqx/src/emqx_mod_topic_metrics.erl b/src/emqx_mod_topic_metrics.erl similarity index 98% rename from apps/emqx/src/emqx_mod_topic_metrics.erl rename to src/emqx_mod_topic_metrics.erl index 9e7abd3a6..82999bb53 100644 --- a/apps/emqx/src/emqx_mod_topic_metrics.erl +++ b/src/emqx_mod_topic_metrics.erl @@ -19,9 +19,9 @@ -behaviour(gen_server). -behaviour(emqx_gen_mod). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("emqx_mqtt.hrl"). -logger_header("[TOPIC_METRICS]"). diff --git a/apps/emqx/src/emqx_modules.erl b/src/emqx_modules.erl similarity index 99% rename from apps/emqx/src/emqx_modules.erl rename to src/emqx_modules.erl index 58621f28a..55fb44001 100644 --- a/apps/emqx/src/emqx_modules.erl +++ b/src/emqx_modules.erl @@ -16,7 +16,7 @@ -module(emqx_modules). --include_lib("emqx_libs/include/logger.hrl"). +-include("logger.hrl"). -logger_header("[Modules]"). diff --git a/apps/emqx/src/emqx_mountpoint.erl b/src/emqx_mountpoint.erl similarity index 96% rename from apps/emqx/src/emqx_mountpoint.erl rename to src/emqx_mountpoint.erl index 83367655f..8dfc23b30 100644 --- a/apps/emqx/src/emqx_mountpoint.erl +++ b/src/emqx_mountpoint.erl @@ -16,8 +16,8 @@ -module(emqx_mountpoint). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("types.hrl"). -export([ mount/2 , unmount/2 diff --git a/apps/emqx/src/emqx_mqtt_caps.erl b/src/emqx_mqtt_caps.erl similarity index 98% rename from apps/emqx/src/emqx_mqtt_caps.erl rename to src/emqx_mqtt_caps.erl index 7f4896ebd..f29d59915 100644 --- a/apps/emqx/src/emqx_mqtt_caps.erl +++ b/src/emqx_mqtt_caps.erl @@ -17,8 +17,8 @@ %% @doc MQTTv5 Capabilities -module(emqx_mqtt_caps). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx_mqtt.hrl"). +-include("types.hrl"). -export([ check_pub/2 , check_sub/3 diff --git a/apps/emqx/src/emqx_mqtt_props.erl b/src/emqx_mqtt_props.erl similarity index 99% rename from apps/emqx/src/emqx_mqtt_props.erl rename to src/emqx_mqtt_props.erl index 643b8cc76..7acea6761 100644 --- a/apps/emqx/src/emqx_mqtt_props.erl +++ b/src/emqx_mqtt_props.erl @@ -17,7 +17,7 @@ %% @doc MQTT5 Properties -module(emqx_mqtt_props). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -export([ id/1 , name/1 diff --git a/apps/emqx/src/emqx_mqueue.erl b/src/emqx_mqueue.erl similarity index 98% rename from apps/emqx/src/emqx_mqueue.erl rename to src/emqx_mqueue.erl index 5286dfe10..f77a1d98f 100644 --- a/apps/emqx/src/emqx_mqueue.erl +++ b/src/emqx_mqueue.erl @@ -49,9 +49,9 @@ -module(emqx_mqueue). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("types.hrl"). +-include("emqx_mqtt.hrl"). -export([ init/1 , info/1 diff --git a/apps/emqx/src/emqx_os_mon.erl b/src/emqx_os_mon.erl similarity index 98% rename from apps/emqx/src/emqx_os_mon.erl rename to src/emqx_os_mon.erl index 0e2dbbd15..49517d8a6 100644 --- a/apps/emqx/src/emqx_os_mon.erl +++ b/src/emqx_os_mon.erl @@ -18,7 +18,7 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). +-include("logger.hrl"). -logger_header("[OS_MON]"). @@ -47,7 +47,7 @@ , code_change/3 ]). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -define(OS_MON, ?MODULE). diff --git a/apps/emqx/src/emqx_packet.erl b/src/emqx_packet.erl similarity index 99% rename from apps/emqx/src/emqx_packet.erl rename to src/emqx_packet.erl index 25b9d9996..015f95e0d 100644 --- a/apps/emqx/src/emqx_packet.erl +++ b/src/emqx_packet.erl @@ -16,8 +16,8 @@ -module(emqx_packet). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). %% Header APIs -export([ type/1 diff --git a/apps/emqx/src/emqx_pd.erl b/src/emqx_pd.erl similarity index 97% rename from apps/emqx/src/emqx_pd.erl rename to src/emqx_pd.erl index c62f761b3..8754ac090 100644 --- a/apps/emqx/src/emqx_pd.erl +++ b/src/emqx_pd.erl @@ -17,7 +17,7 @@ %% @doc The utility functions for erlang process dictionary. -module(emqx_pd). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([ get_counters/1 , get_counter/1 diff --git a/apps/emqx/src/emqx_plugins.erl b/src/emqx_plugins.erl similarity index 99% rename from apps/emqx/src/emqx_plugins.erl rename to src/emqx_plugins.erl index 5eb9267c7..6c7408a28 100644 --- a/apps/emqx/src/emqx_plugins.erl +++ b/src/emqx_plugins.erl @@ -16,8 +16,8 @@ -module(emqx_plugins). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[Plugins]"). diff --git a/apps/emqx/src/emqx_pmon.erl b/src/emqx_pmon.erl similarity index 100% rename from apps/emqx/src/emqx_pmon.erl rename to src/emqx_pmon.erl diff --git a/apps/emqx/src/emqx_pool.erl b/src/emqx_pool.erl similarity index 97% rename from apps/emqx/src/emqx_pool.erl rename to src/emqx_pool.erl index 00fdb4c8b..49a7c2cac 100644 --- a/apps/emqx/src/emqx_pool.erl +++ b/src/emqx_pool.erl @@ -18,8 +18,8 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Pool]"). diff --git a/apps/emqx/src/emqx_pool_sup.erl b/src/emqx_pool_sup.erl similarity index 98% rename from apps/emqx/src/emqx_pool_sup.erl rename to src/emqx_pool_sup.erl index 7c2d6639d..080cd842b 100644 --- a/apps/emqx/src/emqx_pool_sup.erl +++ b/src/emqx_pool_sup.erl @@ -18,7 +18,7 @@ -behaviour(supervisor). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([spec/1, spec/2]). diff --git a/apps/emqx/src/emqx_pqueue.erl b/src/emqx_pqueue.erl similarity index 100% rename from apps/emqx/src/emqx_pqueue.erl rename to src/emqx_pqueue.erl diff --git a/apps/emqx/src/emqx_psk.erl b/src/emqx_psk.erl similarity index 97% rename from apps/emqx/src/emqx_psk.erl rename to src/emqx_psk.erl index 057dc3e84..f1170d2d9 100644 --- a/apps/emqx/src/emqx_psk.erl +++ b/src/emqx_psk.erl @@ -16,7 +16,7 @@ -module(emqx_psk). --include_lib("emqx_libs/include/logger.hrl"). +-include("logger.hrl"). -logger_header("[PSK]"). diff --git a/apps/emqx/src/emqx_reason_codes.erl b/src/emqx_reason_codes.erl similarity index 99% rename from apps/emqx/src/emqx_reason_codes.erl rename to src/emqx_reason_codes.erl index c9ada26a4..8e96df165 100644 --- a/apps/emqx/src/emqx_reason_codes.erl +++ b/src/emqx_reason_codes.erl @@ -17,7 +17,7 @@ %% @doc MQTT5 reason codes -module(emqx_reason_codes). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -export([ name/1 , name/2 diff --git a/apps/emqx/src/emqx_router.erl b/src/emqx_router.erl similarity index 98% rename from apps/emqx/src/emqx_router.erl rename to src/emqx_router.erl index 00fb934f6..cc358758f 100644 --- a/apps/emqx/src/emqx_router.erl +++ b/src/emqx_router.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -include_lib("ekka/include/ekka.hrl"). -logger_header("[Router]"). diff --git a/apps/emqx/src/emqx_router_helper.erl b/src/emqx_router_helper.erl similarity index 97% rename from apps/emqx/src/emqx_router_helper.erl rename to src/emqx_router_helper.erl index 33761c027..ba5cc5543 100644 --- a/apps/emqx/src/emqx_router_helper.erl +++ b/src/emqx_router_helper.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Router Helper]"). diff --git a/apps/emqx/src/emqx_router_sup.erl b/src/emqx_router_sup.erl similarity index 100% rename from apps/emqx/src/emqx_router_sup.erl rename to src/emqx_router_sup.erl diff --git a/apps/emqx/src/emqx_rpc.erl b/src/emqx_rpc.erl similarity index 100% rename from apps/emqx/src/emqx_rpc.erl rename to src/emqx_rpc.erl diff --git a/apps/emqx/src/emqx_sequence.erl b/src/emqx_sequence.erl similarity index 100% rename from apps/emqx/src/emqx_sequence.erl rename to src/emqx_sequence.erl diff --git a/apps/emqx/src/emqx_session.erl b/src/emqx_session.erl similarity index 99% rename from apps/emqx/src/emqx_session.erl rename to src/emqx_session.erl index 9961e5a75..e89943f2a 100644 --- a/apps/emqx/src/emqx_session.erl +++ b/src/emqx_session.erl @@ -43,10 +43,10 @@ %% MQTT Session -module(emqx_session). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Session]"). diff --git a/apps/emqx/src/emqx_shared_sub.erl b/src/emqx_shared_sub.erl similarity index 98% rename from apps/emqx/src/emqx_shared_sub.erl rename to src/emqx_shared_sub.erl index 863b57868..71372cd90 100644 --- a/apps/emqx/src/emqx_shared_sub.erl +++ b/src/emqx_shared_sub.erl @@ -18,10 +18,10 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Shared Sub]"). diff --git a/apps/emqx/src/emqx_stats.erl b/src/emqx_stats.erl similarity index 98% rename from apps/emqx/src/emqx_stats.erl rename to src/emqx_stats.erl index 6a120b55d..a6d53cfeb 100644 --- a/apps/emqx/src/emqx_stats.erl +++ b/src/emqx_stats.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Stats]"). diff --git a/apps/emqx/src/emqx_sup.erl b/src/emqx_sup.erl similarity index 98% rename from apps/emqx/src/emqx_sup.erl rename to src/emqx_sup.erl index f841f57d1..c0aa3a2a8 100644 --- a/apps/emqx/src/emqx_sup.erl +++ b/src/emqx_sup.erl @@ -18,7 +18,7 @@ -behaviour(supervisor). --include_lib("emqx_libs/include/types.hrl"). +-include("types.hrl"). -export([ start_link/0 , start_child/1 diff --git a/apps/emqx/src/emqx_sys.erl b/src/emqx_sys.erl similarity index 98% rename from apps/emqx/src/emqx_sys.erl rename to src/emqx_sys.erl index 64da255f9..38387b3ce 100644 --- a/apps/emqx/src/emqx_sys.erl +++ b/src/emqx_sys.erl @@ -18,9 +18,9 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("types.hrl"). +-include("logger.hrl"). -logger_header("[SYS]"). diff --git a/apps/emqx/src/emqx_sys_mon.erl b/src/emqx_sys_mon.erl similarity index 98% rename from apps/emqx/src/emqx_sys_mon.erl rename to src/emqx_sys_mon.erl index 514b5f7d2..5ee22c563 100644 --- a/apps/emqx/src/emqx_sys_mon.erl +++ b/src/emqx_sys_mon.erl @@ -18,8 +18,8 @@ -behavior(gen_server). --include_lib("emqx_libs/include/types.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("types.hrl"). +-include("logger.hrl"). -logger_header("[SYSMON]"). diff --git a/apps/emqx/src/emqx_sys_sup.erl b/src/emqx_sys_sup.erl similarity index 100% rename from apps/emqx/src/emqx_sys_sup.erl rename to src/emqx_sys_sup.erl diff --git a/apps/emqx/src/emqx_tables.erl b/src/emqx_tables.erl similarity index 100% rename from apps/emqx/src/emqx_tables.erl rename to src/emqx_tables.erl diff --git a/apps/emqx/src/emqx_topic.erl b/src/emqx_topic.erl similarity index 100% rename from apps/emqx/src/emqx_topic.erl rename to src/emqx_topic.erl diff --git a/apps/emqx/src/emqx_tracer.erl b/src/emqx_tracer.erl similarity index 98% rename from apps/emqx/src/emqx_tracer.erl rename to src/emqx_tracer.erl index 32b74ec54..a01dcb27f 100644 --- a/apps/emqx/src/emqx_tracer.erl +++ b/src/emqx_tracer.erl @@ -16,8 +16,8 @@ -module(emqx_tracer). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/logger.hrl"). +-include("emqx.hrl"). +-include("logger.hrl"). -logger_header("[Tracer]"). diff --git a/apps/emqx/src/emqx_trie.erl b/src/emqx_trie.erl similarity index 99% rename from apps/emqx/src/emqx_trie.erl rename to src/emqx_trie.erl index 051cc1d84..4189c0270 100644 --- a/apps/emqx/src/emqx_trie.erl +++ b/src/emqx_trie.erl @@ -16,7 +16,7 @@ -module(emqx_trie). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_types.erl b/src/emqx_types.erl similarity index 98% rename from apps/emqx/src/emqx_types.erl rename to src/emqx_types.erl index 2794b8834..291e35538 100644 --- a/apps/emqx/src/emqx_types.erl +++ b/src/emqx_types.erl @@ -16,9 +16,9 @@ -module(emqx_types). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("types.hrl"). -export_type([ ver/0 , qos/0 diff --git a/apps/emqx/src/emqx_vm.erl b/src/emqx_vm.erl similarity index 100% rename from apps/emqx/src/emqx_vm.erl rename to src/emqx_vm.erl diff --git a/apps/emqx/src/emqx_vm_mon.erl b/src/emqx_vm_mon.erl similarity index 99% rename from apps/emqx/src/emqx_vm_mon.erl rename to src/emqx_vm_mon.erl index 98d4fccb3..791e700d1 100644 --- a/apps/emqx/src/emqx_vm_mon.erl +++ b/src/emqx_vm_mon.erl @@ -18,7 +18,7 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/logger.hrl"). +-include("logger.hrl"). %% APIs -export([start_link/1]). diff --git a/apps/emqx/src/emqx_ws_connection.erl b/src/emqx_ws_connection.erl similarity index 99% rename from apps/emqx/src/emqx_ws_connection.erl rename to src/emqx_ws_connection.erl index a6610796c..33b882768 100644 --- a/apps/emqx/src/emqx_ws_connection.erl +++ b/src/emqx_ws_connection.erl @@ -17,10 +17,10 @@ %% MQTT/WS|WSS Connection -module(emqx_ws_connection). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[MQTT/WS]"). diff --git a/apps/emqx/src/emqx_zone.erl b/src/emqx_zone.erl similarity index 97% rename from apps/emqx/src/emqx_zone.erl rename to src/emqx_zone.erl index 19a64ba21..6cec6c1ee 100644 --- a/apps/emqx/src/emqx_zone.erl +++ b/src/emqx_zone.erl @@ -18,10 +18,10 @@ -behaviour(gen_server). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). --include_lib("emqx_libs/include/logger.hrl"). --include_lib("emqx_libs/include/types.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). +-include("logger.hrl"). +-include("types.hrl"). -logger_header("[Zone]"). diff --git a/apps/emqx/test/emqx_SUITE.erl b/test/emqx_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_SUITE.erl rename to test/emqx_SUITE.erl index 37e2d21c3..48c2177e1 100644 --- a/apps/emqx/test/emqx_SUITE.erl +++ b/test/emqx_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_SUITE_data/acl.conf b/test/emqx_SUITE_data/acl.conf similarity index 100% rename from apps/emqx/test/emqx_SUITE_data/acl.conf rename to test/emqx_SUITE_data/acl.conf diff --git a/apps/emqx/test/emqx_SUITE_data/loaded_modules b/test/emqx_SUITE_data/loaded_modules similarity index 100% rename from apps/emqx/test/emqx_SUITE_data/loaded_modules rename to test/emqx_SUITE_data/loaded_modules diff --git a/apps/emqx/test/emqx_SUITE_data/loaded_plugins b/test/emqx_SUITE_data/loaded_plugins similarity index 100% rename from apps/emqx/test/emqx_SUITE_data/loaded_plugins rename to test/emqx_SUITE_data/loaded_plugins diff --git a/apps/emqx/test/emqx_access_SUITE_data/acl.conf b/test/emqx_access_SUITE_data/acl.conf similarity index 100% rename from apps/emqx/test/emqx_access_SUITE_data/acl.conf rename to test/emqx_access_SUITE_data/acl.conf diff --git a/apps/emqx/test/emqx_access_SUITE_data/acl_deny_action.conf b/test/emqx_access_SUITE_data/acl_deny_action.conf similarity index 100% rename from apps/emqx/test/emqx_access_SUITE_data/acl_deny_action.conf rename to test/emqx_access_SUITE_data/acl_deny_action.conf diff --git a/apps/emqx/test/emqx_access_control_SUITE.erl b/test/emqx_access_control_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_access_control_SUITE.erl rename to test/emqx_access_control_SUITE.erl index 7da7a28cb..a327eea6d 100644 --- a/apps/emqx/test/emqx_access_control_SUITE.erl +++ b/test/emqx_access_control_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_access_rule_SUITE.erl b/test/emqx_access_rule_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_access_rule_SUITE.erl rename to test/emqx_access_rule_SUITE.erl diff --git a/apps/emqx/test/emqx_acl_cache_SUITE.erl b/test/emqx_acl_cache_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_acl_cache_SUITE.erl rename to test/emqx_acl_cache_SUITE.erl diff --git a/apps/emqx/test/emqx_acl_test_mod.erl b/test/emqx_acl_test_mod.erl similarity index 100% rename from apps/emqx/test/emqx_acl_test_mod.erl rename to test/emqx_acl_test_mod.erl diff --git a/apps/emqx/test/emqx_alarm_SUITE.erl b/test/emqx_alarm_SUITE.erl similarity index 97% rename from apps/emqx/test/emqx_alarm_SUITE.erl rename to test/emqx_alarm_SUITE.erl index c575ec375..863806ff6 100644 --- a/apps/emqx/test/emqx_alarm_SUITE.erl +++ b/test/emqx_alarm_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_banned_SUITE.erl b/test/emqx_banned_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_banned_SUITE.erl rename to test/emqx_banned_SUITE.erl index 885bff9e4..d99530e12 100644 --- a/apps/emqx/test/emqx_banned_SUITE.erl +++ b/test/emqx_banned_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_batch_SUITE.erl b/test/emqx_batch_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_batch_SUITE.erl rename to test/emqx_batch_SUITE.erl diff --git a/apps/emqx/test/emqx_boot_SUITE.erl b/test/emqx_boot_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_boot_SUITE.erl rename to test/emqx_boot_SUITE.erl diff --git a/apps/emqx/test/emqx_broker_SUITE.erl b/test/emqx_broker_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_broker_SUITE.erl rename to test/emqx_broker_SUITE.erl index 7bc4f5e84..d52132497 100644 --- a/apps/emqx/test/emqx_broker_SUITE.erl +++ b/test/emqx_broker_SUITE.erl @@ -24,8 +24,8 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_broker_helper_SUITE.erl b/test/emqx_broker_helper_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_broker_helper_SUITE.erl rename to test/emqx_broker_helper_SUITE.erl diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/test/emqx_channel_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_channel_SUITE.erl rename to test/emqx_channel_SUITE.erl index 71bfe6e8b..613da40ac 100644 --- a/apps/emqx/test/emqx_channel_SUITE.erl +++ b/test/emqx_channel_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx/test/emqx_client_SUITE.erl b/test/emqx_client_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_client_SUITE.erl rename to test/emqx_client_SUITE.erl index eb552ae90..e231e40ab 100644 --- a/apps/emqx/test/emqx_client_SUITE.erl +++ b/test/emqx_client_SUITE.erl @@ -21,7 +21,7 @@ -import(lists, [nth/2]). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_cm_SUITE.erl b/test/emqx_cm_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_cm_SUITE.erl rename to test/emqx_cm_SUITE.erl index 7ba4f56c3..6a4b84d01 100644 --- a/apps/emqx/test/emqx_cm_SUITE.erl +++ b/test/emqx_cm_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(CM, emqx_cm). diff --git a/apps/emqx/test/emqx_cm_locker_SUITE.erl b/test/emqx_cm_locker_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_cm_locker_SUITE.erl rename to test/emqx_cm_locker_SUITE.erl diff --git a/apps/emqx/test/emqx_cm_registry_SUITE.erl b/test/emqx_cm_registry_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_cm_registry_SUITE.erl rename to test/emqx_cm_registry_SUITE.erl diff --git a/apps/emqx/test/emqx_connection_SUITE.erl b/test/emqx_connection_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_connection_SUITE.erl rename to test/emqx_connection_SUITE.erl index 0c3706787..b908fe4ab 100644 --- a/apps/emqx/test/emqx_connection_SUITE.erl +++ b/test/emqx_connection_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_ctl_SUITE.erl b/test/emqx_ctl_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_ctl_SUITE.erl rename to test/emqx_ctl_SUITE.erl diff --git a/apps/emqx/test/emqx_flapping_SUITE.erl b/test/emqx_flapping_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_flapping_SUITE.erl rename to test/emqx_flapping_SUITE.erl diff --git a/apps/emqx/test/emqx_frame_SUITE.erl b/test/emqx_frame_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_frame_SUITE.erl rename to test/emqx_frame_SUITE.erl index 8471cd1f2..5d4e146db 100644 --- a/apps/emqx/test/emqx_frame_SUITE.erl +++ b/test/emqx_frame_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("emqx_ct_helpers/include/emqx_ct.hrl"). diff --git a/apps/emqx/test/emqx_gc_SUITE.erl b/test/emqx_gc_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_gc_SUITE.erl rename to test/emqx_gc_SUITE.erl diff --git a/apps/emqx/test/emqx_global_gc_SUITE.erl b/test/emqx_global_gc_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_global_gc_SUITE.erl rename to test/emqx_global_gc_SUITE.erl diff --git a/apps/emqx/test/emqx_guid_SUITE.erl b/test/emqx_guid_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_guid_SUITE.erl rename to test/emqx_guid_SUITE.erl diff --git a/apps/emqx/test/emqx_hooks_SUITE.erl b/test/emqx_hooks_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_hooks_SUITE.erl rename to test/emqx_hooks_SUITE.erl diff --git a/apps/emqx/test/emqx_inflight_SUITE.erl b/test/emqx_inflight_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_inflight_SUITE.erl rename to test/emqx_inflight_SUITE.erl diff --git a/apps/emqx/test/emqx_json_SUITE.erl b/test/emqx_json_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_json_SUITE.erl rename to test/emqx_json_SUITE.erl diff --git a/apps/emqx/test/emqx_keepalive_SUITE.erl b/test/emqx_keepalive_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_keepalive_SUITE.erl rename to test/emqx_keepalive_SUITE.erl diff --git a/apps/emqx/test/emqx_limiter_SUITE.erl b/test/emqx_limiter_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_limiter_SUITE.erl rename to test/emqx_limiter_SUITE.erl diff --git a/apps/emqx/test/emqx_listeners_SUITE.erl b/test/emqx_listeners_SUITE.erl similarity index 97% rename from apps/emqx/test/emqx_listeners_SUITE.erl rename to test/emqx_listeners_SUITE.erl index d7960bd57..1472cc072 100644 --- a/apps/emqx/test/emqx_listeners_SUITE.erl +++ b/test/emqx_listeners_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_logger_SUITE.erl b/test/emqx_logger_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_logger_SUITE.erl rename to test/emqx_logger_SUITE.erl diff --git a/apps/emqx/test/emqx_logger_formatter_SUITE.erl b/test/emqx_logger_formatter_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_logger_formatter_SUITE.erl rename to test/emqx_logger_formatter_SUITE.erl diff --git a/apps/emqx/test/emqx_message_SUITE.erl b/test/emqx_message_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_message_SUITE.erl rename to test/emqx_message_SUITE.erl index fc52feb24..2eebdc1dc 100644 --- a/apps/emqx/test/emqx_message_SUITE.erl +++ b/test/emqx_message_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_metrics_SUITE.erl b/test/emqx_metrics_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_metrics_SUITE.erl rename to test/emqx_metrics_SUITE.erl index 9f107bffd..33f297e7d 100644 --- a/apps/emqx/test/emqx_metrics_SUITE.erl +++ b/test/emqx_metrics_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_misc_SUITE.erl b/test/emqx_misc_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_misc_SUITE.erl rename to test/emqx_misc_SUITE.erl diff --git a/apps/emqx/test/emqx_mod_acl_internal_SUITE.erl b/test/emqx_mod_acl_internal_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mod_acl_internal_SUITE.erl rename to test/emqx_mod_acl_internal_SUITE.erl index 8734e5f55..bd9a0bf5a 100644 --- a/apps/emqx/test/emqx_mod_acl_internal_SUITE.erl +++ b/test/emqx_mod_acl_internal_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_mod_delayed_SUITE.erl b/test/emqx_mod_delayed_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mod_delayed_SUITE.erl rename to test/emqx_mod_delayed_SUITE.erl index 2badb9867..9a049981c 100644 --- a/apps/emqx/test/emqx_mod_delayed_SUITE.erl +++ b/test/emqx_mod_delayed_SUITE.erl @@ -25,7 +25,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). %%-------------------------------------------------------------------- %% Setups diff --git a/apps/emqx/test/emqx_mod_presence_SUITE.erl b/test/emqx_mod_presence_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mod_presence_SUITE.erl rename to test/emqx_mod_presence_SUITE.erl index 955526558..49d5d206b 100644 --- a/apps/emqx/test/emqx_mod_presence_SUITE.erl +++ b/test/emqx_mod_presence_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_mod_rewrite_SUITE.erl b/test/emqx_mod_rewrite_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mod_rewrite_SUITE.erl rename to test/emqx_mod_rewrite_SUITE.erl index 1dcfb87b2..e3c19200e 100644 --- a/apps/emqx/test/emqx_mod_rewrite_SUITE.erl +++ b/test/emqx_mod_rewrite_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(RULES, [{rewrite, pub, <<"x/#">>,<<"^x/y/(.+)$">>,<<"z/y/$1">>}, diff --git a/apps/emqx/test/emqx_mod_subscription_SUITE.erl b/test/emqx_mod_subscription_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mod_subscription_SUITE.erl rename to test/emqx_mod_subscription_SUITE.erl index 57fbf3b66..06cd17cea 100644 --- a/apps/emqx/test/emqx_mod_subscription_SUITE.erl +++ b/test/emqx_mod_subscription_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_mod_sup_SUITE.erl b/test/emqx_mod_sup_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_mod_sup_SUITE.erl rename to test/emqx_mod_sup_SUITE.erl diff --git a/apps/emqx/test/emqx_mod_topic_metrics_SUITE.erl b/test/emqx_mod_topic_metrics_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_mod_topic_metrics_SUITE.erl rename to test/emqx_mod_topic_metrics_SUITE.erl diff --git a/apps/emqx/test/emqx_modules_SUITE.erl b/test/emqx_modules_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_modules_SUITE.erl rename to test/emqx_modules_SUITE.erl diff --git a/apps/emqx/test/emqx_mountpoint_SUITE.erl b/test/emqx_mountpoint_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mountpoint_SUITE.erl rename to test/emqx_mountpoint_SUITE.erl index 56b000f40..26d717cd8 100644 --- a/apps/emqx/test/emqx_mountpoint_SUITE.erl +++ b/test/emqx_mountpoint_SUITE.erl @@ -25,7 +25,7 @@ , replvar/2 ]). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_mqtt_SUITE.erl b/test/emqx_mqtt_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_mqtt_SUITE.erl rename to test/emqx_mqtt_SUITE.erl index 371f07ee8..27bd46a7f 100644 --- a/apps/emqx/test/emqx_mqtt_SUITE.erl +++ b/test/emqx_mqtt_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mqtt_caps_SUITE.erl rename to test/emqx_mqtt_caps_SUITE.erl index c65647608..695d69642 100644 --- a/apps/emqx/test/emqx_mqtt_caps_SUITE.erl +++ b/test/emqx_mqtt_caps_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_mqtt_props_SUITE.erl b/test/emqx_mqtt_props_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mqtt_props_SUITE.erl rename to test/emqx_mqtt_props_SUITE.erl index f35d7f433..f440b386d 100644 --- a/apps/emqx/test/emqx_mqtt_props_SUITE.erl +++ b/test/emqx_mqtt_props_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("emqx_ct_helpers/include/emqx_ct.hrl"). diff --git a/apps/emqx/test/emqx_mqueue_SUITE.erl b/test/emqx_mqueue_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_mqueue_SUITE.erl rename to test/emqx_mqueue_SUITE.erl index d950decb6..3be1344a2 100644 --- a/apps/emqx/test/emqx_mqueue_SUITE.erl +++ b/test/emqx_mqueue_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx/test/emqx_os_mon_SUITE.erl b/test/emqx_os_mon_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_os_mon_SUITE.erl rename to test/emqx_os_mon_SUITE.erl diff --git a/apps/emqx/test/emqx_packet_SUITE.erl b/test/emqx_packet_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_packet_SUITE.erl rename to test/emqx_packet_SUITE.erl index 0b95dbd24..00ab6e0c5 100644 --- a/apps/emqx/test/emqx_packet_SUITE.erl +++ b/test/emqx_packet_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/apps/emqx/test/emqx_pd_SUITE.erl b/test/emqx_pd_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_pd_SUITE.erl rename to test/emqx_pd_SUITE.erl diff --git a/apps/emqx/test/emqx_plugins_SUITE.erl b/test/emqx_plugins_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_plugins_SUITE.erl rename to test/emqx_plugins_SUITE.erl index 9b7e22289..ad99209e6 100644 --- a/apps/emqx/test/emqx_plugins_SUITE.erl +++ b/test/emqx_plugins_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src diff --git a/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl similarity index 100% rename from apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl rename to test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl diff --git a/apps/emqx/test/emqx_pmon_SUITE.erl b/test/emqx_pmon_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_pmon_SUITE.erl rename to test/emqx_pmon_SUITE.erl diff --git a/apps/emqx/test/emqx_pool_SUITE.erl b/test/emqx_pool_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_pool_SUITE.erl rename to test/emqx_pool_SUITE.erl diff --git a/apps/emqx/test/emqx_pqueue_SUITE.erl b/test/emqx_pqueue_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_pqueue_SUITE.erl rename to test/emqx_pqueue_SUITE.erl diff --git a/apps/emqx/test/emqx_reason_codes_SUITE.erl b/test/emqx_reason_codes_SUITE.erl similarity index 96% rename from apps/emqx/test/emqx_reason_codes_SUITE.erl rename to test/emqx_reason_codes_SUITE.erl index 5ed810f24..027d6d85f 100644 --- a/apps/emqx/test/emqx_reason_codes_SUITE.erl +++ b/test/emqx_reason_codes_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_request_handler.erl b/test/emqx_request_handler.erl similarity index 98% rename from apps/emqx/test/emqx_request_handler.erl rename to test/emqx_request_handler.erl index c76e093c8..690d45d34 100644 --- a/apps/emqx/test/emqx_request_handler.erl +++ b/test/emqx_request_handler.erl @@ -18,7 +18,7 @@ -export([start_link/4, stop/1]). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -type qos() :: emqx_mqtt_types:qos_name() | emqx_mqtt_types:qos(). -type topic() :: emqx_topic:topic(). diff --git a/apps/emqx/test/emqx_request_responser_SUITE.erl b/test/emqx_request_responser_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_request_responser_SUITE.erl rename to test/emqx_request_responser_SUITE.erl index 67187ed3f..7d66c7760 100644 --- a/apps/emqx/test/emqx_request_responser_SUITE.erl +++ b/test/emqx_request_responser_SUITE.erl @@ -17,7 +17,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_request_sender.erl b/test/emqx_request_sender.erl similarity index 98% rename from apps/emqx/test/emqx_request_sender.erl rename to test/emqx_request_sender.erl index b07622bb9..aed845a42 100644 --- a/apps/emqx/test/emqx_request_sender.erl +++ b/test/emqx_request_sender.erl @@ -18,7 +18,7 @@ -export([start_link/3, stop/1, send/6]). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). start_link(ResponseTopic, QoS, Options0) -> Parent = self(), diff --git a/apps/emqx/test/emqx_router_SUITE.erl b/test/emqx_router_SUITE.erl similarity index 98% rename from apps/emqx/test/emqx_router_SUITE.erl rename to test/emqx_router_SUITE.erl index 06d310072..fb2d34ea7 100644 --- a/apps/emqx/test/emqx_router_SUITE.erl +++ b/test/emqx_router_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(R, emqx_router). diff --git a/apps/emqx/test/emqx_router_helper_SUITE.erl b/test/emqx_router_helper_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_router_helper_SUITE.erl rename to test/emqx_router_helper_SUITE.erl diff --git a/apps/emqx/test/emqx_sequence_SUITE.erl b/test/emqx_sequence_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_sequence_SUITE.erl rename to test/emqx_sequence_SUITE.erl diff --git a/apps/emqx/test/emqx_session_SUITE.erl b/test/emqx_session_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_session_SUITE.erl rename to test/emqx_session_SUITE.erl index 452e1d622..dd9611b71 100644 --- a/apps/emqx/test/emqx_session_SUITE.erl +++ b/test/emqx_session_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/apps/emqx/test/emqx_shared_sub_SUITE.erl b/test/emqx_shared_sub_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_shared_sub_SUITE.erl rename to test/emqx_shared_sub_SUITE.erl index c827a8fc2..218e8a073 100644 --- a/apps/emqx/test/emqx_shared_sub_SUITE.erl +++ b/test/emqx_shared_sub_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_stats_SUITE.erl b/test/emqx_stats_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_stats_SUITE.erl rename to test/emqx_stats_SUITE.erl diff --git a/apps/emqx/test/emqx_sup_SUITE.erl b/test/emqx_sup_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_sup_SUITE.erl rename to test/emqx_sup_SUITE.erl diff --git a/apps/emqx/test/emqx_sys_SUITE.erl b/test/emqx_sys_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_sys_SUITE.erl rename to test/emqx_sys_SUITE.erl diff --git a/apps/emqx/test/emqx_sys_mon_SUITE.erl b/test/emqx_sys_mon_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_sys_mon_SUITE.erl rename to test/emqx_sys_mon_SUITE.erl index 520c45e54..ef0e31957 100644 --- a/apps/emqx/test/emqx_sys_mon_SUITE.erl +++ b/test/emqx_sys_mon_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(SYSMON, emqx_sys_mon). diff --git a/apps/emqx/test/emqx_tables_SUITE.erl b/test/emqx_tables_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_tables_SUITE.erl rename to test/emqx_tables_SUITE.erl diff --git a/apps/emqx/test/emqx_takeover_SUITE.erl b/test/emqx_takeover_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_takeover_SUITE.erl rename to test/emqx_takeover_SUITE.erl index 98f258440..ca5ebb084 100644 --- a/apps/emqx/test/emqx_takeover_SUITE.erl +++ b/test/emqx_takeover_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/apps/emqx/test/emqx_topic_SUITE.erl b/test/emqx_topic_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_topic_SUITE.erl rename to test/emqx_topic_SUITE.erl diff --git a/apps/emqx/test/emqx_tracer_SUITE.erl b/test/emqx_tracer_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_tracer_SUITE.erl rename to test/emqx_tracer_SUITE.erl diff --git a/apps/emqx/test/emqx_trie_SUITE.erl b/test/emqx_trie_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_trie_SUITE.erl rename to test/emqx_trie_SUITE.erl index b3d7549f7..f1db3813c 100644 --- a/apps/emqx/test/emqx_trie_SUITE.erl +++ b/test/emqx_trie_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). +-include("emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(TRIE, emqx_trie). diff --git a/apps/emqx/test/emqx_vm_SUITE.erl b/test/emqx_vm_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_vm_SUITE.erl rename to test/emqx_vm_SUITE.erl diff --git a/apps/emqx/test/emqx_vm_mon_SUITE.erl b/test/emqx_vm_mon_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_vm_mon_SUITE.erl rename to test/emqx_vm_mon_SUITE.erl diff --git a/apps/emqx/test/emqx_ws_connection_SUITE.erl b/test/emqx_ws_connection_SUITE.erl similarity index 99% rename from apps/emqx/test/emqx_ws_connection_SUITE.erl rename to test/emqx_ws_connection_SUITE.erl index 83fbcb195..125b14a74 100644 --- a/apps/emqx/test/emqx_ws_connection_SUITE.erl +++ b/test/emqx_ws_connection_SUITE.erl @@ -16,8 +16,8 @@ -module(emqx_ws_connection_SUITE). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/apps/emqx/test/emqx_zone_SUITE.erl b/test/emqx_zone_SUITE.erl similarity index 100% rename from apps/emqx/test/emqx_zone_SUITE.erl rename to test/emqx_zone_SUITE.erl diff --git a/apps/emqx/test/mqtt_protocol_v5_SUITE.erl b/test/mqtt_protocol_v5_SUITE.erl similarity index 99% rename from apps/emqx/test/mqtt_protocol_v5_SUITE.erl rename to test/mqtt_protocol_v5_SUITE.erl index f171d0f67..50fc9c04d 100644 --- a/apps/emqx/test/mqtt_protocol_v5_SUITE.erl +++ b/test/mqtt_protocol_v5_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include_lib("emqx_libs/include/emqx.hrl"). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -import(lists, [nth/2]). diff --git a/apps/emqx/test/props/prop_emqx_base62.erl b/test/props/prop_emqx_base62.erl similarity index 100% rename from apps/emqx/test/props/prop_emqx_base62.erl rename to test/props/prop_emqx_base62.erl diff --git a/apps/emqx/test/props/prop_emqx_frame.erl b/test/props/prop_emqx_frame.erl similarity index 98% rename from apps/emqx/test/props/prop_emqx_frame.erl rename to test/props/prop_emqx_frame.erl index da763f8f5..731e4ba1e 100644 --- a/apps/emqx/test/props/prop_emqx_frame.erl +++ b/test/props/prop_emqx_frame.erl @@ -16,7 +16,7 @@ -module(prop_emqx_frame). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("proper/include/proper.hrl"). %%-------------------------------------------------------------------- diff --git a/apps/emqx/test/props/prop_emqx_json.erl b/test/props/prop_emqx_json.erl similarity index 100% rename from apps/emqx/test/props/prop_emqx_json.erl rename to test/props/prop_emqx_json.erl diff --git a/apps/emqx/test/props/prop_emqx_psk.erl b/test/props/prop_emqx_psk.erl similarity index 100% rename from apps/emqx/test/props/prop_emqx_psk.erl rename to test/props/prop_emqx_psk.erl diff --git a/apps/emqx/test/props/prop_emqx_reason_codes.erl b/test/props/prop_emqx_reason_codes.erl similarity index 98% rename from apps/emqx/test/props/prop_emqx_reason_codes.erl rename to test/props/prop_emqx_reason_codes.erl index 2b90d2e43..f6f5e81b0 100644 --- a/apps/emqx/test/props/prop_emqx_reason_codes.erl +++ b/test/props/prop_emqx_reason_codes.erl @@ -16,7 +16,7 @@ -module(prop_emqx_reason_codes). --include_lib("emqx_libs/include/emqx_mqtt.hrl"). +-include("emqx_mqtt.hrl"). -include_lib("proper/include/proper.hrl"). %%-------------------------------------------------------------------- diff --git a/apps/emqx/test/props/prop_emqx_rpc.erl b/test/props/prop_emqx_rpc.erl similarity index 100% rename from apps/emqx/test/props/prop_emqx_rpc.erl rename to test/props/prop_emqx_rpc.erl diff --git a/apps/emqx/test/props/prop_emqx_sys.erl b/test/props/prop_emqx_sys.erl similarity index 100% rename from apps/emqx/test/props/prop_emqx_sys.erl rename to test/props/prop_emqx_sys.erl