فهرست منبع

chore(build): rename lib-opensource to lib-ce for shorter name

Zaiming Shi 5 سال پیش
والد
کامیت
aed58a14ee
87فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 2 2
      elvis.config
  2. 2 2
      get-dashboard.sh
  3. 0 0
      lib-ce/emqx_dashboard/.gitignore
  4. 0 0
      lib-ce/emqx_dashboard/README.md
  5. 0 0
      lib-ce/emqx_dashboard/etc/emqx_dashboard.conf
  6. 0 0
      lib-ce/emqx_dashboard/include/emqx_dashboard.hrl
  7. 0 0
      lib-ce/emqx_dashboard/priv/emqx_dashboard.schema
  8. 0 0
      lib-ce/emqx_dashboard/rebar.config
  9. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
  10. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard.erl
  11. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl
  12. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl
  13. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl
  14. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl
  15. 0 0
      lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl
  16. 0 0
      lib-ce/emqx_dashboard/test/.placeholder
  17. 0 0
      lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl
  18. 0 0
      lib-ce/emqx_management/.gitignore
  19. 0 0
      lib-ce/emqx_management/README.md
  20. 0 0
      lib-ce/emqx_management/etc/emqx_management.conf
  21. 0 0
      lib-ce/emqx_management/include/emqx_mgmt.hrl
  22. 0 0
      lib-ce/emqx_management/priv/emqx_management.schema
  23. 0 0
      lib-ce/emqx_management/rebar.config
  24. 0 0
      lib-ce/emqx_management/src/emqx_management.app.src
  25. 0 0
      lib-ce/emqx_management/src/emqx_mgmt.erl
  26. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api.erl
  27. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl
  28. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl
  29. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl
  30. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl
  31. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl
  32. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_data.erl
  33. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl
  34. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl
  35. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_modules.erl
  36. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl
  37. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl
  38. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl
  39. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl
  40. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl
  41. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl
  42. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_api_topic_metrics.erl
  43. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_app.erl
  44. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_auth.erl
  45. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_cli.erl
  46. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_http.erl
  47. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_sup.erl
  48. 0 0
      lib-ce/emqx_management/src/emqx_mgmt_util.erl
  49. 0 0
      lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl
  50. 0 0
      lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl
  51. 0 0
      lib-ce/emqx_management/test/etc/emqx_management.conf
  52. 0 0
      lib-ce/emqx_management/test/etc/emqx_reloader.conf
  53. 0 0
      lib-ce/emqx_management/test/rfc6455_client.erl
  54. 0 0
      lib-ce/emqx_modules/etc/emqx_modules.conf
  55. 0 0
      lib-ce/emqx_modules/priv/emqx_modules.schema
  56. 0 0
      lib-ce/emqx_modules/rebar.config
  57. 0 0
      lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl
  58. 0 0
      lib-ce/emqx_modules/src/emqx_mod_delayed.erl
  59. 0 0
      lib-ce/emqx_modules/src/emqx_mod_presence.erl
  60. 0 0
      lib-ce/emqx_modules/src/emqx_mod_rewrite.erl
  61. 0 0
      lib-ce/emqx_modules/src/emqx_mod_subscription.erl
  62. 0 0
      lib-ce/emqx_modules/src/emqx_mod_sup.erl
  63. 0 0
      lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl
  64. 0 0
      lib-ce/emqx_modules/src/emqx_modules.app.src
  65. 0 0
      lib-ce/emqx_modules/src/emqx_modules.erl
  66. 0 0
      lib-ce/emqx_modules/src/emqx_modules_app.erl
  67. 0 0
      lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl
  68. 0 0
      lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl
  69. 0 0
      lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl
  70. 0 0
      lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl
  71. 0 0
      lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl
  72. 0 0
      lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl
  73. 0 0
      lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl
  74. 0 0
      lib-ce/emqx_modules/test/emqx_modules_SUITE.erl
  75. 0 0
      lib-ce/emqx_telemetry/.gitignore
  76. 0 0
      lib-ce/emqx_telemetry/README.md
  77. 0 0
      lib-ce/emqx_telemetry/etc/emqx_telemetry.conf
  78. 0 0
      lib-ce/emqx_telemetry/priv/emqx_telemetry.schema
  79. 0 0
      lib-ce/emqx_telemetry/rebar.config
  80. 0 0
      lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
  81. 0 0
      lib-ce/emqx_telemetry/src/emqx_telemetry.erl
  82. 0 0
      lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl
  83. 0 0
      lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl
  84. 0 0
      lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl
  85. 0 0
      lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl
  86. 3 3
      rebar.config.erl
  87. 3 3
      sync-apps.sh

