Comparison

tools/ejabberd2prosody.lua @ 2944:855c0eb80600

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Mar 2010 18:53:17 +0000
parent 2943:9236a7856688
child 4360:a993a4a2ea0a
comparison
equal deleted inserted replaced
2942:29ec7cd77f81 2944:855c0eb80600
14 if arg[0]:match("^./") then 14 if arg[0]:match("^./") then
15 package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua"); 15 package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua");
16 end 16 end
17 17
18 require "erlparse"; 18 require "erlparse";
19
20 prosody = {};
19 21
20 local serialize = require "util.serialization".serialize; 22 local serialize = require "util.serialization".serialize;
21 local st = require "util.stanza"; 23 local st = require "util.stanza";
22 package.loaded["util.logger"] = {init = function() return function() end; end} 24 package.loaded["util.logger"] = {init = function() return function() end; end}
23 local dm = require "util.datamanager" 25 local dm = require "util.datamanager"