From b191bd5a8fae97b5026fa635f06d16b2b11b53a7 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 1 Jun 2007 14:55:38 +0000 Subject: [PATCH] Privatizing svn: r6435 --- collects/web-server/dispatchers/dispatch-servlets.ss | 2 +- collects/web-server/managers/lru.ss | 2 +- collects/web-server/managers/manager.ss | 2 +- collects/web-server/managers/none.ss | 2 +- collects/web-server/managers/timeouts.ss | 2 +- collects/web-server/private/servlet.ss | 2 +- collects/web-server/servlet.ss | 9 ++++----- collects/web-server/{ => servlet}/servlet-structs.ss | 4 ++-- collects/web-server/servlet/web.ss | 4 ++-- 9 files changed, 14 insertions(+), 15 deletions(-) rename collects/web-server/{ => servlet}/servlet-structs.ss (91%) diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss index 3eea6ee342..82f5a869b2 100644 --- a/collects/web-server/dispatchers/dispatch-servlets.ss +++ b/collects/web-server/dispatchers/dispatch-servlets.ss @@ -7,7 +7,7 @@ "../private/connection-manager.ss" "../private/response.ss" "../request-structs.ss" - "../servlet-structs.ss" + "../servlet/servlet-structs.ss" "../response-structs.ss" "../servlet/web-cells.ss" "../servlet/web.ss" diff --git a/collects/web-server/managers/lru.ss b/collects/web-server/managers/lru.ss index f496227fca..cc82ef4790 100644 --- a/collects/web-server/managers/lru.ss +++ b/collects/web-server/managers/lru.ss @@ -3,7 +3,7 @@ (lib "contract.ss") (lib "kw.ss")) (require "manager.ss" - "../servlet-structs.ss") + "../servlet/servlet-structs.ss") (provide/contract [create-LRU-manager ((expiration-handler? number? number? (-> boolean?)) any/c . ->* . (manager?))]) diff --git a/collects/web-server/managers/manager.ss b/collects/web-server/managers/manager.ss index 89cf7e27f2..57f4a0c7f3 100644 --- a/collects/web-server/managers/manager.ss +++ b/collects/web-server/managers/manager.ss @@ -1,6 +1,6 @@ (module manager mzscheme (require (lib "contract.ss")) - (require "../servlet-structs.ss") + (require "../servlet/servlet-structs.ss") (define-struct manager (create-instance adjust-timeout! diff --git a/collects/web-server/managers/none.ss b/collects/web-server/managers/none.ss index cc73f222b6..432266cbc3 100644 --- a/collects/web-server/managers/none.ss +++ b/collects/web-server/managers/none.ss @@ -1,7 +1,7 @@ (module none mzscheme (require (lib "contract.ss")) (require "manager.ss") - (require "../servlet-structs.ss") + (require "../servlet/servlet-structs.ss") (provide/contract [create-none-manager (expiration-handler? . -> . manager?)]) diff --git a/collects/web-server/managers/timeouts.ss b/collects/web-server/managers/timeouts.ss index ccfd47c32a..7f91ff1169 100644 --- a/collects/web-server/managers/timeouts.ss +++ b/collects/web-server/managers/timeouts.ss @@ -3,7 +3,7 @@ (lib "contract.ss")) (require "manager.ss") (require "../private/timer.ss" - "../servlet-structs.ss") + "../servlet/servlet-structs.ss") (provide/contract [create-timeout-manager (expiration-handler? number? number? . -> . manager?)]) diff --git a/collects/web-server/private/servlet.ss b/collects/web-server/private/servlet.ss index a4195ca552..c59fbe5d6c 100644 --- a/collects/web-server/private/servlet.ss +++ b/collects/web-server/private/servlet.ss @@ -1,7 +1,7 @@ (module servlet mzscheme (require (lib "contract.ss")) (require "../managers/manager.ss" - "../servlet-structs.ss" + "../servlet/servlet-structs.ss" "connection-structs.ss" "../request-structs.ss") diff --git a/collects/web-server/servlet.ss b/collects/web-server/servlet.ss index 9c8cd58894..292d03e240 100644 --- a/collects/web-server/servlet.ss +++ b/collects/web-server/servlet.ss @@ -5,16 +5,15 @@ "servlet/basic-auth.ss" "servlet/servlet-url.ss" "servlet/web.ss" + "servlet/servlet-structs.ss" "response-structs.ss" - "request-structs.ss" - "servlet-structs.ss") + "request-structs.ss") (provide (all-from "servlet/web.ss") (all-from "servlet/web-cells.ss") (all-from "servlet/helpers.ss") (all-from "servlet/servlet-url.ss") - (all-from "servlet-structs.ss") (all-from "servlet/bindings.ss") (all-from "servlet/basic-auth.ss") + (all-from "servlet/servlet-structs.ss") (all-from "response-structs.ss") - (all-from "request-structs.ss") - (all-from "servlet-structs.ss"))) \ No newline at end of file + (all-from "request-structs.ss"))) \ No newline at end of file diff --git a/collects/web-server/servlet-structs.ss b/collects/web-server/servlet/servlet-structs.ss similarity index 91% rename from collects/web-server/servlet-structs.ss rename to collects/web-server/servlet/servlet-structs.ss index 622f35c8eb..0c6f3c7cc9 100644 --- a/collects/web-server/servlet-structs.ss +++ b/collects/web-server/servlet/servlet-structs.ss @@ -1,8 +1,8 @@ (module servlet-structs mzscheme (require (lib "contract.ss") (lib "xml.ss" "xml")) - (require "request-structs.ss" - "response-structs.ss") + (require "../request-structs.ss" + "../response-structs.ss") (define servlet-response? any/c) diff --git a/collects/web-server/servlet/web.ss b/collects/web-server/servlet/web.ss index 5a018d6594..a1dfecfdf6 100644 --- a/collects/web-server/servlet/web.ss +++ b/collects/web-server/servlet/web.ss @@ -10,8 +10,8 @@ "../private/servlet.ss" "../servlet/helpers.ss" "../servlet/web-cells.ss" - "../request-structs.ss" - "../servlet-structs.ss") + "../servlet/servlet-structs.ss" + "../request-structs.ss") ;; ************************************************************ ;; HELPERS