+ 2 - 2
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

+ 2 - 2
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

lib-opensource/emqx_dashboard/.gitignore → lib-ce/emqx_dashboard/.gitignore


lib-opensource/emqx_dashboard/README.md → lib-ce/emqx_dashboard/README.md


lib-opensource/emqx_dashboard/etc/emqx_dashboard.conf → lib-ce/emqx_dashboard/etc/emqx_dashboard.conf


lib-opensource/emqx_dashboard/include/emqx_dashboard.hrl → lib-ce/emqx_dashboard/include/emqx_dashboard.hrl


lib-opensource/emqx_dashboard/priv/emqx_dashboard.schema → lib-ce/emqx_dashboard/priv/emqx_dashboard.schema


lib-opensource/emqx_dashboard/rebar.config → lib-ce/emqx_dashboard/rebar.config


lib-opensource/emqx_dashboard/src/emqx_dashboard.app.src → lib-ce/emqx_dashboard/src/emqx_dashboard.app.src


lib-opensource/emqx_dashboard/src/emqx_dashboard.erl → lib-ce/emqx_dashboard/src/emqx_dashboard.erl


lib-opensource/emqx_dashboard/src/emqx_dashboard_admin.erl → lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl


lib-opensource/emqx_dashboard/src/emqx_dashboard_api.erl → lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl


lib-opensource/emqx_dashboard/src/emqx_dashboard_app.erl → lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl


lib-opensource/emqx_dashboard/src/emqx_dashboard_cli.erl → lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl


lib-opensource/emqx_dashboard/src/emqx_dashboard_sup.erl → lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl


lib-opensource/emqx_dashboard/test/.placeholder → lib-ce/emqx_dashboard/test/.placeholder


lib-opensource/emqx_dashboard/test/emqx_dashboard_SUITE.erl → lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl


lib-opensource/emqx_management/.gitignore → lib-ce/emqx_management/.gitignore


lib-opensource/emqx_management/README.md → lib-ce/emqx_management/README.md


lib-opensource/emqx_management/etc/emqx_management.conf → lib-ce/emqx_management/etc/emqx_management.conf


lib-opensource/emqx_management/include/emqx_mgmt.hrl → lib-ce/emqx_management/include/emqx_mgmt.hrl


lib-opensource/emqx_management/priv/emqx_management.schema → lib-ce/emqx_management/priv/emqx_management.schema


lib-opensource/emqx_management/rebar.config → lib-ce/emqx_management/rebar.config


lib-opensource/emqx_management/src/emqx_management.app.src → lib-ce/emqx_management/src/emqx_management.app.src


lib-opensource/emqx_management/src/emqx_mgmt.erl → lib-ce/emqx_management/src/emqx_mgmt.erl


lib-opensource/emqx_management/src/emqx_mgmt_api.erl → lib-ce/emqx_management/src/emqx_mgmt_api.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_alarms.erl → lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_apps.erl → lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_banned.erl → lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_brokers.erl → lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_clients.erl → lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_data.erl → lib-ce/emqx_management/src/emqx_mgmt_api_data.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_listeners.erl → lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_metrics.erl → lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_modules.erl → lib-ce/emqx_management/src/emqx_mgmt_api_modules.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_nodes.erl → lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_plugins.erl → lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_pubsub.erl → lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_routes.erl → lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_stats.erl → lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_subscriptions.erl → lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl


lib-opensource/emqx_management/src/emqx_mgmt_api_topic_metrics.erl → lib-ce/emqx_management/src/emqx_mgmt_api_topic_metrics.erl


lib-opensource/emqx_management/src/emqx_mgmt_app.erl → lib-ce/emqx_management/src/emqx_mgmt_app.erl


lib-opensource/emqx_management/src/emqx_mgmt_auth.erl → lib-ce/emqx_management/src/emqx_mgmt_auth.erl


lib-opensource/emqx_management/src/emqx_mgmt_cli.erl → lib-ce/emqx_management/src/emqx_mgmt_cli.erl


