pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/eliom
Module Name: pkgsrc
Committed By: jaapb
Date: Thu Nov 29 12:04:23 UTC 2018
Modified Files:
pkgsrc/www/eliom: Makefile distinfo
pkgsrc/www/eliom/patches: patch-pkg_META patch-src__tags
Added Files:
pkgsrc/www/eliom/patches: patch-src_lib_eliom__config.server.mli
patch-src_lib_eliom__content__core.client.mk
patch-src_lib_eliom__content__core.client.mli
patch-src_lib_eliom__content__core.server.ml
patch-src_lib_eliom__content__core.server.mli
patch-src_lib_eliom__runtime.shared.ml
patch-src_lib_eliom__runtime.shared.mli
patch-src_lib_eliom__shared__content.eliom
patch-src_lib_server_eliommod.ml
Log Message:
Updated www/eliom to compile with tyxml 4.3.0 and use xml-light.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/eliom/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/eliom/patches/patch-pkg_META
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/eliom/patches/patch-src__tags
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__config.server.mli \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mk \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mli \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.ml \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.mli \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.ml \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.mli \
pkgsrc/www/eliom/patches/patch-src_lib_eliom__shared__content.eliom \
pkgsrc/www/eliom/patches/patch-src_lib_server_eliommod.ml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/eliom/Makefile
diff -u pkgsrc/www/eliom/Makefile:1.24 pkgsrc/www/eliom/Makefile:1.25
--- pkgsrc/www/eliom/Makefile:1.24 Mon Nov 12 16:10:28 2018
+++ pkgsrc/www/eliom/Makefile Thu Nov 29 12:04:23 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2018/11/12 16:10:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2018/11/29 12:04:23 jaapb Exp $
#
GITHUB_PROJECT= eliom
DISTNAME= ${GITHUB_PROJECT}-6.3.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
Index: pkgsrc/www/eliom/distinfo
diff -u pkgsrc/www/eliom/distinfo:1.11 pkgsrc/www/eliom/distinfo:1.12
--- pkgsrc/www/eliom/distinfo:1.11 Wed Aug 15 13:51:50 2018
+++ pkgsrc/www/eliom/distinfo Thu Nov 29 12:04:23 2018
@@ -1,11 +1,20 @@
-$NetBSD: distinfo,v 1.11 2018/08/15 13:51:50 jaapb Exp $
+$NetBSD: distinfo,v 1.12 2018/11/29 12:04:23 jaapb Exp $
SHA1 (eliom-6.3.0.tar.gz) = dcb78ec42965d626f6891c5f01249a2afa29a820
RMD160 (eliom-6.3.0.tar.gz) = 98e8c64beb41a130d2e38959986285a074a04f79
SHA512 (eliom-6.3.0.tar.gz) = d597e7c432dbafb8c4b8f36bf3c8ad43867cfdb4b6d9138358e3aff2e67bdf7c50dc4676cdf03b42da5f66749db3b2e3a9357bc4df9a0754c775480785e96f41
Size (eliom-6.3.0.tar.gz) = 728342 bytes
-SHA1 (patch-pkg_META) = 979a5332ac6aafb909e6664d01c3bd6c3c551dc7
+SHA1 (patch-pkg_META) = 3bc8da3cf9039e7d9aae9c4f6747002a8e7ec002
SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
-SHA1 (patch-src__tags) = 5aff5c25080159e71847ca4caffb53641c5e2811
+SHA1 (patch-src__tags) = 30b01766674fbb8361792983f3b92fdd081c909a
SHA1 (patch-src_lib_client_eliom__client.js) = 9b12dcd6dae9f554c6c81cefc4e548fbbd163978
SHA1 (patch-src_lib_eliom__client.client.ml) = e66600dcf8011d3833756ea25f7e1884fd090815
+SHA1 (patch-src_lib_eliom__config.server.mli) = 1279df3d3514a64d2aa4a9276a672fe5aeeee14b
+SHA1 (patch-src_lib_eliom__content__core.client.mk) = 4177935bfb544c4365cff84b982933779d1ed857
+SHA1 (patch-src_lib_eliom__content__core.client.mli) = 2d265a4aac7bbd1fa0a5723fc5aa07b0d799d6ad
+SHA1 (patch-src_lib_eliom__content__core.server.ml) = ffb3b1f8dcffeb906d903d66592bbf8bc935da05
+SHA1 (patch-src_lib_eliom__content__core.server.mli) = 4298ca16ef2cc02273da3b0c696a469c4d8aee8b
+SHA1 (patch-src_lib_eliom__runtime.shared.ml) = e56788b4ff5ccdecd3a4925a83deea636c14275b
+SHA1 (patch-src_lib_eliom__runtime.shared.mli) = 07f43bad1362d9e6252ccc2bb76c656cfb3f42ec
+SHA1 (patch-src_lib_eliom__shared__content.eliom) = d6627d04b28000571b81c46f3eb6525131612a4f
+SHA1 (patch-src_lib_server_eliommod.ml) = 28f66e505b12e18ff63e45db80dd6e02bb92ec28
Index: pkgsrc/www/eliom/patches/patch-pkg_META
diff -u pkgsrc/www/eliom/patches/patch-pkg_META:1.3 pkgsrc/www/eliom/patches/patch-pkg_META:1.4
--- pkgsrc/www/eliom/patches/patch-pkg_META:1.3 Wed Jun 6 08:34:35 2018
+++ pkgsrc/www/eliom/patches/patch-pkg_META Thu Nov 29 12:04:23 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-pkg_META,v 1.3 2018/06/06 08:34:35 jaapb Exp $
+$NetBSD: patch-pkg_META,v 1.4 2018/11/29 12:04:23 jaapb Exp $
-lwt.syntax is now replaced by lwt_camlp4
+Remove deprecated tyxml.syntax (patch from upstream)
--- pkg/META.orig 2018-02-08 14:30:46.000000000 +0000
+++ pkg/META
@@ -98,8 +98,8 @@ package "syntax" (
@@ -9,8 +9,8 @@ lwt.syntax is now replaced by lwt_camlp4
- requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt.syntax,tyxml.syntax"
- requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt.syntax,tyxml.syntax"
-+ requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4,tyxml.syntax"
-+ requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4,tyxml.syntax"
++ requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4"
++ requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4"
archive(syntax, preprocessor) = "-ignore dummy"
)
Index: pkgsrc/www/eliom/patches/patch-src__tags
diff -u pkgsrc/www/eliom/patches/patch-src__tags:1.2 pkgsrc/www/eliom/patches/patch-src__tags:1.3
--- pkgsrc/www/eliom/patches/patch-src__tags:1.2 Fri Apr 13 13:17:34 2018
+++ pkgsrc/www/eliom/patches/patch-src__tags Thu Nov 29 12:04:23 2018
@@ -1,6 +1,7 @@
-$NetBSD: patch-src__tags,v 1.2 2018/04/13 13:17:34 jaapb Exp $
+$NetBSD: patch-src__tags,v 1.3 2018/11/29 12:04:23 jaapb Exp $
lwt_ppx is now its own package and has been renamed
+Use xml-light (patch from upstream)
--- src/_tags.orig 2018-02-08 14:30:46.000000000 +0000
+++ src/_tags
@@ -2,23 +2,23 @@
@@ -19,9 +20,10 @@ lwt_ppx is now its own package and has b
<lib/server/*.ml{,i}>:thread
<lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
-<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml)
+-
+<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml,lwt_log)
-
<lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
++<lib/server/*.ml{,i}>:package(xml-light)
<lib/*.eliom{,i}>:eliom_ppx
Added files:
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__config.server.mli
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__config.server.mli:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__config.server.mli Thu Nov 29 12:04:23 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_lib_eliom__config.server.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Use xml-light (patch from upstream)
+--- src/lib/eliom_config.server.mli.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_config.server.mli
+@@ -89,13 +89,13 @@ val get_default_links_xhr : unit -> bool
+ function inside the initialisation function given to
+ {!Eliom_service.register_eliom_module}.}
+ *)
+-val get_config : unit -> Simplexmlparser.xml list
++val get_config : unit -> Xml.xml list
+
+ (** Process the configuration
+ (same as the one returned by
+ {% <<a_api module="Eliom_config" | val get_config>> %})
+ by a given specification (cf. {% <<a_api project="ocsigenserver" | type Ocsigen_extensions.Configuration.element >> %}) *)
+-val parse_config : ?pcdata:(string -> unit) -> ?other_elements:(string -> (string * string) list -> Simplexmlparser.xml list -> unit) -> Ocsigen_extensions.Configuration.element list -> unit
++val parse_config : ?pcdata:(string -> unit) -> ?other_elements:(string -> (string * string) list -> Xml.xml list -> unit) -> Ocsigen_extensions.Configuration.element list -> unit
+
+ (** The function [get_config_info ()] returns the information
+ concerning the current request from the configuration files
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mk
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mk:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mk Thu Nov 29 12:04:23 2018
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_lib_eliom__content__core.client.mk,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_content_core.client.ml.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_content_core.client.ml
+@@ -90,6 +90,7 @@ module Xml = struct
+ type event_handler = Dom_html.event Js.t -> unit
+ type mouse_event_handler = Dom_html.mouseEvent Js.t -> unit
+ type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> unit
++ type touch_event_handler = Dom_html.touchEvent Js.t -> unit
+
+ let event_handler_attrib name (value : event_handler) =
+ internal_event_handler_attrib name
+@@ -100,6 +101,9 @@ module Xml = struct
+ let keyboard_event_handler_attrib name (value : keyboard_event_handler) =
+ internal_event_handler_attrib name
+ (Caml (CE_client_closure_keyboard value))
++ let touch_event_handler_attrib name (value : touch_event_handler) =
++ internal_event_handler_attrib name
++ (Caml (CE_client_closure_touch value))
+
+ let node_react_children ?(a = []) name children =
+ {elt = Lazy.from_val (ReactChildren (Node (name,a,[]),children)); node_id=NoId}
+@@ -183,6 +187,7 @@ struct
+ type event_handler = Xml.event_handler
+ type mouse_event_handler = Xml.mouse_event_handler
+ type keyboard_event_handler = Xml.keyboard_event_handler
++ type touch_event_handler = Xml.touch_event_handler
+ type attrib = Xml.attrib
+
+ let float_attrib name s : attrib =
+@@ -198,6 +203,7 @@ struct
+ let event_handler_attrib = Xml.event_handler_attrib
+ let mouse_event_handler_attrib = Xml.mouse_event_handler_attrib
+ let keyboard_event_handler_attrib = Xml.keyboard_event_handler_attrib
++ let touch_event_handler_attrib = Xml.touch_event_handler_attrib
+ let uri_attrib name value =
+ name, Xml.RAReact (React.S.map
+ (fun f -> Some (Xml.AStr (Eliom_lazy.force f))) value)
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mli
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mli:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.client.mli Thu Nov 29 12:04:23 2018
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_lib_eliom__content__core.client.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_content_core.client.mli.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_content_core.client.mli
+@@ -44,6 +44,8 @@ module Xml : sig
+ (Dom_html.mouseEvent Js.t -> unit) (* Client side-only *)
+ | CE_client_closure_keyboard of
+ (Dom_html.keyboardEvent Js.t -> unit) (* Client side-only *)
++ | CE_client_closure_touch of
++ (Dom_html.touchEvent Js.t -> unit) (* Client side-only *)
+ | CE_call_service of
+ ( [ `A | `Form_get | `Form_post] *
+ ((bool * string list) option) *
+@@ -55,6 +57,7 @@ module Xml : sig
+ type event_handler = Dom_html.event Js.t -> unit
+ type mouse_event_handler = Dom_html.mouseEvent Js.t -> unit
+ type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> unit
++ type touch_event_handler = Dom_html.touchEvent Js.t -> unit
+
+ type ename = string
+ type elt
+@@ -109,6 +112,7 @@ module Xml : sig
+ val event_handler_attrib : aname -> event_handler -> attrib
+ val mouse_event_handler_attrib : aname -> mouse_event_handler -> attrib
+ val keyboard_event_handler_attrib : aname -> keyboard_event_handler -> attrib
++ val touch_event_handler_attrib : aname -> touch_event_handler -> attrib
+ val uri_attrib : aname -> uri -> attrib
+ val uris_attrib : aname -> uri list -> attrib
+
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.ml:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.ml Thu Nov 29 12:04:23 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_lib_eliom__content__core.server.ml,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_content_core.server.ml.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_content_core.server.ml
+@@ -118,6 +118,7 @@ module Xml = struct
+ type event_handler = (Dom_html.event Js.t -> unit) Eliom_client_value.t
+ type mouse_event_handler = (Dom_html.mouseEvent Js.t -> unit) Eliom_client_value.t
+ type keyboard_event_handler = (Dom_html.keyboardEvent Js.t -> unit) Eliom_client_value.t
++ type touch_event_handler = (Dom_html.touchEvent Js.t -> unit) Eliom_client_value.t
+
+ let make_cryptographic_safe_string () =
+ (* FIX: we should directly produce a string of the right length *)
+@@ -138,6 +139,8 @@ module Xml = struct
+ biggest_event_handler_attrib name cf
+ let keyboard_event_handler_attrib name (cf : keyboard_event_handler) =
+ biggest_event_handler_attrib name cf
++ let touch_event_handler_attrib name (cf : touch_event_handler) =
++ biggest_event_handler_attrib name cf
+
+ let client_attrib ?init (x : attrib Eliom_client_value.t) =
+ let crypto = make_cryptographic_safe_string () in
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.mli
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.mli:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__content__core.server.mli Thu Nov 29 12:04:23 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lib_eliom__content__core.server.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_content_core.server.mli.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_content_core.server.mli
+@@ -30,6 +30,8 @@ module Xml : sig
+ (Dom_html.mouseEvent Js.t -> unit) Eliom_client_value.t
+ and type keyboard_event_handler =
+ (Dom_html.keyboardEvent Js.t -> unit) Eliom_client_value.t
++ and type touch_event_handler =
++ (Dom_html.touchEvent Js.t -> unit) Eliom_client_value.t
+
+ type caml_event_handler
+
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.ml:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.ml Thu Nov 29 12:04:23 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lib_eliom__runtime.shared.ml,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_runtime.shared.ml.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_runtime.shared.ml
+@@ -57,6 +57,8 @@ module RawXML = struct
+ (Dom_html.mouseEvent Js.t -> unit) (* Client side-only *)
+ | CE_client_closure_keyboard of
+ (Dom_html.keyboardEvent Js.t -> unit) (* Client side-only *)
++ | CE_client_closure_touch of
++ (Dom_html.touchEvent Js.t -> unit) (* Client side-only *)
+ | CE_call_service of
+ ( [ `A | `Form_get | `Form_post] *
+ (cookie_info option) *
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.mli
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.mli:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__runtime.shared.mli Thu Nov 29 12:04:23 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lib_eliom__runtime.shared.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_runtime.shared.mli.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_runtime.shared.mli
+@@ -63,6 +63,8 @@ module RawXML : sig
+ (Dom_html.mouseEvent Js.t -> unit) (* Client side-only *)
+ | CE_client_closure_keyboard of
+ (Dom_html.keyboardEvent Js.t -> unit) (* Client side-only *)
++ | CE_client_closure_touch of
++ (Dom_html.touchEvent Js.t -> unit) (* Client side-only *)
+ | CE_call_service of
+ ( [ `A | `Form_get | `Form_post] *
+ (cookie_info option) *
Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__shared__content.eliom
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__shared__content.eliom:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__shared__content.eliom Thu Nov 29 12:04:23 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_lib_eliom__shared__content.eliom,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Compile with tyxml 4.3.0
+--- src/lib/eliom_shared_content.eliom.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_shared_content.eliom
+@@ -68,6 +68,9 @@ module Xml = struct
+ type keyboard_event_handler =
+ (Dom_html.keyboardEvent Js.t -> unit) Eliom_client_value.t
+
++ type touch_event_handler =
++ (Dom_html.touchEvent Js.t -> unit) Eliom_client_value.t
++
+ (* attributes *)
+
+ type attrib = Eliom_content_core.Xml.attrib
+@@ -127,6 +130,9 @@ module Xml = struct
+ let keyboard_event_handler_attrib =
+ Eliom_content_core.Xml.keyboard_event_handler_attrib
+
++ let touch_event_handler_attrib =
++ Eliom_content_core.Xml.touch_event_handler_attrib
++
+ let mouse_event_handler_attrib =
+ Eliom_content_core.Xml.mouse_event_handler_attrib
+
Index: pkgsrc/www/eliom/patches/patch-src_lib_server_eliommod.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_server_eliommod.ml:1.1
--- /dev/null Thu Nov 29 12:04:23 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_server_eliommod.ml Thu Nov 29 12:04:23 2018
@@ -0,0 +1,250 @@
+$NetBSD: patch-src_lib_server_eliommod.ml,v 1.1 2018/11/29 12:04:23 jaapb Exp $
+
+Use xml-light (patch from upstream)
+--- src/lib/server/eliommod.ml.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/server/eliommod.ml
+@@ -216,7 +216,6 @@ Some !default_max_persistent_data_tab_se
+ (****************************************************************************)
+ (****************************************************************************)
+ (****************************************************************************)
+-open Simplexmlparser
+
+
+ (* The following is common to global config and site config *)
+@@ -316,20 +315,20 @@ let parse_eliom_option
+ aux false false attrs
+ in
+ function
+- | (Element ("volatiletimeout", attrs, [])) ->
++ | (Xml.Element ("volatiletimeout", attrs, [])) ->
+ let t, snoo, ct = parse_timeout_attrs "volatiletimeout" attrs in
+ set_volatile_timeout ct snoo (t : float option)
+- | (Element ("datatimeout", attrs, [])) ->
++ | (Xml.Element ("datatimeout", attrs, [])) ->
+ let t, snoo, ct = parse_timeout_attrs "datatimeout" attrs in
+ set_data_timeout ct snoo t
+- | (Element ("servicetimeout", attrs, [])) ->
++ | (Xml.Element ("servicetimeout", attrs, [])) ->
+ let t, snoo, ct = parse_timeout_attrs "servicetimeout" attrs in
+ set_service_timeout ct snoo t
+- | (Element ("persistenttimeout", attrs, [])) ->
++ | (Xml.Element ("persistenttimeout", attrs, [])) ->
+ let t, snoo, ct = parse_timeout_attrs "persistenttimeout" attrs in
+ set_persistent_timeout ct snoo t
+
+- | (Element ("maxvolatilesessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxvolatilesessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_sessions_per_group i;
+@@ -338,21 +337,21 @@ let parse_eliom_option
+ raise
+ (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxvolatilesessionspergroup tag")))
+- | (Element ("maxservicesessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxservicesessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_sessions_per_group i;
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxservicesessionspergroup tag")))
+- | (Element ("maxdatasessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxdatasessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_data_sessions_per_group i
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxdatasessionspergroup tag")))
+- | (Element ("maxvolatilesessionspersubnet", [("value", v)], [])) ->
++ | (Xml.Element ("maxvolatilesessionspersubnet", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_sessions_per_subnet i;
+@@ -360,21 +359,21 @@ let parse_eliom_option
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxvolatilesessionspersubnet tag")))
+- | (Element ("maxservicesessionspersubnet", [("value", v)], [])) ->
++ | (Xml.Element ("maxservicesessionspersubnet", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_sessions_per_subnet i;
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxservicesessionspersubnet tag")))
+- | (Element ("maxdatasessionspersubnet", [("value", v)], [])) ->
++ | (Xml.Element ("maxdatasessionspersubnet", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_data_sessions_per_subnet i
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxdatasessionspersubnet tag")))
+- | (Element ("maxpersistentsessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxpersistentsessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_persistent_sessions_per_group i;
+@@ -382,7 +381,7 @@ let parse_eliom_option
+ raise
+ (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxpersistentsessionspergroup tag")))
+- | (Element ("maxvolatiletabsessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxvolatiletabsessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_tab_sessions_per_group i;
+@@ -391,21 +390,21 @@ let parse_eliom_option
+ raise
+ (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxvolatiletabsessionspergroup tag")))
+- | (Element ("maxservicetabsessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxservicetabsessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_service_tab_sessions_per_group i;
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxservicetabsessionspergroup tag")))
+- | (Element ("maxdatatabsessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxdatatabsessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_data_tab_sessions_per_group i
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxdatatabsessionspergroup tag")))
+- | (Element ("maxpersistenttabsessionspergroup", [("value", v)], [])) ->
++ | (Xml.Element ("maxpersistenttabsessionspergroup", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_persistent_tab_sessions_per_group i;
+@@ -413,21 +412,21 @@ let parse_eliom_option
+ raise
+ (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxpersistenttabsessionspergroup tag")))
+- | (Element ("maxanonymouscoservicespersession", [("value", v)], [])) ->
++ | (Xml.Element ("maxanonymouscoservicespersession", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_services_per_session i;
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxanonymouscoservicespersession tag")))
+- | (Element ("maxanonymouscoservicespersubnet", [("value", v)], [])) ->
++ | (Xml.Element ("maxanonymouscoservicespersubnet", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_services_per_subnet i;
+ with Failure _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxanonymouscoservicespersubnet tag")))
+- | (Element ("maxvolatilegroupspersite", [("value", v)], [])) ->
++ | (Xml.Element ("maxvolatilegroupspersite", [("value", v)], [])) ->
+ (try
+ let i = int_of_string v in
+ set_max_volatile_groups_per_site i
+@@ -435,7 +434,7 @@ let parse_eliom_option
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for maxvolatilegroupspersite tag")))
+
+- | (Element ("securecookies", [("value", v)], [])) ->
++ | (Xml.Element ("securecookies", [("value", v)], [])) ->
+ (try
+ let i = match v with
+ | "true" -> true
+@@ -447,14 +446,14 @@ let parse_eliom_option
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for securecookies tag")))
+
+- | (Element ("ipv4subnetmask", [("value", v)], [])) ->
++ | (Xml.Element ("ipv4subnetmask", [("value", v)], [])) ->
+ (try
+ let mask = int_of_string v in
+ set_ipv4mask mask
+ with _ ->
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for ipv4subnetmask tag")))
+- | (Element ("ipv6subnetmask", [("value", v)], [])) ->
++ | (Xml.Element ("ipv6subnetmask", [("value", v)], [])) ->
+ (try
+ let mask = int_of_string v in
+ set_ipv6mask mask
+@@ -462,10 +461,10 @@ let parse_eliom_option
+ raise (Error_in_config_file
+ ("Eliom: Wrong attribute value for ipv6subnetmask tag")))
+
+- | (Element ("applicationscript", attrs, [])) ->
++ | (Xml.Element ("applicationscript", attrs, [])) ->
+ set_application_script (parse_application_script_attrs attrs)
+
+- | (Element (s, _, _)) ->
++ | (Xml.Element (s, _, _)) ->
+ raise (Error_in_config_file
+ ("Unexpected content <"^s^"> inside eliom config"))
+ | _ -> raise (Error_in_config_file ("Unexpected content inside eliom config"))
+@@ -487,7 +486,7 @@ let parse_eliom_options f l =
+
+ let rec parse_global_config = function
+ | [] -> ()
+- | (Element ("sessiongcfrequency", [("value", s)], p))::ll ->
++ | (Xml.Element ("sessiongcfrequency", [("value", s)], p))::ll ->
+ (try
+ let t = float_of_string s in
+ Eliommod_gc.set_servicesessiongcfrequency (Some t);
+@@ -501,7 +500,7 @@ let rec parse_global_config = function
+ else raise (Error_in_config_file
+ "Eliom: Wrong value for <sessiongcfrequency>"));
+ parse_global_config ll
+- | (Element ("servicesessiongcfrequency", [("value", s)], p))::ll ->
++ | (Xml.Element ("servicesessiongcfrequency", [("value", s)], p))::ll ->
+ (try
+ Eliommod_gc.set_servicesessiongcfrequency (Some (float_of_string s))
+ with Failure _ ->
+@@ -510,7 +509,7 @@ let rec parse_global_config = function
+ else raise (Error_in_config_file
+ "Eliom: Wrong value for <servicesessiongcfrequency>"));
+ parse_global_config ll
+- | (Element ("datasessiongcfrequency", [("value", s)], p))::ll ->
++ | (Xml.Element ("datasessiongcfrequency", [("value", s)], p))::ll ->
+ (try
+ Eliommod_gc.set_datasessiongcfrequency (Some (float_of_string s))
+ with Failure _ ->
+@@ -519,7 +518,7 @@ let rec parse_global_config = function
+ else raise (Error_in_config_file
+ "Eliom: Wrong value for <datasessiongcfrequency>"));
+ parse_global_config ll
+- | (Element ("persistentsessiongcfrequency",
++ | (Xml.Element ("persistentsessiongcfrequency",
+ [("value", s)], p))::ll ->
+ (try
+ Eliommod_gc.set_persistentsessiongcfrequency
+@@ -762,7 +761,7 @@ let parse_config hostpattern conf_info s
+ raise
+ (Error_in_config_file ("Wrong attribute for <eliom>: "^s))
+ in fun _ parse_site -> function
+- | Element ("eliommodule", atts, content) ->
++ | Xml.Element ("eliommodule", atts, content) ->
+ Eliom_extension.register_eliom_extension
+ default_module_action;
+ (match parse_module_attrs None atts with
+@@ -776,7 +775,7 @@ let parse_config hostpattern conf_info s
+ (Some (Eliom_extension.get_eliom_extension ()))
+ sitedata
+ else gen_nothing ()
+- | Element ("eliom", atts, content) ->
++ | Xml.Element ("eliom", atts, content) ->
+ (*--- if we put the line "new_sitedata" here, then there is
+ one service table for each <eliom> tag ...
+ I think the other one is the best,
+@@ -916,7 +915,7 @@ let parse_config hostpattern conf_info s
+ eliommodulewarningdisplayed := true;
+ gen_nothing ()
+ end
+- | Element (t, _, _) ->
++ | Xml.Element (t, _, _) ->
+ raise (Ocsigen_extensions.Bad_config_tag_for_extension t)
+ | _ -> raise (Error_in_config_file "(Eliommod extension)")
+
Home |
Main Index |
Thread Index |
Old Index