changed module paths from acf to acf2v0.1.0

31 files changed, 115 insertions, 115 deletions

diff --git a/Makefile b/Makefile
index 18e9c64..063faa2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ ROOT_DIR := /
 LUA_VERSION := 5.2
 
 confdir := etc/acf2
-luadir := usr/share/lua/$(LUA_VERSION)/acf
+luadir := usr/share/lua/$(LUA_VERSION)/acf2
 resdir := usr/share/acf2
 webdir := $(resdir)/web
 starter := usr/sbin/acf2
@@ -40,8 +40,8 @@ files += $(resdir)/$(1)
 endef
 
 
-$(eval $(call link,acf,$(luadir)))
-$(eval $(call rcopy,acf,$(luadir),lua,-not -path 'acf/modules/*'))
+$(eval $(call link,acf2,$(luadir)))
+$(eval $(call rcopy,acf2,$(luadir),lua,-not -path 'acf2/modules/*'))
 
 $(ROOT_DIR)/$(luadir)/modules:
 	install -d $@
diff --git a/acf/init.lua b/acf/init.lua
deleted file mode 100644
index 62c76e9..0000000
--- a/acf/init.lua
+++ /dev/null
@@ -1,18 +0,0 @@
---[[
-Copyright (c) 2012-2013 Kaarle Ritvanen
-See LICENSE file for license details
---]]
-
-local M = {}
-
-M.model = require('acf.model')
-
-require('acf.model.aaa')
-require('acf.loader')('modules')
-
-M.call = require('acf.error').call
-M.object = require('acf.object')
-M.path = require('acf.path')
-M.start_txn = require('acf.transaction')
-
-return M
diff --git a/acf/error.lua b/acf2/error.lua
index c3a8d63..14a2570 100644
--- a/acf/error.lua
+++ b/acf2/error.lua
@@ -5,10 +5,10 @@ See LICENSE file for license details
 
 local M = {}
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 
-local util = require('acf.util')
+local util = require('acf2.util')
 
 local json = require('cjson')
 
diff --git a/acf2/init.lua b/acf2/init.lua
new file mode 100644
index 0000000..eef3ff0
--- /dev/null
+++ b/acf2/init.lua
@@ -0,0 +1,18 @@
+--[[
+Copyright (c) 2012-2013 Kaarle Ritvanen
+See LICENSE file for license details
+--]]
+
+local M = {}
+
+M.model = require('acf2.model')
+
+require('acf2.model.aaa')
+require('acf2.loader')('modules')
+
+M.call = require('acf2.error').call
+M.object = require('acf2.object')
+M.path = require('acf2.path')
+M.start_txn = require('acf2.transaction')
+
+return M
diff --git a/acf/loader.lua b/acf2/loader.lua
index 13b2db0..71aeabf 100644
--- a/acf/loader.lua
+++ b/acf2/loader.lua
@@ -5,13 +5,13 @@ See LICENSE file for license details
 
 module(..., package.seeall)
 
-local pth = require('acf.path')
+local pth = require('acf2.path')
 
 local posix = require('posix')
 local stringy = require('stringy')
 
 return function(subdir)
-	  local comps = pth.split('acf/'..subdir)
+	  local comps = pth.split('acf2/'..subdir)
 	  local res = {}
 	  for _, modfile in ipairs(posix.dir(pth.join(unpack(comps)))) do
 	     if stringy.endswith(modfile, '.lua') then
diff --git a/acf/model/aaa.lua b/acf2/model/aaa.lua
index 17ad98c..c8a8328 100644
--- a/acf/model/aaa.lua
+++ b/acf2/model/aaa.lua
@@ -3,8 +3,8 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local M = require('acf.model')
-local object = require('acf.object')
+local M = require('acf2.model')
+local object = require('acf2.object')
 
 local digest = require('crypto').digest
 
diff --git a/acf/model/combination.lua b/acf2/model/combination.lua
index 19f84cc..28c1570 100644
--- a/acf/model/combination.lua
+++ b/acf2/model/combination.lua
@@ -5,15 +5,15 @@ See LICENSE file for license details
 
 local M = {}
 