lib-opensource/emqx_management/src/emqx_mgmt_http.erl → lib-ce/emqx_management/src/emqx_mgmt_http.erl


lib-opensource/emqx_management/src/emqx_mgmt_sup.erl → lib-ce/emqx_management/src/emqx_mgmt_sup.erl


lib-opensource/emqx_management/src/emqx_mgmt_util.erl → lib-ce/emqx_management/src/emqx_mgmt_util.erl


lib-opensource/emqx_management/test/emqx_mgmt_SUITE.erl → lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl


lib-opensource/emqx_management/test/emqx_mgmt_api_SUITE.erl → lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl


lib-opensource/emqx_management/test/etc/emqx_management.conf → lib-ce/emqx_management/test/etc/emqx_management.conf


lib-opensource/emqx_management/test/etc/emqx_reloader.conf → lib-ce/emqx_management/test/etc/emqx_reloader.conf


lib-opensource/emqx_management/test/rfc6455_client.erl → lib-ce/emqx_management/test/rfc6455_client.erl


lib-opensource/emqx_modules/etc/emqx_modules.conf → lib-ce/emqx_modules/etc/emqx_modules.conf


lib-opensource/emqx_modules/priv/emqx_modules.schema → lib-ce/emqx_modules/priv/emqx_modules.schema


lib-opensource/emqx_modules/rebar.config → lib-ce/emqx_modules/rebar.config


lib-opensource/emqx_modules/src/emqx_mod_acl_internal.erl → lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl


lib-opensource/emqx_modules/src/emqx_mod_delayed.erl → lib-ce/emqx_modules/src/emqx_mod_delayed.erl


lib-opensource/emqx_modules/src/emqx_mod_presence.erl → lib-ce/emqx_modules/src/emqx_mod_presence.erl


lib-opensource/emqx_modules/src/emqx_mod_rewrite.erl → lib-ce/emqx_modules/src/emqx_mod_rewrite.erl


lib-opensource/emqx_modules/src/emqx_mod_subscription.erl → lib-ce/emqx_modules/src/emqx_mod_subscription.erl


lib-opensource/emqx_modules/src/emqx_mod_sup.erl → lib-ce/emqx_modules/src/emqx_mod_sup.erl


lib-opensource/emqx_modules/src/emqx_mod_topic_metrics.erl → lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl


lib-opensource/emqx_modules/src/emqx_modules.app.src → lib-ce/emqx_modules/src/emqx_modules.app.src


lib-opensource/emqx_modules/src/emqx_modules.erl → lib-ce/emqx_modules/src/emqx_modules.erl


lib-opensource/emqx_modules/src/emqx_modules_app.erl → lib-ce/emqx_modules/src/emqx_modules_app.erl


lib-opensource/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_delayed_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_presence_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_rewrite_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_subscription_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_sup_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl


lib-opensource/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl → lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl


lib-opensource/emqx_modules/test/emqx_modules_SUITE.erl → lib-ce/emqx_modules/test/emqx_modules_SUITE.erl


lib-opensource/emqx_telemetry/.gitignore → lib-ce/emqx_telemetry/.gitignore


lib-opensource/emqx_telemetry/README.md → lib-ce/emqx_telemetry/README.md


lib-opensource/emqx_telemetry/etc/emqx_telemetry.conf → lib-ce/emqx_telemetry/etc/emqx_telemetry.conf


lib-opensource/emqx_telemetry/priv/emqx_telemetry.schema → lib-ce/emqx_telemetry/priv/emqx_telemetry.schema


lib-opensource/emqx_telemetry/rebar.config → lib-ce/emqx_telemetry/rebar.config


lib-opensource/emqx_telemetry/src/emqx_telemetry.app.src → lib-ce/emqx_telemetry/src/emqx_telemetry.app.src


lib-opensource/emqx_telemetry/src/emqx_telemetry.erl → lib-ce/emqx_telemetry/src/emqx_telemetry.erl


lib-opensource/emqx_telemetry/src/emqx_telemetry_api.erl → lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl


lib-opensource/emqx_telemetry/src/emqx_telemetry_app.erl → lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl


lib-opensource/emqx_telemetry/src/emqx_telemetry_sup.erl → lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl


lib-opensource/emqx_telemetry/test/emqx_telemetry_SUITE.erl → lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl


+ 3 - 3
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).

+ 3 - 3
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"