Browse Source

chore: move root level src, test, include, priv and etc to apps/emqx

Zaiming Shi 4 years ago
parent
commit
1715b87dce
100 changed files with 49 additions and 0 deletions
  1. 0 0
      apps/emqx/etc/BUILT_ON
  2. 0 0
      apps/emqx/etc/acl.conf
  3. 0 0
      apps/emqx/etc/acl.conf.paho
  4. 0 0
      apps/emqx/etc/certs/README
  5. 0 0
      apps/emqx/etc/certs/cacert.pem
  6. 0 0
      apps/emqx/etc/certs/cert.pem
  7. 0 0
      apps/emqx/etc/certs/client-cert.pem
  8. 0 0
      apps/emqx/etc/certs/client-key.pem
  9. 0 0
      apps/emqx/etc/certs/key.pem
  10. 0 0
      apps/emqx/etc/emqx.conf
  11. 0 0
      apps/emqx/etc/emqx_cloud/vm.args
  12. 0 0
      apps/emqx/etc/emqx_edge/vm.args
  13. 0 0
      apps/emqx/etc/ssl_dist.conf
  14. 0 0
      apps/emqx/include/emqx.hrl
  15. 0 0
      apps/emqx/include/emqx_mqtt.hrl
  16. 0 0
      apps/emqx/include/emqx_release.hrl
  17. 0 0
      apps/emqx/include/logger.hrl
  18. 0 0
      apps/emqx/include/types.hrl
  19. 38 0
      apps/emqx/rebar.config
  20. 11 0
      apps/emqx/rebar.config.script
  21. 0 0
      apps/emqx/src/emqx.app.src
  22. 0 0
      apps/emqx/src/emqx.appup.src
  23. 0 0
      apps/emqx/src/emqx.erl
  24. 0 0
      apps/emqx/src/emqx_access_control.erl
  25. 0 0
      apps/emqx/src/emqx_access_rule.erl
  26. 0 0
      apps/emqx/src/emqx_acl_cache.erl
  27. 0 0
      apps/emqx/src/emqx_alarm.erl
  28. 0 0
      apps/emqx/src/emqx_alarm_handler.erl
  29. 0 0
      apps/emqx/src/emqx_app.erl
  30. 0 0
      apps/emqx/src/emqx_banned.erl
  31. 0 0
      apps/emqx/src/emqx_base62.erl
  32. 0 0
      apps/emqx/src/emqx_batch.erl
  33. 0 0
      apps/emqx/src/emqx_boot.erl
  34. 0 0
      apps/emqx/src/emqx_broker.erl
  35. 0 0
      apps/emqx/src/emqx_broker_bench.erl
  36. 0 0
      apps/emqx/src/emqx_broker_helper.erl
  37. 0 0
      apps/emqx/src/emqx_broker_sup.erl
  38. 0 0
      apps/emqx/src/emqx_channel.erl
  39. 0 0
      apps/emqx/src/emqx_cm.erl
  40. 0 0
      apps/emqx/src/emqx_cm_locker.erl
  41. 0 0
      apps/emqx/src/emqx_cm_registry.erl
  42. 0 0
      apps/emqx/src/emqx_cm_sup.erl
  43. 0 0
      apps/emqx/src/emqx_congestion.erl
  44. 0 0
      apps/emqx/src/emqx_connection.erl
  45. 0 0
      apps/emqx/src/emqx_ctl.erl
  46. 0 0
      apps/emqx/src/emqx_flapping.erl
  47. 0 0
      apps/emqx/src/emqx_frame.erl
  48. 0 0
      apps/emqx/src/emqx_gc.erl
  49. 0 0
      apps/emqx/src/emqx_gen_mod.erl
  50. 0 0
      apps/emqx/src/emqx_global_gc.erl
  51. 0 0
      apps/emqx/src/emqx_guid.erl
  52. 0 0
      apps/emqx/src/emqx_hooks.erl
  53. 0 0
      apps/emqx/src/emqx_inflight.erl
  54. 0 0
      apps/emqx/src/emqx_json.erl
  55. 0 0
      apps/emqx/src/emqx_keepalive.erl
  56. 0 0
      apps/emqx/src/emqx_kernel_sup.erl
  57. 0 0
      apps/emqx/src/emqx_limiter.erl
  58. 0 0
      apps/emqx/src/emqx_listeners.erl
  59. 0 0
      apps/emqx/src/emqx_logger.erl
  60. 0 0
      apps/emqx/src/emqx_logger_jsonfmt.erl
  61. 0 0
      apps/emqx/src/emqx_logger_textfmt.erl
  62. 0 0
      apps/emqx/src/emqx_message.erl
  63. 0 0
      apps/emqx/src/emqx_metrics.erl
  64. 0 0
      apps/emqx/src/emqx_misc.erl
  65. 0 0
      apps/emqx/src/emqx_mountpoint.erl
  66. 0 0
      apps/emqx/src/emqx_mqtt_caps.erl
  67. 0 0
      apps/emqx/src/emqx_mqtt_props.erl
  68. 0 0
      apps/emqx/src/emqx_mqueue.erl
  69. 0 0
      apps/emqx/src/emqx_node_dump.erl
  70. 0 0
      apps/emqx/src/emqx_os_mon.erl
  71. 0 0
      apps/emqx/src/emqx_packet.erl
  72. 0 0
      apps/emqx/src/emqx_passwd.erl
  73. 0 0
      apps/emqx/src/emqx_pd.erl
  74. 0 0
      apps/emqx/src/emqx_plugins.erl
  75. 0 0
      apps/emqx/src/emqx_pmon.erl
  76. 0 0
      apps/emqx/src/emqx_pool.erl
  77. 0 0
      apps/emqx/src/emqx_pool_sup.erl
  78. 0 0
      apps/emqx/src/emqx_pqueue.erl
  79. 0 0
      apps/emqx/src/emqx_psk.erl
  80. 0 0
      apps/emqx/src/emqx_reason_codes.erl
  81. 0 0
      apps/emqx/src/emqx_router.erl
  82. 0 0
      apps/emqx/src/emqx_router_helper.erl
  83. 0 0
      apps/emqx/src/emqx_router_sup.erl
  84. 0 0
      apps/emqx/src/emqx_rpc.erl
  85. 0 0
      apps/emqx/src/emqx_rule_actions_trans.erl
  86. 0 0
      apps/emqx/src/emqx_schema.erl
  87. 0 0
      apps/emqx/src/emqx_sequence.erl
  88. 0 0
      apps/emqx/src/emqx_session.erl
  89. 0 0
      apps/emqx/src/emqx_shared_sub.erl
  90. 0 0
      apps/emqx/src/emqx_stats.erl
  91. 0 0
      apps/emqx/src/emqx_sup.erl
  92. 0 0
      apps/emqx/src/emqx_sys.erl
  93. 0 0
      apps/emqx/src/emqx_sys_mon.erl
  94. 0 0
      apps/emqx/src/emqx_sys_sup.erl
  95. 0 0
      apps/emqx/src/emqx_tables.erl
  96. 0 0
      apps/emqx/src/emqx_tls_lib.erl
  97. 0 0
      apps/emqx/src/emqx_topic.erl
  98. 0 0
      apps/emqx/src/emqx_tracer.erl
  99. 0 0
      apps/emqx/src/emqx_trie.erl
  100. 0 0
      src/emqx_types.erl