-local err = require('acf.error')
+local err = require('acf2.error')
 local raise = err.raise
 
-local fld = require('acf.model.field')
+local fld = require('acf2.model.field')
 local String = fld.String
 
-local to_field = require('acf.model.model').to_field
+local to_field = require('acf2.model.model').to_field
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local super = object.super
 
diff --git a/acf/model/field.lua b/acf2/model/field.lua
index 4d539e8..6cbfa96 100644
--- a/acf/model/field.lua
+++ b/acf2/model/field.lua
@@ -5,16 +5,16 @@ See LICENSE file for license details
 
 local M = {}
 
-local err = require('acf.error')
+local err = require('acf2.error')
 local raise = err.raise
 
-local node = require('acf.model.node')
+local node = require('acf2.model.node')
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local super = object.super
 
-local util = require('acf.util')
+local util = require('acf2.util')
 
 
 local function contains(list, value)
diff --git a/acf/model/init.lua b/acf2/model/init.lua
index 1de5202..51cdbe8 100644
--- a/acf/model/init.lua
+++ b/acf2/model/init.lua
@@ -5,28 +5,28 @@ See LICENSE file for license details
 
 local M = {}
 
-M.error = require('acf.error')
+M.error = require('acf2.error')
 local raise = M.error.raise
 
-local combination = require('acf.model.combination')
+local combination = require('acf2.model.combination')
 M.Union = combination.Union
 M.Range = combination.Range
 
-local fld = require('acf.model.field')
+local fld = require('acf2.model.field')
 local Field = fld.Field
 M.Boolean = fld.Boolean
 M.Integer = fld.Integer
 M.Number = fld.Number
 M.String = fld.String
 
-local model = require('acf.model.model')
+local model = require('acf2.model.model')
 M.Action = model.Action
 M.new = model.new
 local to_field = model.to_field
 
-M.net = require('acf.model.net')
+M.net = require('acf2.model.net')
 
