Update ejabberd core files to ejabberd 14.07

mod_multicast/src/ejabberd.app

@@ -1,81 +0,0 @@
-% $Id: ejabberd.app 733 2007-02-19 15:02:28Z mremond $
-
-{application, ejabberd,
- [{description, "ejabberd"},
-  {vsn, "1.1.3"},
-  {modules, [acl,
-	     configure,
-	     cyrsasl,
-	     cyrsasl_digest,
-	     cyrsasl_plain,
-	     ejabberd,
-	     ejabberd_app,
-	     ejabberd_auth,
-	     ejabberd_c2s,
-	     ejabberd_config,
-	     ejabberd_listener,
-	     ejabberd_logger_h,
-	     ejabberd_local,
-	     ejabberd_router,
-	     ejabberd_router_multicast,
-	     ejabberd_s2s,
-	     ejabberd_s2s_in,
-	     ejabberd_s2s_out,
-	     ejabberd_service,
-	     ejabberd_sm,
-	     ejabberd_sup,
-	     ejabberd_tmp_sup,
-	     gen_iq_handler,
-	     gen_mod,
-	     jd2ejd,
-	     jlib,
-	     mod_configure,
-	     mod_disco,
-	     mod_echo,
-	     mod_last,
-	     mod_offline,
-	     mod_private,
-	     mod_register,
-	     mod_roster,
-	     mod_stats,
-	     mod_time,
-	     mod_vcard,
-	     mod_version,
-	     randoms,
-	     sha,
-	     shaper,
-	     translate,
-	     xml,
-	     xml_stream
-	    ]},
-  {registered, [ejabberd,
-		ejabberd_sup,
-		ejabberd_auth,
-		ejabberd_router,
-		ejabberd_router_multicast,
-		ejabberd_sm,
-		ejabberd_s2s,
-		ejabberd_local,
-		ejabberd_listeners,
-		ejabberd_iq_sup,
-		ejabberd_service_sup,
-		ejabberd_s2s_out_sup,
-		ejabberd_s2s_in_sup,
-		ejabberd_c2s_sup,
-		ejabberd_mod_roster,
-		ejabberd_mod_echo,
-		ejabberd_mod_pubsub,
-		ejabberd_mod_irc,
-		ejabberd_mod_muc,
-		ejabberd_offline,
-		random_generator
-	       ]},
-  {applications, [kernel, stdlib]},
-  {env, []},
-  {mod, {ejabberd_app, []}}]}.
-
-
-
-% Local Variables:
-% mode: erlang
-% End:

mod_multicast/src/ejabberd_sup.erl

@@ -1,13 +1,30 @@
 %%%----------------------------------------------------------------------
 %%% File    : ejabberd_sup.erl
-%%% Author  : Alexey Shchepin <alexey@sevcom.net>
+%%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose : 
+%%% Purpose : Erlang/OTP supervisor
-%%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@sevcom.net>
+%%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
-%%% Id      : $Id: ejabberd_sup.erl 440 2007-12-06 22:36:21Z badlop $
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2014   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
 %%%----------------------------------------------------------------------
 
 -module(ejabberd_sup).
--author('alexey@sevcom.net').
+-author('alexey@process-one.net').
 
 -behaviour(supervisor).
 
@@ -45,13 +62,6 @@ init([]) ->
 	 brutal_kill,
 	 worker,
 	 [ejabberd_router]},
-    Router_multicast =
-	{ejabberd_router_multicast,
-	 {ejabberd_router_multicast, start_link, []},
-	 permanent,
-	 brutal_kill,
-	 worker,
-	 [ejabberd_router_multicast]},
     SM =
 	{ejabberd_sm,
 	 {ejabberd_sm, start_link, []},
@@ -73,6 +83,13 @@ init([]) ->
 	 brutal_kill,
 	 worker,
 	 [ejabberd_local]},
+    Captcha =
+	{ejabberd_captcha,
+	 {ejabberd_captcha, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 [ejabberd_captcha]},
     Listener =
 	{ejabberd_listener,
 	 {ejabberd_listener, start_link, []},
@@ -156,10 +173,10 @@ init([]) ->
 	   NodeGroups,
 	   SystemMonitor,
 	   Router,
-	   Router_multicast,
 	   SM,
 	   S2S,
 	   Local,
+	   Captcha,
 	   ReceiverSupervisor,
 	   C2SSupervisor,
 	   S2SInSupervisor,