From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 2 Jan 2011 19:55:21 +0000 (+0000)
Subject: modules/rpc: remove uvl bindings
X-Git-Tag: 0.10.0~241
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4f70ce38a049acdfefb632f7778806192dcfe01;p=oweals%2Fluci.git

modules/rpc: remove uvl bindings
---

diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index 510a025d5..7255c1780 100644
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -40,7 +40,6 @@ function index()
 	rpc.notemplate = true
 	
 	entry({"rpc", "uci"}, call("rpc_uci"))
-	entry({"rpc", "uvl"}, call("rpc_uvl"))
 	entry({"rpc", "fs"}, call("rpc_fs"))
 	entry({"rpc", "sys"}, call("rpc_sys"))
 	entry({"rpc", "ipkg"}, call("rpc_ipkg"))
@@ -100,20 +99,6 @@ function rpc_uci()
 	ltn12.pump.all(jsonrpc.handle(uci, http.source()), http.write)
 end
 
-function rpc_uvl()
-	if not pcall(require, "luci.uvl") then
-		luci.http.status(404, "Not Found")
-		return nil
-	end
-	local uvl     = require "luci.jsonrpcbind.uvl"
-	local jsonrpc = require "luci.jsonrpc"
-	local http    = require "luci.http"
-	local ltn12   = require "luci.ltn12"
-
-	http.prepare_content("application/json")
-	ltn12.pump.all(jsonrpc.handle(uvl, http.source()), http.write)
-end
-
 function rpc_fs()
 	local util    = require "luci.util"
 	local io      = require "io"
diff --git a/modules/rpc/luasrc/jsonrpcbind/uvl.lua b/modules/rpc/luasrc/jsonrpcbind/uvl.lua
deleted file mode 100644
index e88639aae..000000000
--- a/modules/rpc/luasrc/jsonrpcbind/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.jsonrpcbind.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