new samples

include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"376b70").
+-define(VERSION,"1407bf").

priv/mqtt/rebar.config

@@ -1,9 +1,7 @@
-{deps_dir,"deps"}.
-{lib_dirs,["deps"]}.
-{erl_opts, [nowarn_export_all]}.
-{deps, [{kvs,    ".*", {git, "git://github.com/synrc/kvs",    []}},
-        {n2o,    ".*", {git, "git://github.com/synrc/mqtt",   []}},
-        {mad,    ".*", {git, "git://github.com/synrc/mad",    []}},
-        {emqttd, ".*", {git, "git://github.com/synrc/emqttd", []}},
-        {nitro,  ".*", {git, "git://github.com/synrc/nitro",  []}}
-       ]}.
+{deps, [
+    {kvs,    ".*", {git, "git://github.com/synrc/kvs",    []}},
+    {mad,    ".*", {git, "git://github.com/synrc/mad",    []}},
+    {n2o,    ".*", {git, "git://github.com/synrc/mqtt",   []}},
+    {emqttd, ".*", {git, "git://github.com/synrc/emqttd", []}},
+    {nitro,  ".*", {git, "git://github.com/synrc/nitro",  []}}
+]}.

priv/mqtt/src/index.erl

@@ -40,7 +40,7 @@ event(#client{data={Room,list}}) ->
 event(#ftp{sid=_Sid,filename=Filename,status={event,stop}}=Data) ->
     io:format("FTP Delivered ~p~n",[Data]),
     Name = hd(lists:reverse(string:tokens(nitro:to_list(Filename),"/"))),
-    IP = application:get_env(review,host,"127.0.0.1"),
+    IP = application:get_env(sample,host,"127.0.0.1"),
     erlang:put(message,
     nitro:render(#link{href=iolist_to_binary(["http://",IP,":8000/ftp/",
                        nitro_conv:url_encode(Name)]),body=Name})),

priv/mqtt/src/sample.app.src

@@ -2,7 +2,8 @@
              [{description,"REVIEW TT Application"},
               {vsn,"1.10"},
               {registered,[]},
-              {applications,[kernel,stdlib,kvs,n2o]},
+              {applications, [public_key,asn1,kernel,stdlib,mnesia,syntax_tools,compiler,xmerl,
+                 kvs,goldrush,gen_logger,lager,gproc,esockd,mochiweb,emqttd,n2o]},
               {mod,{sample,[]}},
               {env,[]},
               {modules,[]}]}.

priv/mqtt/src/sample.erl

@@ -24,3 +24,8 @@ docroot() ->
     Dir = filename:dirname(filename:dirname(Here)),
     Root = application:get_env(sample, "statics_root", "priv/static"),
     filename:join([Dir, Root]).
+
+rebar3()   -> mad_repl:application_config(mad_repl:load_sysconfig()),
+              {ok,[{_,R,L}]}=file:consult(code:lib_dir(sample)++"/ebin/sample.app"),
+              [ application:ensure_started(X) || X <- proplists:get_value(applications,L,[]) ],
+              application:ensure_started(R).

priv/mqtt/sys.config

@@ -11,6 +11,9 @@
          {swift,"deps/sample/bpe/"}]},
    {n2o, [{pickler,n2o_secret},
           {app,sample},
+          {routes,routes},
+          {cowboy_spec,cow2},
+          {log_modules,[index,sample,login,n2o_vnode,n2o,n2o_auth,n2o_heart,n2o_nitro]},
           {formatter,n2o_bert},
           {protocols,[sample_auth,n2o_nitro,n2o_ftp]}]},
    {emq_dashboard, [{listeners_dash,[{http,18083,[{acceptors,4},{max_clients,512}]}]}]},

priv/mqtt/vm.args

@@ -8,6 +8,6 @@
 +A 32
 +K true
 -smp auto
--setcookie sample_dist_cookie
--name sample@127.0.0.1
+-setcookie emq_dist_cookie
+-name mq@127.0.0.1
 +zdbbl 32768

priv/web/sys.config

@@ -15,7 +15,7 @@
                  "deps/n2o/priv/bert.js",
                  "deps/n2o/priv/nitrogen.js",
                  "deps/n2o/priv/utf8.js"]}},
-        {log_modules,[config,n2o,review,index,login,routes,n2o_heart,
+        {log_modules,[config,n2o,sample,index,login,routes,n2o_heart,
                       n2o_nitro,n2o_proto,n2o_cowboy,n2o_stream]},
         {log_backend,n2o_io},
         {session,n2o_session},