From aefddabe8192ec4163cff980662a61391408fb45 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 14 Aug 2015 12:37:51 +0800 Subject: [PATCH 1/4] rm mysql plugin --- .gitmodules | 6 ------ plugins/emqttd_plugin_mysql | 1 - plugins/emysql | 1 - 3 files changed, 8 deletions(-) delete mode 160000 plugins/emqttd_plugin_mysql delete mode 160000 plugins/emysql diff --git a/.gitmodules b/.gitmodules index 4015d5e02..093a4a897 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "plugins/emqttd_dashboard"] path = plugins/emqttd_dashboard url = https://github.com/emqtt/emqttd_dashboard.git -[submodule "plugins/emysql"] - path = plugins/emysql - url = https://github.com/erylee/emysql.git -[submodule "plugins/emqttd_plugin_mysql"] - path = plugins/emqttd_plugin_mysql - url = https://github.com/emqtt/emqttd_plugin_mysql.git diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql deleted file mode 160000 index 04baf44a4..000000000 --- a/plugins/emqttd_plugin_mysql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04baf44a465c1513e75dfdcc2f6507e7a315d2d5 diff --git a/plugins/emysql b/plugins/emysql deleted file mode 160000 index 3305c1ad9..000000000 --- a/plugins/emysql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3305c1ad951e091c198ae10ca852752ca598e5b0 From 584e6a4d103d612ce8ec397d0bf0fec46a44c525 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 14 Aug 2015 12:40:59 +0800 Subject: [PATCH 2/4] rm demo --- plugins/emqttd_plugin_demo/etc/plugin.config | 1 - .../src/emqttd_plugin_demo.app.src | 12 --------- .../src/emqttd_plugin_demo_app.erl | 16 ----------- .../src/emqttd_plugin_demo_sup.erl | 27 ------------------- 4 files changed, 56 deletions(-) delete mode 100644 plugins/emqttd_plugin_demo/etc/plugin.config delete mode 100644 plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src delete mode 100644 plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl delete mode 100644 plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl diff --git a/plugins/emqttd_plugin_demo/etc/plugin.config b/plugins/emqttd_plugin_demo/etc/plugin.config deleted file mode 100644 index 57afcca04..000000000 --- a/plugins/emqttd_plugin_demo/etc/plugin.config +++ /dev/null @@ -1 +0,0 @@ -[]. diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src deleted file mode 100644 index 1fd8ce62d..000000000 --- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, emqttd_plugin_demo, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, { emqttd_plugin_demo_app, []}}, - {env, []} - ]}. diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl deleted file mode 100644 index 9042a449a..000000000 --- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl +++ /dev/null @@ -1,16 +0,0 @@ --module(emqttd_plugin_demo_app). - --behaviour(application). - -%% Application callbacks --export([start/2, stop/1]). - -%% =================================================================== -%% Application callbacks -%% =================================================================== - -start(_StartType, _StartArgs) -> - emqttd_plugin_demo_sup:start_link(). - -stop(_State) -> - ok. diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl deleted file mode 100644 index 65dad7a60..000000000 --- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl +++ /dev/null @@ -1,27 +0,0 @@ --module(emqttd_plugin_demo_sup). - --behaviour(supervisor). - -%% API --export([start_link/0]). - -%% Supervisor callbacks --export([init/1]). - -%% Helper macro for declaring children of supervisor --define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}). - -%% =================================================================== -%% API functions -%% =================================================================== - -start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). - -%% =================================================================== -%% Supervisor callbacks -%% =================================================================== - -init([]) -> - {ok, { {one_for_one, 5, 10}, []} }. - From 0a7aa5857b0fbb991b82a4ee99c2c5e5437f56bb Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 14 Aug 2015 12:45:53 +0800 Subject: [PATCH 3/4] add plugins/emqttd_plugin_template --- .gitmodules | 3 +++ plugins/emqttd_plugin_template | 1 + 2 files changed, 4 insertions(+) create mode 160000 plugins/emqttd_plugin_template diff --git a/.gitmodules b/.gitmodules index 093a4a897..933a0e007 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "plugins/emqttd_dashboard"] path = plugins/emqttd_dashboard url = https://github.com/emqtt/emqttd_dashboard.git +[submodule "plugins/emqttd_plugin_template"] + path = plugins/emqttd_plugin_template + url = https://github.com/emqtt/emqttd_plugin_template.git diff --git a/plugins/emqttd_plugin_template b/plugins/emqttd_plugin_template new file mode 160000 index 000000000..d10ee3dcd --- /dev/null +++ b/plugins/emqttd_plugin_template @@ -0,0 +1 @@ +Subproject commit d10ee3dcdaf4e7d17f50ed0745c39628a96678e2 From 975c404262ef30a5ed5033406a0e5a4c334f98e8 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 14 Aug 2015 13:27:39 +0800 Subject: [PATCH 4/4] up dashboard --- plugins/emqttd_dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index dd202346f..ca3182f5d 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit dd202346fcfce6b0ae8da76bb7233e91db996bfa +Subproject commit ca3182f5ddf9b2776f826471b8ccc698218697f8