-local node = require('acf.model.node')
+local node = require('acf2.model.node')
 M.node = {}
 for _, m in ipairs{
    'List',
@@ -41,17 +41,17 @@ for _, m in ipairs{
    'ipairs'
 } do M.node[m] = node[m] end
 
-M.permission = require('acf.model.permission')
-M.register = require('acf.model.root').register
-M.node.Set = require('acf.model.set').Set
+M.permission = require('acf2.model.permission')
+M.register = require('acf2.model.root').register
+M.node.Set = require('acf2.model.set').Set
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local isinstance = object.isinstance
 local super = object.super
 
-local pth = require('acf.path')
-local map = require('acf.util').map
+local pth = require('acf2.path')
+local map = require('acf2.util').map
 
 
 local stringy = require('stringy')
diff --git a/acf/model/model.lua b/acf2/model/model.lua
index 6878497..dc506b3 100644
--- a/acf/model/model.lua
+++ b/acf2/model/model.lua
@@ -5,22 +5,22 @@ See LICENSE file for license details
 
 local M = {}
 
-local raise = require('acf.error').raise
+local raise = require('acf2.error').raise
 
-local fld = require('acf.model.field')
+local fld = require('acf2.model.field')
 local Field = fld.Field
 local Member = fld.Member
 
-local node = require('acf.model.node')
+local node = require('acf2.model.node')
 local BoundMember = node.BoundMember
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local super = object.super
 local isinstance = object.isinstance
 
-local pth = require('acf.path')
-local util = require('acf.util')
+local pth = require('acf2.path')
+local util = require('acf2.util')
 
 
 local function to_member(obj, params)
diff --git a/acf/model/net.lua b/acf2/model/net.lua
index ae82f1e..27ab262 100644
--- a/acf/model/net.lua
+++ b/acf2/model/net.lua
@@ -5,17 +5,17 @@ See LICENSE file for license details
 
 local M = {}
 
-local raise = require('acf.error').raise
-local Union = require('acf.model.combination').Union
+local raise = require('acf2.error').raise
+local Union = require('acf2.model.combination').Union
 
-local fld = require('acf.model.field')
+local fld = require('acf2.model.field')
 local String = fld.String
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local super = object.super
 
-local update = require('acf.util').update
+local update = require('acf2.util').update
 
 
 local stringy = require('stringy')
diff --git a/acf/model/node.lua b/acf2/model/node.lua
index 56d3416..85fc416 100644
--- a/acf/model/node.lua
+++ b/acf2/model/node.lua
@@ -5,15 +5,15 @@ See LICENSE file for license details
 
 local M = {}
 
-local raise = require('acf.error').raise
+local raise = require('acf2.error').raise
 
-local object = require('acf.object')
+local object = require('acf2.object')
 local class = object.class
 local isinstance = object.isinstance
 local super = object.super
 
-local pth = require('acf.path')
-local util = require('acf.util')
+local pth = require('acf2.path')
+local util = require('acf2.util')
 
 
 M.BoundMember = class()
diff --git a/acf/model/permission.lua b/acf2/model/permission.lua
index 271d478..71fa1a5 100644
--- a/acf/model/permission.lua
+++ b/acf2/model/permission.lua
@@ -5,8 +5,8 @@ See LICENSE file for license details
 
 local M = {}
 
-local insert = require('acf.model.node').insert
-local start_txn = require('acf.transaction')
+local insert = require('acf2.model.node').insert
+local start_txn = require('acf2.transaction')
 
 function M.define(path, ...)
    local txn = start_txn()
diff --git a/acf/model/root.lua b/acf2/model/root.lua
index 17c5cfb..61debec 100644
--- a/acf/model/root.lua
+++ b/acf2/model/root.lua
@@ -5,12 +5,12 @@ See LICENSE file for license details
 
 local M = {}
 
-local model = require('acf.model.model')
-local node = require('acf.model.node')
-local object = require('acf.object')
-local pth = require('acf.path')
+local model = require('acf2.model.model')
+local node = require('acf2.model.node')
+local object = require('acf2.object')
+local pth = require('acf2.path')
 
-local util = require('acf.util')
+local util = require('acf2.util')
 local setdefault = util.setdefault
 
 
diff --git a/acf/model/set.lua b/acf2/model/set.lua
index b5b8dc3..215056e 100644
--- a/acf/model/set.lua
+++ b/acf2/model/set.lua
@@ -5,12 +5,12 @@ See LICENSE file for license details
 
 local M = {}
 
-local TreeNode = require('acf.model.field').TreeNode
-local npairs = require('acf.model.node').pairs
-local object = require('acf.object')
+local TreeNode = require('acf2.model.field').TreeNode
+local npairs = require('acf2.model.node').pairs
+local object = require('acf2.object')
 
 
-M.Set = object.class(require('acf.model.node').List)
+M.Set = object.class(require('acf2.model.node').List)
 
 function M.Set:init(context, params)
    assert(not object.isinstance(params.field, TreeNode))
diff --git a/acf/modules/awall.lua b/acf2/modules/awall.lua
index 01896b4..071db57 100644
--- a/acf/modules/awall.lua
+++ b/acf2/modules/awall.lua
@@ -3,8 +3,8 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local M = require('acf.model')
-local object = require('acf.object')
+local M = require('acf2.model')
+local object = require('acf2.object')
 
 
 local Direction = object.class(M.String)
diff --git a/acf/modules/generic.lua b/acf2/modules/generic.lua
index 5477bd0..254add8 100644
--- a/acf/modules/generic.lua
+++ b/acf2/modules/generic.lua
@@ -5,7 +5,7 @@ See LICENSE file for license details
 
 -- provided as an example, to be removed from production version
 
-local M = require('acf.model')
+local M = require('acf2.model')
 
 M.register('proc', M.Mixed, {addr='/files/proc', ui_name='/proc'})
 M.permission.defaults('/proc')
diff --git a/acf/modules/net.lua b/acf2/modules/net.lua
index ad6ba95..b03ae9d 100644
--- a/acf/modules/net.lua
+++ b/acf2/modules/net.lua
@@ -3,7 +3,7 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local M = require('acf.model')
+local M = require('acf2.model')
 
 local Host = M.new()
 Host.address = M.net.IPAddress{addr='ipaddr'}
diff --git a/acf/object.lua b/acf2/object.lua
index 64fbb9c..64fbb9c 100644
--- a/acf/object.lua
+++ b/acf2/object.lua
diff --git a/acf/path.lua b/acf2/path.lua
index d824141..a31687d 100644
--- a/acf/path.lua
+++ b/acf2/path.lua
@@ -5,7 +5,7 @@ See LICENSE file for license details
 
 local M = {}
 
-local map = require('acf.util').map
+local map = require('acf2.util').map
 
 
 local up = {}
diff --git a/acf/persistence/backends/augeas.lua b/acf2/persistence/backends/augeas.lua
index 4cf623a..010a52b 100644
--- a/acf/persistence/backends/augeas.lua
+++ b/acf2/persistence/backends/augeas.lua
@@ -3,10 +3,10 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local topology = require('acf.model.root').topology
-local pth = require('acf.path')
+local topology = require('acf2.model.root').topology
+local pth = require('acf2.path')
 
-local util = require('acf.util')
+local util = require('acf2.util')
 local copy = util.copy
 
 
@@ -19,7 +19,7 @@ end
 local function ipath(path, index) return path..'['..index..']' end
 
 
-local backend = require('acf.object').class()
+local backend = require('acf2.object').class()
 
 function backend:init() self.aug = require('augeas').init() end
 
diff --git a/acf/persistence/backends/files.lua b/acf2/persistence/backends/files.lua
index 7d03e12..70ff33e 100644
--- a/acf/persistence/backends/files.lua
+++ b/acf2/persistence/backends/files.lua
@@ -3,10 +3,10 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local topology = require('acf.model.root').topology
-local pth = require('acf.path')
-local util = require('acf.persistence.util')
-local copy = require('acf.util').copy
+local topology = require('acf2.model.root').topology
+local pth = require('acf2.path')
+local util = require('acf2.persistence.util')
+local copy = require('acf2.util').copy
 
 local posix = require('posix')
 local stringy = require('stringy')
@@ -23,7 +23,7 @@ local function get_scope(top)
 end
 
 
-local backend = require('acf.object').class()
+local backend = require('acf2.object').class()
 
 -- TODO cache expiration
 function backend:init() self.cache = {} end
diff --git a/acf/persistence/backends/json.lua b/acf2/persistence/backends/json.lua
index e0cd66e..809d947 100644
--- a/acf/persistence/backends/json.lua
+++ b/acf2/persistence/backends/json.lua
@@ -3,16 +3,16 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local pth = require('acf.path')
-local Cache = require('acf.persistence.backends.volatile')
-local util = require('acf.persistence.util')
-local copy = require('acf.util').copy
+local pth = require('acf2.path')
+local Cache = require('acf2.persistence.backends.volatile')
+local util = require('acf2.persistence.util')
+local copy = require('acf2.util').copy
 
 local json = require('cjson')
 local posix = require('posix')
 
 
-local backend = require('acf.object').class()
+local backend = require('acf2.object').class()
 
 function backend:init()
    -- TODO cache expiration
diff --git a/acf/persistence/backends/null.lua b/acf2/persistence/backends/null.lua
index 7ff58ce..118f35b 100644
--- a/acf/persistence/backends/null.lua
+++ b/acf2/persistence/backends/null.lua
@@ -3,7 +3,7 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local backend = require('acf.object').class()
+local backend = require('acf2.object').class()
 function backend:get(path, top) if #path == 0 then return {} end end
 function backend:set(mods) end
 
diff --git a/acf/persistence/backends/volatile.lua b/acf2/persistence/backends/volatile.lua
index a83f7e3..e33068d 100644
--- a/acf/persistence/backends/volatile.lua
+++ b/acf2/persistence/backends/volatile.lua
@@ -3,10 +3,10 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local util = require('acf.util')
+local util = require('acf2.util')
 
 
-local backend = require('acf.object').class()
+local backend = require('acf2.object').class()
 
 function backend:init(data) self.data = data or {} end
 
diff --git a/acf/persistence/init.lua b/acf2/persistence/init.lua
index 044d4b2..1dca61d 100644
--- a/acf/persistence/init.lua
+++ b/acf2/persistence/init.lua
@@ -5,17 +5,17 @@ See LICENSE file for license details
 
 local M = {}
 
-local loadmods = require('acf.loader')
-local topology = require('acf.model.root').topology
-local object = require('acf.object')
-local pth = require('acf.path')
-local util = require('acf.util')
+local loadmods = require('acf2.loader')
+local topology = require('acf2.model.root').topology
+local object = require('acf2.object')
+local pth = require('acf2.path')
+local util = require('acf2.util')
 
 local stringy = require('stringy')
 
 
 local DataStore = object.class(
-   require('acf.transaction.backend').TransactionBackend
+   require('acf2.transaction.backend').TransactionBackend
 )
 
 function DataStore:init()
diff --git a/acf/persistence/util.lua b/acf2/persistence/util.lua
index a657411..a657411 100644
--- a/acf/persistence/util.lua
+++ b/acf2/persistence/util.lua
diff --git a/acf/transaction/backend.lua b/acf2/transaction/backend.lua
index 4393101..79ea83a 100644
--- a/acf/transaction/backend.lua
+++ b/acf2/transaction/backend.lua
@@ -5,7 +5,7 @@ See LICENSE file for license details
 
 local M = {}
 
-local err = require('acf.error')
+local err = require('acf2.error')
 
 -- TODO each transaction backend (i.e. persistence manager or
 -- transaction proper) should be implemented as a thread or have its
@@ -19,7 +19,7 @@ function M.gen_number()
 end
 
 
-M.TransactionBackend = require('acf.object').class()
+M.TransactionBackend = require('acf2.object').class()
 
 function M.TransactionBackend:init() self.mod_time = {} end
 
diff --git a/acf/transaction/init.lua b/acf2/transaction/init.lua
index 2ca63c5..eb316b5 100644
--- a/acf/transaction/init.lua
+++ b/acf2/transaction/init.lua
@@ -3,13 +3,13 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local ErrorDict = require('acf.error').ErrorDict
-local root = require('acf.model.root')
-local object = require('acf.object')
-local pth = require('acf.path')
-local be_mod = require('acf.transaction.backend')
+local ErrorDict = require('acf2.error').ErrorDict
+local root = require('acf2.model.root')
+local object = require('acf2.object')
+local pth = require('acf2.path')
+local be_mod = require('acf2.transaction.backend')
 
-local util = require('acf.util')
+local util = require('acf2.util')
 local copy = util.copy
 
 
@@ -203,7 +203,7 @@ function Transaction:commit()
 end
 
 
-local store = require('acf.persistence')
+local store = require('acf2.persistence')
 
 return function(txn, defer_validation)
 	  return Transaction(txn or store, not (txn and defer_validation))
diff --git a/acf/util.lua b/acf2/util.lua
index 3c93b47..25e885b 100644
--- a/acf/util.lua
+++ b/acf2/util.lua
@@ -1,6 +1,6 @@
---- ACF utility functions.
+--- ACF2 utility functions.
 --
--- @module acf.util
+-- @module acf2.util
 
 --[[
 Copyright (c) 2012-2013 Kaarle Ritvanen
diff --git a/server.lua b/server.lua
index 85688e0..8d6cfee 100644
--- a/server.lua
+++ b/server.lua
@@ -3,7 +3,7 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-local acf = require('acf')
+local acf = require('acf2')
 local mnode = acf.model.node
 local isinstance = acf.object.isinstance
 
@@ -183,13 +183,13 @@ return function(env)
 		   if method == 'POST' then
 		      local obj = txn:fetch(path)
 
-		      if acf.object.isinstance(obj, mnode.List) then
+		      if isinstance(obj, mnode.List) then
 			 if not mnode.has_permission(obj, user, 'create') then
 			    return 403
 			 end
 
 			 local index
-			 if not acf.object.isinstance(obj, mnode.Set) then
+			 if not isinstance(obj, mnode.Set) then
 			    index = data.index
 			    data = data.data
 			 end