diff --git a/elvis.config b/elvis.config index bb551e81a..bed4ba2e8 100644 --- a/elvis.config +++ b/elvis.config @@ -5,7 +5,7 @@ [ {config, [ - #{dirs => ["src", "apps/**/src", "lib-opensource/**/src"], + #{dirs => ["src", "apps/**/src", "lib-ce/**/src"], filter => "*.erl", ruleset => erl_files, rules => [ @@ -16,7 +16,7 @@ ]}} ] }, - #{dirs => ["test", "apps/**/test", "lib-opensource/**/src"], + #{dirs => ["test", "apps/**/test", "lib-ce/**/src"], filter => "*.erl", rules => [ {elvis_text_style, line_length, #{ limit => 100 diff --git a/get-dashboard.sh b/get-dashboard.sh index 885a68f77..991f2b39d 100755 --- a/get-dashboard.sh +++ b/get-dashboard.sh @@ -10,9 +10,9 @@ cd -P -- "$(dirname -- "$0")" DOWNLOAD_URL='https://github.com/emqx/emqx-dashboard-frontend/releases/download' if [ "$EMQX_ENTERPRISE" = 'true' ] || [ "$EMQX_ENTERPRISE" == '1' ]; then - DASHBOARD_PATH='lib-enterprise/emqx_dashboard/priv' + DASHBOARD_PATH='lib-ee/emqx_dashboard/priv' else - DASHBOARD_PATH='lib-opensource/emqx_dashboard/priv' + DASHBOARD_PATH='lib-ce/emqx_dashboard/priv' fi case $(uname) in diff --git a/lib-opensource/emqx_dashboard/.gitignore b/lib-ce/emqx_dashboard/.gitignore similarity index 100% rename from lib-opensource/emqx_dashboard/.gitignore rename to lib-ce/emqx_dashboard/.gitignore diff --git a/lib-opensource/emqx_dashboard/README.md b/lib-ce/emqx_dashboard/README.md similarity index 100% rename from lib-opensource/emqx_dashboard/README.md rename to lib-ce/emqx_dashboard/README.md diff --git a/lib-opensource/emqx_dashboard/etc/emqx_dashboard.conf b/lib-ce/emqx_dashboard/etc/emqx_dashboard.conf similarity index 100% rename from lib-opensource/emqx_dashboard/etc/emqx_dashboard.conf rename to lib-ce/emqx_dashboard/etc/emqx_dashboard.conf diff --git a/lib-opensource/emqx_dashboard/include/emqx_dashboard.hrl b/lib-ce/emqx_dashboard/include/emqx_dashboard.hrl similarity index 100% rename from lib-opensource/emqx_dashboard/include/emqx_dashboard.hrl rename to lib-ce/emqx_dashboard/include/emqx_dashboard.hrl diff --git a/lib-opensource/emqx_dashboard/priv/emqx_dashboard.schema b/lib-ce/emqx_dashboard/priv/emqx_dashboard.schema similarity index 100% rename from lib-opensource/emqx_dashboard/priv/emqx_dashboard.schema rename to lib-ce/emqx_dashboard/priv/emqx_dashboard.schema diff --git a/lib-opensource/emqx_dashboard/rebar.config b/lib-ce/emqx_dashboard/rebar.config similarity index 100% rename from lib-opensource/emqx_dashboard/rebar.config rename to lib-ce/emqx_dashboard/rebar.config diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard.app.src rename to lib-ce/emqx_dashboard/src/emqx_dashboard.app.src diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard.erl diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard_admin.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard_admin.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard_api.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard_api.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard_app.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard_app.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard_cli.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard_cli.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl diff --git a/lib-opensource/emqx_dashboard/src/emqx_dashboard_sup.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl similarity index 100% rename from lib-opensource/emqx_dashboard/src/emqx_dashboard_sup.erl rename to lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl diff --git a/lib-opensource/emqx_dashboard/test/.placeholder b/lib-ce/emqx_dashboard/test/.placeholder similarity index 100% rename from lib-opensource/emqx_dashboard/test/.placeholder rename to lib-ce/emqx_dashboard/test/.placeholder diff --git a/lib-opensource/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl similarity index 100% rename from lib-opensource/emqx_dashboard/test/emqx_dashboard_SUITE.erl rename to lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl diff --git a/lib-opensource/emqx_management/.gitignore b/lib-ce/emqx_management/.gitignore similarity index 100% rename from lib-opensource/emqx_management/.gitignore rename to lib-ce/emqx_management/.gitignore diff --git a/lib-opensource/emqx_management/README.md b/lib-ce/emqx_management/README.md similarity index 100% rename from lib-opensource/emqx_management/README.md rename to lib-ce/emqx_management/README.md diff --git a/lib-opensource/emqx_management/etc/emqx_management.conf b/lib-ce/emqx_management/etc/emqx_management.conf similarity index 100% rename from lib-opensource/emqx_management/etc/emqx_management.conf rename to lib-ce/emqx_management/etc/emqx_management.conf diff --git a/lib-opensource/emqx_management/include/emqx_mgmt.hrl b/lib-ce/emqx_management/include/emqx_mgmt.hrl similarity index 100% rename from lib-opensource/emqx_management/include/emqx_mgmt.hrl rename to lib-ce/emqx_management/include/emqx_mgmt.hrl diff --git a/lib-opensource/emqx_management/priv/emqx_management.schema b/lib-ce/emqx_management/priv/emqx_management.schema similarity index 100% rename from lib-opensource/emqx_management/priv/emqx_management.schema rename to lib-ce/emqx_management/priv/emqx_management.schema diff --git a/lib-opensource/emqx_management/rebar.config b/lib-ce/emqx_management/rebar.config similarity index 100% rename from lib-opensource/emqx_management/rebar.config rename to lib-ce/emqx_management/rebar.config diff --git a/lib-opensource/emqx_management/src/emqx_management.app.src b/lib-ce/emqx_management/src/emqx_management.app.src similarity index 100% rename from lib-opensource/emqx_management/src/emqx_management.app.src rename to lib-ce/emqx_management/src/emqx_management.app.src diff --git a/lib-opensource/emqx_management/src/emqx_mgmt.erl b/lib-ce/emqx_management/src/emqx_mgmt.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt.erl rename to lib-ce/emqx_management/src/emqx_mgmt.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api.erl b/lib-ce/emqx_management/src/emqx_mgmt_api.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_alarms.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_alarms.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_apps.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_apps.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_banned.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_banned.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_brokers.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_brokers.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_clients.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_clients.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_data.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_data.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_data.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_data.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_listeners.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_listeners.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_metrics.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_metrics.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_modules.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_modules.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_modules.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_modules.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_nodes.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_nodes.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_plugins.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_plugins.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_pubsub.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_pubsub.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_routes.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_routes.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_stats.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_stats.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_subscriptions.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_api_topic_metrics.erl b/lib-ce/emqx_management/src/emqx_mgmt_api_topic_metrics.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_api_topic_metrics.erl rename to lib-ce/emqx_management/src/emqx_mgmt_api_topic_metrics.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_app.erl b/lib-ce/emqx_management/src/emqx_mgmt_app.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_app.erl rename to lib-ce/emqx_management/src/emqx_mgmt_app.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_auth.erl b/lib-ce/emqx_management/src/emqx_mgmt_auth.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_auth.erl rename to lib-ce/emqx_management/src/emqx_mgmt_auth.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_cli.erl b/lib-ce/emqx_management/src/emqx_mgmt_cli.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_cli.erl rename to lib-ce/emqx_management/src/emqx_mgmt_cli.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_http.erl b/lib-ce/emqx_management/src/emqx_mgmt_http.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_http.erl rename to lib-ce/emqx_management/src/emqx_mgmt_http.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_sup.erl b/lib-ce/emqx_management/src/emqx_mgmt_sup.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_sup.erl rename to lib-ce/emqx_management/src/emqx_mgmt_sup.erl diff --git a/lib-opensource/emqx_management/src/emqx_mgmt_util.erl b/lib-ce/emqx_management/src/emqx_mgmt_util.erl similarity index 100% rename from lib-opensource/emqx_management/src/emqx_mgmt_util.erl rename to lib-ce/emqx_management/src/emqx_mgmt_util.erl diff --git a/lib-opensource/emqx_management/test/emqx_mgmt_SUITE.erl b/lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl similarity index 100% rename from lib-opensource/emqx_management/test/emqx_mgmt_SUITE.erl rename to lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl diff --git a/lib-opensource/emqx_management/test/emqx_mgmt_api_SUITE.erl b/lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl similarity index 100% rename from lib-opensource/emqx_management/test/emqx_mgmt_api_SUITE.erl rename to lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl diff --git a/lib-opensource/emqx_management/test/etc/emqx_management.conf b/lib-ce/emqx_management/test/etc/emqx_management.conf similarity index 100% rename from lib-opensource/emqx_management/test/etc/emqx_management.conf rename to lib-ce/emqx_management/test/etc/emqx_management.conf diff --git a/lib-opensource/emqx_management/test/etc/emqx_reloader.conf b/lib-ce/emqx_management/test/etc/emqx_reloader.conf similarity index 100% rename from lib-opensource/emqx_management/test/etc/emqx_reloader.conf rename to lib-ce/emqx_management/test/etc/emqx_reloader.conf diff --git a/lib-opensource/emqx_management/test/rfc6455_client.erl b/lib-ce/emqx_management/test/rfc6455_client.erl similarity index 100% rename from lib-opensource/emqx_management/test/rfc6455_client.erl rename to lib-ce/emqx_management/test/rfc6455_client.erl diff --git a/lib-opensource/emqx_modules/etc/emqx_modules.conf b/lib-ce/emqx_modules/etc/emqx_modules.conf similarity index 100% rename from lib-opensource/emqx_modules/etc/emqx_modules.conf rename to lib-ce/emqx_modules/etc/emqx_modules.conf diff --git a/lib-opensource/emqx_modules/priv/emqx_modules.schema b/lib-ce/emqx_modules/priv/emqx_modules.schema similarity index 100% rename from lib-opensource/emqx_modules/priv/emqx_modules.schema rename to lib-ce/emqx_modules/priv/emqx_modules.schema diff --git a/lib-opensource/emqx_modules/rebar.config b/lib-ce/emqx_modules/rebar.config similarity index 100% rename from lib-opensource/emqx_modules/rebar.config rename to lib-ce/emqx_modules/rebar.config diff --git a/lib-opensource/emqx_modules/src/emqx_mod_acl_internal.erl b/lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_acl_internal.erl rename to lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_delayed.erl b/lib-ce/emqx_modules/src/emqx_mod_delayed.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_delayed.erl rename to lib-ce/emqx_modules/src/emqx_mod_delayed.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_presence.erl b/lib-ce/emqx_modules/src/emqx_mod_presence.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_presence.erl rename to lib-ce/emqx_modules/src/emqx_mod_presence.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_rewrite.erl b/lib-ce/emqx_modules/src/emqx_mod_rewrite.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_rewrite.erl rename to lib-ce/emqx_modules/src/emqx_mod_rewrite.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_subscription.erl b/lib-ce/emqx_modules/src/emqx_mod_subscription.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_subscription.erl rename to lib-ce/emqx_modules/src/emqx_mod_subscription.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_sup.erl b/lib-ce/emqx_modules/src/emqx_mod_sup.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_sup.erl rename to lib-ce/emqx_modules/src/emqx_mod_sup.erl diff --git a/lib-opensource/emqx_modules/src/emqx_mod_topic_metrics.erl b/lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_mod_topic_metrics.erl rename to lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl diff --git a/lib-opensource/emqx_modules/src/emqx_modules.app.src b/lib-ce/emqx_modules/src/emqx_modules.app.src similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_modules.app.src rename to lib-ce/emqx_modules/src/emqx_modules.app.src diff --git a/lib-opensource/emqx_modules/src/emqx_modules.erl b/lib-ce/emqx_modules/src/emqx_modules.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_modules.erl rename to lib-ce/emqx_modules/src/emqx_modules.erl diff --git a/lib-opensource/emqx_modules/src/emqx_modules_app.erl b/lib-ce/emqx_modules/src/emqx_modules_app.erl similarity index 100% rename from lib-opensource/emqx_modules/src/emqx_modules_app.erl rename to lib-ce/emqx_modules/src/emqx_modules_app.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_delayed_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_delayed_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_presence_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_presence_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_rewrite_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_rewrite_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_subscription_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_subscription_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_sup_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_sup_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl b/lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl diff --git a/lib-opensource/emqx_modules/test/emqx_modules_SUITE.erl b/lib-ce/emqx_modules/test/emqx_modules_SUITE.erl similarity index 100% rename from lib-opensource/emqx_modules/test/emqx_modules_SUITE.erl rename to lib-ce/emqx_modules/test/emqx_modules_SUITE.erl diff --git a/lib-opensource/emqx_telemetry/.gitignore b/lib-ce/emqx_telemetry/.gitignore similarity index 100% rename from lib-opensource/emqx_telemetry/.gitignore rename to lib-ce/emqx_telemetry/.gitignore diff --git a/lib-opensource/emqx_telemetry/README.md b/lib-ce/emqx_telemetry/README.md similarity index 100% rename from lib-opensource/emqx_telemetry/README.md rename to lib-ce/emqx_telemetry/README.md diff --git a/lib-opensource/emqx_telemetry/etc/emqx_telemetry.conf b/lib-ce/emqx_telemetry/etc/emqx_telemetry.conf similarity index 100% rename from lib-opensource/emqx_telemetry/etc/emqx_telemetry.conf rename to lib-ce/emqx_telemetry/etc/emqx_telemetry.conf diff --git a/lib-opensource/emqx_telemetry/priv/emqx_telemetry.schema b/lib-ce/emqx_telemetry/priv/emqx_telemetry.schema similarity index 100% rename from lib-opensource/emqx_telemetry/priv/emqx_telemetry.schema rename to lib-ce/emqx_telemetry/priv/emqx_telemetry.schema diff --git a/lib-opensource/emqx_telemetry/rebar.config b/lib-ce/emqx_telemetry/rebar.config similarity index 100% rename from lib-opensource/emqx_telemetry/rebar.config rename to lib-ce/emqx_telemetry/rebar.config diff --git a/lib-opensource/emqx_telemetry/src/emqx_telemetry.app.src b/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src similarity index 100% rename from lib-opensource/emqx_telemetry/src/emqx_telemetry.app.src rename to lib-ce/emqx_telemetry/src/emqx_telemetry.app.src diff --git a/lib-opensource/emqx_telemetry/src/emqx_telemetry.erl b/lib-ce/emqx_telemetry/src/emqx_telemetry.erl similarity index 100% rename from lib-opensource/emqx_telemetry/src/emqx_telemetry.erl rename to lib-ce/emqx_telemetry/src/emqx_telemetry.erl diff --git a/lib-opensource/emqx_telemetry/src/emqx_telemetry_api.erl b/lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl similarity index 100% rename from lib-opensource/emqx_telemetry/src/emqx_telemetry_api.erl rename to lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl diff --git a/lib-opensource/emqx_telemetry/src/emqx_telemetry_app.erl b/lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl similarity index 100% rename from lib-opensource/emqx_telemetry/src/emqx_telemetry_app.erl rename to lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl diff --git a/lib-opensource/emqx_telemetry/src/emqx_telemetry_sup.erl b/lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl similarity index 100% rename from lib-opensource/emqx_telemetry/src/emqx_telemetry_sup.erl rename to lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl diff --git a/lib-opensource/emqx_telemetry/test/emqx_telemetry_SUITE.erl b/lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl similarity index 100% rename from lib-opensource/emqx_telemetry/test/emqx_telemetry_SUITE.erl rename to lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl diff --git a/rebar.config.erl b/rebar.config.erl index 123c39af5..2365e9999 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -28,8 +28,8 @@ config() -> extra_lib_dir() -> EnterpriseFlag = os:getenv("EMQX_ENTERPRISE"), case EnterpriseFlag =:= "true" orelse EnterpriseFlag =:= "1" of - true -> "lib-enterprise"; - false -> "lib-opensource" + true -> "lib-ee"; + false -> "lib-ce" end. project_app_dirs() -> @@ -279,7 +279,7 @@ provide_bcrypt_release(ReleaseType) -> %% rebar3 does not handle umberella project's cross-app parse_transform well compile_and_load_pase_transforms(Dir) -> PtFiles = - [ "lib-opensource/emqx_rule_engine/src/emqx_rule_actions_trans.erl" + [ "apps/emqx_rule_engine/src/emqx_rule_actions_trans.erl" ], CompileOpts = [verbose,report_errors,report_warnings,return_errors,debug_info], lists:foreach(fun(PtFile) -> {ok, _Mod} = compile:file(path(Dir, PtFile), CompileOpts) end, PtFiles). diff --git a/sync-apps.sh b/sync-apps.sh index e5c36228f..1e8da78cc 100755 --- a/sync-apps.sh +++ b/sync-apps.sh @@ -15,17 +15,17 @@ apps=( "emqx_auth_redis" "emqx_bridge_mqtt" "emqx_coap" -# "emqx_dashboard" # moved to lib-opensource +# "emqx_dashboard" # moved to lib-ce "emqx_exhook" "emqx_exproto" "emqx_lua_hook" "emqx_lwm2m" -# "emqx_management" # moved to lib-opensource +# "emqx_management" # moved to lib-ce "emqx_prometheus" "emqx_psk_file" "emqx_recon" "emqx_retainer" -# "emqx_rule_engine" # moved to lib-opensource +# "emqx_rule_engine" # moved to lib-ce "emqx_sasl" "emqx_sn" "emqx_stomp"