etc/BUILT_ON → apps/emqx/etc/BUILT_ON


etc/acl.conf → apps/emqx/etc/acl.conf


etc/acl.conf.paho → apps/emqx/etc/acl.conf.paho


etc/certs/README → apps/emqx/etc/certs/README


etc/certs/cacert.pem → apps/emqx/etc/certs/cacert.pem


etc/certs/cert.pem → apps/emqx/etc/certs/cert.pem


etc/certs/client-cert.pem → apps/emqx/etc/certs/client-cert.pem


etc/certs/client-key.pem → apps/emqx/etc/certs/client-key.pem


etc/certs/key.pem → apps/emqx/etc/certs/key.pem


etc/emqx.conf → apps/emqx/etc/emqx.conf


etc/emqx_cloud/vm.args → apps/emqx/etc/emqx_cloud/vm.args


etc/emqx_edge/vm.args → apps/emqx/etc/emqx_edge/vm.args


etc/ssl_dist.conf → apps/emqx/etc/ssl_dist.conf


include/emqx.hrl → apps/emqx/include/emqx.hrl


include/emqx_mqtt.hrl → apps/emqx/include/emqx_mqtt.hrl


include/emqx_release.hrl → apps/emqx/include/emqx_release.hrl


include/logger.hrl → apps/emqx/include/logger.hrl


