From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 10 Nov 2010 15:59:16 +0000 (+0500)
Subject: prosody: Removed all references to componentmanager from Prosody, except the main... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=bd3bcfc7d04d3f357159ccd05b334776ce78e128;p=prosody.git

prosody: Removed all references to componentmanager from Prosody, except the main componentmanager file.
---

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index b7e17c4b..58676565 100644
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -15,8 +15,6 @@ local lxp = require "lxp";
 local logger = require "util.logger";
 local config = require "core.configmanager";
 local connlisteners = require "net.connlisteners";
-local cm_register_component = require "core.componentmanager".register_component;
-local cm_deregister_component = require "core.componentmanager".deregister_component;
 local uuid_gen = require "util.uuid".generate;
 local jid_split = require "util.jid".split;
 local sha1 = require "util.hashes".sha1;
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 1bbbd03d..4e1f31cb 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -15,8 +15,6 @@ local hosts = _G.hosts;
 local t_concat = table.concat;
 
 local config = require "core.configmanager";
-local cm_register_component = require "core.componentmanager".register_component;
-local cm_deregister_component = require "core.componentmanager".deregister_component;
 local sha1 = require "util.hashes".sha1;
 local st = require "util.stanza";
 
@@ -55,8 +53,6 @@ module:hook("iq/host", handle_stanza);
 module:hook("message/host", handle_stanza);
 module:hook("presence/host", handle_stanza);
 
-cm_register_component(module.host, function() end);
-
 --- Handle authentication attempts by components
 function handle_component_auth(event)
 	local session, stanza = event.origin, event.stanza;
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index e9b3a446..cb4c42a7 100644
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -16,7 +16,6 @@ end
 
 local jid_split, jid_join, jid_compare = require "util.jid".split, require "util.jid".join, require "util.jid".compare;
 local st = require "util.stanza";
-local componentmanager = require "core.componentmanager";
 local config_get = require "core.configmanager".get;
 local connlisteners = require "net.connlisteners";
 local sha1 = require "util.hashes".sha1;
@@ -185,7 +184,6 @@ local function get_stream_host(origin, stanza)
 end
 
 module.unload = function()
-	componentmanager.deregister_component(host);
 	connlisteners.deregister(module.host .. ':proxy65');
 end
 
@@ -260,4 +258,3 @@ if not connlisteners.register(module.host .. ':proxy65', connlistener) then
 end
 
 connlisteners.start(module.host .. ':proxy65');
-component = componentmanager.register_component(host, function() end);
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 60602050..22d2664d 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -23,8 +23,6 @@ if restrict_room_creation then
 	end
 end
 local muc_new_room = module:require "muc".new_room;
-local register_component = require "core.componentmanager".register_component;
-local deregister_component = require "core.componentmanager".deregister_component;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -163,8 +161,7 @@ module:hook("iq/host", stanza_handler);
 module:hook("message/host", stanza_handler);
 module:hook("presence/host", stanza_handler);
 
-component = register_component(muc_host, function() end);
-function component.send(stanza) -- FIXME do a generic fix
+hosts[module.host].send = function(stanza) -- FIXME do a generic fix
 	if stanza.attr.type == "result" or stanza.attr.type == "error" then
 		core_post_stanza(component, stanza);
 	else error("component.send only supports result and error stanzas at the moment"); end
@@ -172,9 +169,6 @@ end
 
 prosody.hosts[module:get_host()].muc = { rooms = rooms };
 
-module.unload = function()
-	deregister_component(muc_host);
-end
 module.save = function()
 	return {rooms = rooms};
 end
diff --git a/prosody b/prosody
index bf1375a4..65fb1632 100755
--- a/prosody
+++ b/prosody
@@ -309,7 +309,6 @@ function load_secondary_libraries()
 	require "core.modulemanager"
 	require "core.usermanager"
 	require "core.sessionmanager"
-	require "core.componentmanager"
 	require "core.stanza_router"
 
 	require "net.http"