Move RPC-bidnings out of the way to prevent the indexer to require them

diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index 2a99075..2eef7a0 100644 (file)
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -77,7 +77,7 @@ function rpc_uci()
                luci.http.status(404, "Not Found")
                return nil
        end
-       local uci     = require "luci.controller.rpc.uci"
+       local uci     = require "luci.jsonrpcbind.uci"
        local jsonrpc = require "luci.jsonrpc"
        local http    = require "luci.http"
        local ltn12   = require "luci.ltn12"
@@ -91,7 +91,7 @@ function rpc_uvl()
                luci.http.status(404, "Not Found")
                return nil
        end
-       local uvl     = require "luci.controller.rpc.uvl"
+       local uvl     = require "luci.jsonrpcbind.uvl"
        local jsonrpc = require "luci.jsonrpc"
        local http    = require "luci.http"
        local ltn12   = require "luci.ltn12"

diff --git a/modules/rpc/luasrc/controller/rpc/uci.lua b/modules/rpc/luasrc/controller/rpc/uci.lua
deleted file mode 100644 (file)
index de7da2d..0000000
--- a/modules/rpc/luasrc/controller/rpc/uci.lua
+++ /dev/null
@@ -1,94 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local uci   = require "luci.model.uci".cursor()
-local ucis  = require "luci.model.uci".cursor_state()
-local table = require "table"
-
-
-module "luci.controller.rpc.uci"
-_M, _PACKAGE, _NAME = nil, nil, nil
-
-function add(config, ...)
-       uci:load(config)
-       local stat = uci:add(config, ...)
-       return uci:save(config) and stat
-end
-
-function apply(config)
-       return uci:apply(config)
-end
-
-function changes(...)
-       return uci:changes(...)
-end
-
-function commit(config)
-       return uci:load(config) and uci:commit(config)
-end
-
-function delete(config, ...)
-       uci:load(config) 
-       return uci:delete(config, ...) and uci:save(config) 
-end
-
-function delete_all(config, ...)
-       uci:load(config)
-       return uci:delete_all(config, ...) and uci:save(config) 
-end
-
-function foreach(config, stype)
-       uci:load(config)
-       local sections = {}
-       
-       return uci:foreach(config, stype, function(section)
-               table.insert(sections, section)
-       end) and sections
-end
-
-function get(config, ...)
-       uci:load(config)
-       return uci:get(config, ...)
-end
-
-function get_all(config, ...)
-       uci:load(config)
-       return uci:get_all(config, ...)
-end
-
-function get_state(config, ...)
-       ucis:load(config)
-       return ucis:get(config, ...)
-end
-
-function revert(config)
-       return uci:load(config) and uci:revert(config)
-end
-
-function section(config, ...)
-       uci:load(config)
-       return uci:section(config, ...) and uci:save(config)
-end
-
-function set(config, ...)
-       uci:load(config)
-       return uci:set(config, ...) and uci:save(config)
-end
-
-function tset(config, ...)
-       uci:load(config)
-       return uci:tset(config, ...) and uci:save(config)
-end
-

diff --git a/modules/rpc/luasrc/controller/rpc/uvl.lua b/modules/rpc/luasrc/controller/rpc/uvl.lua
deleted file mode 100644 (file)
index 5214baf..0000000
--- a/modules/rpc/luasrc/controller/rpc/uvl.lua
+++ /dev/null
@@ -1,41 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local uvl   = require "luci.uvl".UVL()
-local table = require "table"
-
-module "luci.controller.rpc.uvl"
-_M, _PACKAGE, _NAME = nil, nil, nil
-
-
-function get_scheme(...)
-       return uvl:get_scheme(...)
-end
-
-function validate(...)
-       return {uvl:validate(...)}
-end
-
-function validate_config(...)
-       return {uvl:validate_config(...)}
-end
-
-function validate_section(...)
-       return {uvl:validate_section(...)}
-end
-
-function validate_option(...)
-       return {uvl:validate_option(...)}
-end
\ No newline at end of file

diff --git a/modules/rpc/luasrc/jsonrpcbind/uci.lua b/modules/rpc/luasrc/jsonrpcbind/uci.lua
new file mode 100644 (file)
index 0000000..de7da2d
--- /dev/null
+++ b/modules/rpc/luasrc/jsonrpcbind/uci.lua
@@ -0,0 +1,94 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci   = require "luci.model.uci".cursor()
+local ucis  = require "luci.model.uci".cursor_state()
+local table = require "table"
+
+
+module "luci.controller.rpc.uci"
+_M, _PACKAGE, _NAME = nil, nil, nil
+
+function add(config, ...)
+       uci:load(config)
+       local stat = uci:add(config, ...)
+       return uci:save(config) and stat
+end
+
+function apply(config)
+       return uci:apply(config)
+end
+
+function changes(...)
+       return uci:changes(...)
+end
+
+function commit(config)
+       return uci:load(config) and uci:commit(config)
+end
+
+function delete(config, ...)
+       uci:load(config) 
+       return uci:delete(config, ...) and uci:save(config) 
+end
+
+function delete_all(config, ...)
+       uci:load(config)
+       return uci:delete_all(config, ...) and uci:save(config) 
+end
+
+function foreach(config, stype)
+       uci:load(config)
+       local sections = {}
+       
+       return uci:foreach(config, stype, function(section)
+               table.insert(sections, section)
+       end) and sections
+end
+
+function get(config, ...)
+       uci:load(config)
+       return uci:get(config, ...)
+end
+
+function get_all(config, ...)
+       uci:load(config)
+       return uci:get_all(config, ...)
+end
+
+function get_state(config, ...)
+       ucis:load(config)
+       return ucis:get(config, ...)
+end
+
+function revert(config)
+       return uci:load(config) and uci:revert(config)
+end
+
+function section(config, ...)
+       uci:load(config)
+       return uci:section(config, ...) and uci:save(config)
+end
+
+function set(config, ...)
+       uci:load(config)
+       return uci:set(config, ...) and uci:save(config)
+end
+
+function tset(config, ...)
+       uci:load(config)
+       return uci:tset(config, ...) and uci:save(config)
+end
+

diff --git a/modules/rpc/luasrc/jsonrpcbind/uvl.lua b/modules/rpc/luasrc/jsonrpcbind/uvl.lua
new file mode 100644 (file)
index 0000000..5214baf
--- /dev/null
+++ b/modules/rpc/luasrc/jsonrpcbind/uvl.lua
@@ -0,0 +1,41 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uvl   = require "luci.uvl".UVL()
+local table = require "table"
+
+module "luci.controller.rpc.uvl"
+_M, _PACKAGE, _NAME = nil, nil, nil
+
+
+function get_scheme(...)
+       return uvl:get_scheme(...)
+end
+
+function validate(...)
+       return {uvl:validate(...)}
+end
+
+function validate_config(...)
+       return {uvl:validate_config(...)}
+end
+
+function validate_section(...)
+       return {uvl:validate_section(...)}
+end
+
+function validate_option(...)
+       return {uvl:validate_option(...)}
+end
\ No newline at end of file