X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=671910df199df677d8ad7121221565bc01ef417c;hb=1bf13c7d738fee0ac2e486297c4dbb285f4ca310;hp=6ec9131e5a27aa49b196326ecb6e7db986d2d245;hpb=736d99e2d66e2fe191ffcfbbee7ae151ae092040;p=prosody.git

diff --git a/prosody b/prosody
index 6ec9131e..671910df 100755
--- a/prosody
+++ b/prosody
@@ -163,23 +163,6 @@ function init_global_state()
 	prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
 	                  plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
 	
-	local path_sep = package.config:sub(1,1);
-	local rel_path_start = ".."..path_sep;
-	function prosody.resolve_relative_path(path)
-		if path then
-			local is_relative;
-			if path_sep == "/" and path:sub(1,1) ~= "/" then
-				is_relative = true;
-			elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then
-				is_relative = true;
-			end
-			if is_relative then
-				return CFG_CONFIGDIR..path_sep..path;
-			end
-		end
-		return path;
-	end
-	
 	prosody.arg = _G.arg;
 
 	prosody.platform = "unknown";
@@ -303,13 +286,16 @@ function load_secondary_libraries()
 	--- Load and initialise core modules
 	require "util.import"
 	require "util.xmppstream"
-	require "core.xmlhandlers"
 	require "core.rostermanager"
 	require "core.hostmanager"
 	require "core.modulemanager"
 	require "core.usermanager"
 	require "core.sessionmanager"
 	require "core.stanza_router"
+	package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
+		log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)"));
+		return function() end
+	end});
 
 	require "net.http"
 	
@@ -343,6 +329,7 @@ function init_data_store()
 		end
 		return username, host, datastore, data;
 	end);
+	require "core.storagemanager";
 end
 
 function prepare_to_start()