Mercurial > verse / changeset

--- a/client.lua	Wed Dec 09 20:57:18 2009 +0000
+++ b/client.lua	Wed Dec 09 20:58:04 2009 +0000
@@ -1,7 +1,7 @@
 local verse = require "verse";
 local stream = verse.stream_mt;
 
-local jid_split = require "jid".split;
+local jid_split = require "util.jid".split;
 local lxp = require "lxp";
 local st = require "util.stanza";
 

--- a/init.lua	Wed Dec 09 20:57:18 2009 +0000
+++ b/init.lua	Wed Dec 09 20:58:04 2009 +0000
@@ -2,8 +2,8 @@
 -- Use LuaRocks if available
 pcall(require, "luarocks.require");
 
-local server = require "server";
-local events = require "events";
+local server = require "net.server";
+local events = require "util.events";
 
 module("verse", package.seeall);
 local verse = _M;

--- a/squishy	Wed Dec 09 20:57:18 2009 +0000
+++ b/squishy	Wed Dec 09 20:58:04 2009 +0000
@@ -12,10 +12,10 @@
 Module "util.timer"		"util/timer.lua"
 Module "util.termcolours"	"util/termcolours.lua"
 Module "util.uuid"		"util/uuid.lua"
-Module "server"			"net/server_select.lua"
+Module "net.server"		"net/server_select.lua"
 Module "xmlhandlers"		"core/xmlhandlers.lua"
-Module "jid"			"util/jid.lua"
-Module "events"			"util/events.lua"
+Module "util.jid"		"util/jid.lua"
+Module "util.events"		"util/events.lua"
 
 -- Verse plugins
 Module "verse.plugins.sasl"	"plugins/sasl.lua"