include/types.hrl → apps/emqx/include/types.hrl


+ 38 - 0
apps/emqx/rebar.config

@@ -0,0 +1,38 @@
+{erl_opts, [warn_unused_vars,warn_shadow_vars,warn_unused_import,
+            warn_obsolete_guard,compressed]}.
+
+{xref_checks,[undefined_function_calls,undefined_functions,locals_not_used,
+              deprecated_function_calls,warnings_as_errors,deprecated_functions]}.
+
+%% Deps here may duplicate with emqx.git root level rebar.config
+%% but there not be any descrpancy.
+%% This rebar.config is necessary because the app may be used as a
+%% `git_subdir` dependency in other projects.
+{deps,
+    [ {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
+    , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
+    , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
+    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
+    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.9.0"}}}
+    , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
+    , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.5.0"}}}
+    , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}}
+    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}}
+    , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}
+    , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}}
+    ]}.
+
+{extra_src_dirs, [{"etc", [recursive]}]}.
+
+{profiles, [
+   {test,
+       [{deps,
+           [ meck
+           , {bbmustache,"1.10.0"}
+           , {emqx_ct_helpers, {git,"https://github.com/zmstone/emqx-ct-helpers", {branch,"hocon"}}}
+           , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}}
+           ]},
+         {extra_src_dirs, [{"test",[recursive]}]}
+       ]}
+]}.

+ 11 - 0
apps/emqx/rebar.config.script

@@ -0,0 +1,11 @@
+Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {branch, "0.6.0"}}},
+AddBcrypt = fun(C) ->
+    {deps, Deps0} = lists:keyfind(deps, 1, C),
+    Deps = [Bcrypt | Deps0],
+    lists:keystore(deps, 1, C, {deps, Deps})
+end,
+
+case os:type() of
+    {win32, _} -> CONFIG;
+    _ -> AddBcrypt(CONFIG)
+end.

src/emqx.app.src → apps/emqx/src/emqx.app.src


src/emqx.appup.src → apps/emqx/src/emqx.appup.src


src/emqx.erl → apps/emqx/src/emqx.erl


src/emqx_access_control.erl → apps/emqx/src/emqx_access_control.erl


src/emqx_access_rule.erl → apps/emqx/src/emqx_access_rule.erl


src/emqx_acl_cache.erl → apps/emqx/src/emqx_acl_cache.erl


src/emqx_alarm.erl → apps/emqx/src/emqx_alarm.erl


src/emqx_alarm_handler.erl → apps/emqx/src/emqx_alarm_handler.erl


src/emqx_app.erl → apps/emqx/src/emqx_app.erl


src/emqx_banned.erl → apps/emqx/src/emqx_banned.erl


src/emqx_base62.erl → apps/emqx/src/emqx_base62.erl


src/emqx_batch.erl → apps/emqx/src/emqx_batch.erl


src/emqx_boot.erl → apps/emqx/src/emqx_boot.erl


src/emqx_broker.erl → apps/emqx/src/emqx_broker.erl


src/emqx_broker_bench.erl → apps/emqx/src/emqx_broker_bench.erl


src/emqx_broker_helper.erl → apps/emqx/src/emqx_broker_helper.erl


src/emqx_broker_sup.erl → apps/emqx/src/emqx_broker_sup.erl


src/emqx_channel.erl → apps/emqx/src/emqx_channel.erl


src/emqx_cm.erl → apps/emqx/src/emqx_cm.erl


src/emqx_cm_locker.erl → apps/emqx/src/emqx_cm_locker.erl


src/emqx_cm_registry.erl → apps/emqx/src/emqx_cm_registry.erl


src/emqx_cm_sup.erl → apps/emqx/src/emqx_cm_sup.erl


src/emqx_congestion.erl → apps/emqx/src/emqx_congestion.erl


src/emqx_connection.erl → apps/emqx/src/emqx_connection.erl


src/emqx_ctl.erl → apps/emqx/src/emqx_ctl.erl


src/emqx_flapping.erl → apps/emqx/src/emqx_flapping.erl


src/emqx_frame.erl → apps/emqx/src/emqx_frame.erl


src/emqx_gc.erl → apps/emqx/src/emqx_gc.erl


src/emqx_gen_mod.erl → apps/emqx/src/emqx_gen_mod.erl


src/emqx_global_gc.erl → apps/emqx/src/emqx_global_gc.erl


src/emqx_guid.erl → apps/emqx/src/emqx_guid.erl


src/emqx_hooks.erl → apps/emqx/src/emqx_hooks.erl


src/emqx_inflight.erl → apps/emqx/src/emqx_inflight.erl


src/emqx_json.erl → apps/emqx/src/emqx_json.erl


src/emqx_keepalive.erl → apps/emqx/src/emqx_keepalive.erl


src/emqx_kernel_sup.erl → apps/emqx/src/emqx_kernel_sup.erl


src/emqx_limiter.erl → apps/emqx/src/emqx_limiter.erl


src/emqx_listeners.erl → apps/emqx/src/emqx_listeners.erl


src/emqx_logger.erl → apps/emqx/src/emqx_logger.erl


src/emqx_logger_jsonfmt.erl → apps/emqx/src/emqx_logger_jsonfmt.erl


src/emqx_logger_textfmt.erl → apps/emqx/src/emqx_logger_textfmt.erl


src/emqx_message.erl → apps/emqx/src/emqx_message.erl


src/emqx_metrics.erl → apps/emqx/src/emqx_metrics.erl


src/emqx_misc.erl → apps/emqx/src/emqx_misc.erl


src/emqx_mountpoint.erl → apps/emqx/src/emqx_mountpoint.erl


src/emqx_mqtt_caps.erl → apps/emqx/src/emqx_mqtt_caps.erl


src/emqx_mqtt_props.erl → apps/emqx/src/emqx_mqtt_props.erl


src/emqx_mqueue.erl → apps/emqx/src/emqx_mqueue.erl


src/emqx_node_dump.erl → apps/emqx/src/emqx_node_dump.erl


src/emqx_os_mon.erl → apps/emqx/src/emqx_os_mon.erl


src/emqx_packet.erl → apps/emqx/src/emqx_packet.erl


src/emqx_passwd.erl → apps/emqx/src/emqx_passwd.erl


src/emqx_pd.erl → apps/emqx/src/emqx_pd.erl


src/emqx_plugins.erl → apps/emqx/src/emqx_plugins.erl


src/emqx_pmon.erl → apps/emqx/src/emqx_pmon.erl


src/emqx_pool.erl → apps/emqx/src/emqx_pool.erl


src/emqx_pool_sup.erl → apps/emqx/src/emqx_pool_sup.erl


src/emqx_pqueue.erl → apps/emqx/src/emqx_pqueue.erl


src/emqx_psk.erl → apps/emqx/src/emqx_psk.erl


src/emqx_reason_codes.erl → apps/emqx/src/emqx_reason_codes.erl


src/emqx_router.erl → apps/emqx/src/emqx_router.erl


src/emqx_router_helper.erl → apps/emqx/src/emqx_router_helper.erl


src/emqx_router_sup.erl → apps/emqx/src/emqx_router_sup.erl


src/emqx_rpc.erl → apps/emqx/src/emqx_rpc.erl


src/emqx_rule_actions_trans.erl → apps/emqx/src/emqx_rule_actions_trans.erl


src/emqx_schema.erl → apps/emqx/src/emqx_schema.erl


src/emqx_sequence.erl → apps/emqx/src/emqx_sequence.erl


src/emqx_session.erl → apps/emqx/src/emqx_session.erl


src/emqx_shared_sub.erl → apps/emqx/src/emqx_shared_sub.erl


src/emqx_stats.erl → apps/emqx/src/emqx_stats.erl


src/emqx_sup.erl → apps/emqx/src/emqx_sup.erl


src/emqx_sys.erl → apps/emqx/src/emqx_sys.erl


src/emqx_sys_mon.erl → apps/emqx/src/emqx_sys_mon.erl


src/emqx_sys_sup.erl → apps/emqx/src/emqx_sys_sup.erl


src/emqx_tables.erl → apps/emqx/src/emqx_tables.erl


src/emqx_tls_lib.erl → apps/emqx/src/emqx_tls_lib.erl


src/emqx_topic.erl → apps/emqx/src/emqx_topic.erl


src/emqx_tracer.erl → apps/emqx/src/emqx_tracer.erl


src/emqx_trie.erl → apps/emqx/src/emqx_trie.erl


+ 0 - 0
src/emqx_types.erl


Some files were not shown because too many files changed in this diff