From 16f76ddefe9fbfd3c0da252d7b83d451f34c986d Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 1 Jun 2007 15:07:34 +0000 Subject: [PATCH] Privatization svn: r6436 --- .../configuration/configuration-table-structs.ss | 4 ++-- collects/web-server/configuration/responders.ss | 4 ++-- collects/web-server/dispatchers/dispatch-const.ss | 4 ++-- collects/web-server/dispatchers/dispatch-files.ss | 2 +- collects/web-server/dispatchers/dispatch-filter.ss | 2 +- collects/web-server/dispatchers/dispatch-host.ss | 2 +- collects/web-server/dispatchers/dispatch-log.ss | 2 +- collects/web-server/dispatchers/dispatch-passwords.ss | 2 +- collects/web-server/dispatchers/dispatch-pathprocedure.ss | 4 ++-- collects/web-server/dispatchers/dispatch-servlets.ss | 5 ++--- collects/web-server/dispatchers/dispatch.ss | 3 +-- collects/web-server/{ => private}/request-structs.ss | 0 collects/web-server/private/request.ss | 2 +- collects/web-server/{ => private}/response-structs.ss | 0 collects/web-server/private/response.ss | 2 +- collects/web-server/private/servlet.ss | 2 +- .../web-server/prototype-web-server/dispatch-servlets2.ss | 7 +++---- collects/web-server/prototype-web-server/lang-api.ss | 8 ++++---- .../web-server/prototype-web-server/private/session.ss | 4 ++-- collects/web-server/prototype-web-server/private/web.ss | 2 +- .../web-server/prototype-web-server/servlets/add01.ss | 2 +- .../web-server/prototype-web-server/servlets/add02.ss | 2 -- collects/web-server/servlet.ss | 8 ++++---- collects/web-server/servlet/basic-auth.ss | 2 +- collects/web-server/servlet/helpers.ss | 4 ++-- collects/web-server/servlet/servlet-structs.ss | 4 ++-- collects/web-server/servlet/servlet-url.ss | 2 +- collects/web-server/servlet/web.ss | 2 +- collects/web-server/tests/test-post-patch.ss | 2 +- 29 files changed, 42 insertions(+), 47 deletions(-) rename collects/web-server/{ => private}/request-structs.ss (100%) rename collects/web-server/{ => private}/response-structs.ss (100%) diff --git a/collects/web-server/configuration/configuration-table-structs.ss b/collects/web-server/configuration/configuration-table-structs.ss index bdc0a22bed..0d97e362cd 100644 --- a/collects/web-server/configuration/configuration-table-structs.ss +++ b/collects/web-server/configuration/configuration-table-structs.ss @@ -1,8 +1,8 @@ (module configuration-table-structs mzscheme (require (lib "contract.ss") (lib "url.ss" "net")) - (require "../response-structs.ss" - "../request-structs.ss") + (require "../private/response-structs.ss" + "../private/request-structs.ss") ; configuration-table = (make-configuration-table nat nat num host-table (listof (cons str host-table))) (define-struct configuration-table diff --git a/collects/web-server/configuration/responders.ss b/collects/web-server/configuration/responders.ss index 383728d7e7..ac6ee15352 100644 --- a/collects/web-server/configuration/responders.ss +++ b/collects/web-server/configuration/responders.ss @@ -1,8 +1,8 @@ (module responders mzscheme (require (lib "contract.ss") (lib "url.ss" "net")) - (require "../response-structs.ss" - "../request-structs.ss") + (require "../private/response-structs.ss" + "../private/request-structs.ss") ; error-response : nat str str [(cons sym str) ...] -> response ; XXX - cache files with a refresh option. diff --git a/collects/web-server/dispatchers/dispatch-const.ss b/collects/web-server/dispatchers/dispatch-const.ss index a0a7357228..4d40cd4447 100644 --- a/collects/web-server/dispatchers/dispatch-const.ss +++ b/collects/web-server/dispatchers/dispatch-const.ss @@ -2,8 +2,8 @@ (require (lib "contract.ss")) (require "dispatch.ss" "../private/response.ss" - "../request-structs.ss" - "../response-structs.ss") + "../private/request-structs.ss" + "../private/response-structs.ss") (provide/contract [interface-version dispatcher-interface-version?] [make ((request? . -> . response?) . -> . dispatcher?)]) diff --git a/collects/web-server/dispatchers/dispatch-files.ss b/collects/web-server/dispatchers/dispatch-files.ss index 0f940d3efc..21a4fd4798 100644 --- a/collects/web-server/dispatchers/dispatch-files.ss +++ b/collects/web-server/dispatchers/dispatch-files.ss @@ -6,7 +6,7 @@ (require "dispatch.ss" "../private/util.ss" "../private/mime-types.ss" - "../request-structs.ss" + "../private/request-structs.ss" "../private/response.ss") (provide/contract [interface-version dispatcher-interface-version?]) diff --git a/collects/web-server/dispatchers/dispatch-filter.ss b/collects/web-server/dispatchers/dispatch-filter.ss index 810348f081..e9bb9299e6 100644 --- a/collects/web-server/dispatchers/dispatch-filter.ss +++ b/collects/web-server/dispatchers/dispatch-filter.ss @@ -2,7 +2,7 @@ (require (lib "contract.ss") (lib "url.ss" "net")) (require "dispatch.ss" - "../request-structs.ss" + "../private/request-structs.ss" "../private/util.ss") (provide/contract [interface-version dispatcher-interface-version?] diff --git a/collects/web-server/dispatchers/dispatch-host.ss b/collects/web-server/dispatchers/dispatch-host.ss index e2ee8f2870..7d0a5ffef2 100644 --- a/collects/web-server/dispatchers/dispatch-host.ss +++ b/collects/web-server/dispatchers/dispatch-host.ss @@ -2,7 +2,7 @@ (require (lib "contract.ss") (lib "plt-match.ss") (lib "url.ss" "net") - "../request-structs.ss" + "../private/request-structs.ss" "dispatch.ss") (provide/contract [interface-version dispatcher-interface-version?] diff --git a/collects/web-server/dispatchers/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss index daa4a27bf9..ff45a268e9 100644 --- a/collects/web-server/dispatchers/dispatch-log.ss +++ b/collects/web-server/dispatchers/dispatch-log.ss @@ -6,7 +6,7 @@ (lib "plt-match.ss") (lib "contract.ss")) (require "dispatch.ss" - "../request-structs.ss") + "../private/request-structs.ss") (provide/contract [interface-version dispatcher-interface-version?]) (provide make) diff --git a/collects/web-server/dispatchers/dispatch-passwords.ss b/collects/web-server/dispatchers/dispatch-passwords.ss index d3dfa6b6bc..35c65d6a6b 100644 --- a/collects/web-server/dispatchers/dispatch-passwords.ss +++ b/collects/web-server/dispatchers/dispatch-passwords.ss @@ -5,7 +5,7 @@ (require "dispatch.ss" "../private/util.ss" "../configuration/responders.ss" - "../request-structs.ss" + "../private/request-structs.ss" "../servlet/basic-auth.ss" "../private/connection-manager.ss" "../private/response.ss") diff --git a/collects/web-server/dispatchers/dispatch-pathprocedure.ss b/collects/web-server/dispatchers/dispatch-pathprocedure.ss index 9930ab8172..38a435e24e 100644 --- a/collects/web-server/dispatchers/dispatch-pathprocedure.ss +++ b/collects/web-server/dispatchers/dispatch-pathprocedure.ss @@ -4,8 +4,8 @@ (require "dispatch.ss" "../private/util.ss" "../private/response.ss" - "../request-structs.ss" - "../response-structs.ss") + "../private/request-structs.ss" + "../private/response-structs.ss") (provide/contract [interface-version dispatcher-interface-version?] [make (string? (request? . -> . response?) . -> . dispatcher?)]) diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss index 82f5a869b2..3ef7011602 100644 --- a/collects/web-server/dispatchers/dispatch-servlets.ss +++ b/collects/web-server/dispatchers/dispatch-servlets.ss @@ -6,9 +6,8 @@ "../private/web-server-structs.ss" "../private/connection-manager.ss" "../private/response.ss" - "../request-structs.ss" - "../servlet/servlet-structs.ss" - "../response-structs.ss" + "../private/request-structs.ss" + "../private/response-structs.ss" "../servlet/web-cells.ss" "../servlet/web.ss" "../configuration/responders.ss" diff --git a/collects/web-server/dispatchers/dispatch.ss b/collects/web-server/dispatchers/dispatch.ss index 9900704d93..facfd5702c 100644 --- a/collects/web-server/dispatchers/dispatch.ss +++ b/collects/web-server/dispatchers/dispatch.ss @@ -1,8 +1,7 @@ (module dispatch mzscheme (require (lib "contract.ss")) (require "../private/connection-structs.ss" - "../request-structs.ss" - "../response-structs.ss") + "../private/request-structs.ss") (define dispatcher? (connection? request? . -> . void)) diff --git a/collects/web-server/request-structs.ss b/collects/web-server/private/request-structs.ss similarity index 100% rename from collects/web-server/request-structs.ss rename to collects/web-server/private/request-structs.ss diff --git a/collects/web-server/private/request.ss b/collects/web-server/private/request.ss index 2409947d12..7383f82d23 100644 --- a/collects/web-server/private/request.ss +++ b/collects/web-server/private/request.ss @@ -6,7 +6,7 @@ (lib "uri-codec.ss" "net")) (require "util.ss" "connection-manager.ss" - "../request-structs.ss") + "../private/request-structs.ss") (provide/contract [read-request ((connection? number? ((input-port?) . ->* . (string? string?))) . ->* . (request? boolean?))]) diff --git a/collects/web-server/response-structs.ss b/collects/web-server/private/response-structs.ss similarity index 100% rename from collects/web-server/response-structs.ss rename to collects/web-server/private/response-structs.ss diff --git a/collects/web-server/private/response.ss b/collects/web-server/private/response.ss index 3cccd4bd24..43f61165d3 100644 --- a/collects/web-server/private/response.ss +++ b/collects/web-server/private/response.ss @@ -4,7 +4,7 @@ (lib "pretty.ss") (lib "xml.ss" "xml") "connection-manager.ss" - "../response-structs.ss" + "../private/response-structs.ss" "util.ss") ;; Weak contracts for output-response because the response? is checked inside diff --git a/collects/web-server/private/servlet.ss b/collects/web-server/private/servlet.ss index c59fbe5d6c..c3d6d1aba9 100644 --- a/collects/web-server/private/servlet.ss +++ b/collects/web-server/private/servlet.ss @@ -3,7 +3,7 @@ (require "../managers/manager.ss" "../servlet/servlet-structs.ss" "connection-structs.ss" - "../request-structs.ss") + "../private/request-structs.ss") (define-struct (exn:fail:servlet:instance exn:fail) ()) (define-struct servlet (custodian namespace manager handler)) diff --git a/collects/web-server/prototype-web-server/dispatch-servlets2.ss b/collects/web-server/prototype-web-server/dispatch-servlets2.ss index 8c891b80e7..0b5d125235 100644 --- a/collects/web-server/prototype-web-server/dispatch-servlets2.ss +++ b/collects/web-server/prototype-web-server/dispatch-servlets2.ss @@ -2,11 +2,11 @@ (require (lib "kw.ss") (lib "contract.ss") (lib "url.ss" "net") - (lib "request-structs.ss" "web-server") (lib "session.ss" "web-server" "prototype-web-server" "private") (only "private/web.ss" initialize-servlet) (lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api") + "../private/request-structs.ss" "../dispatchers/dispatch.ss" "../private/connection-manager.ss" "../private/util.ss" @@ -61,11 +61,10 @@ (define cust (make-custodian top-cust)) (define ns (make-servlet-namespace #:additional-specs - '((lib "servlet.ss" "web-server") - (lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api") + '((lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api") (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") (lib "session.ss" "web-server" "prototype-web-server" "private") - (lib "request.ss" "web-server" "private")))) + (lib "request-structs.ss" "web-server" "private")))) (define ses (new-session cust ns (make-session-url uri (map path->string url-servlet-path)))) (parameterize ([current-custodian cust] [current-namespace ns] diff --git a/collects/web-server/prototype-web-server/lang-api.ss b/collects/web-server/prototype-web-server/lang-api.ss index 5eaa7c5d7b..b8dd3bb986 100644 --- a/collects/web-server/prototype-web-server/lang-api.ss +++ b/collects/web-server/prototype-web-server/lang-api.ss @@ -1,7 +1,7 @@ (module lang-api mzscheme (require (lib "url.ss" "net") - "../request-structs.ss" - "../response-structs.ss" + "../private/request-structs.ss" + "../private/response-structs.ss" "../servlet/helpers.ss" "private/abort-resume.ss" "private/web.ss" @@ -11,8 +11,8 @@ "lang-api/web-extras.ss") (provide (all-from-except mzscheme #%module-begin) (all-from (lib "url.ss" "net")) - (all-from "../request-structs.ss") - (all-from "../response-structs.ss") + (all-from "../private/request-structs.ss") + (all-from "../private/response-structs.ss") (all-from "../servlet/helpers.ss") (all-from "private/abort-resume.ss") (all-from "private/web.ss") diff --git a/collects/web-server/prototype-web-server/private/session.ss b/collects/web-server/prototype-web-server/private/session.ss index 7ef163e1ca..5be53446a2 100644 --- a/collects/web-server/prototype-web-server/private/session.ss +++ b/collects/web-server/prototype-web-server/private/session.ss @@ -1,8 +1,8 @@ (module session mzscheme (require (lib "contract.ss") (lib "url.ss" "net") - "../../response-structs.ss" - "../../request-structs.ss" + "../../private/response-structs.ss" + "../../private/request-structs.ss" "url-param.ss") (provide current-session) diff --git a/collects/web-server/prototype-web-server/private/web.ss b/collects/web-server/prototype-web-server/private/web.ss index f4ac30436f..195c07cb6e 100644 --- a/collects/web-server/prototype-web-server/private/web.ss +++ b/collects/web-server/prototype-web-server/private/web.ss @@ -2,7 +2,7 @@ (require (lib "serialize.ss") (lib "plt-match.ss") (lib "url.ss" "net") - "../../request-structs.ss" + "../../private/request-structs.ss" "abort-resume.ss" "session.ss" "stuff-url.ss" diff --git a/collects/web-server/prototype-web-server/servlets/add01.ss b/collects/web-server/prototype-web-server/servlets/add01.ss index 1fc1525446..27e2eb66bf 100644 --- a/collects/web-server/prototype-web-server/servlets/add01.ss +++ b/collects/web-server/prototype-web-server/servlets/add01.ss @@ -1,5 +1,5 @@ (module add01 mzscheme - (require (lib "request-structs.ss" "web-server") + (require (lib "request-structs.ss" "web-server" "private") (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/servlets/add02.ss b/collects/web-server/prototype-web-server/servlets/add02.ss index 7dd6cba64d..81011a097c 100644 --- a/collects/web-server/prototype-web-server/servlets/add02.ss +++ b/collects/web-server/prototype-web-server/servlets/add02.ss @@ -1,6 +1,4 @@ (module add02 (lib "lang.ss" "web-server" "prototype-web-server") - (require (lib "url.ss" "net") - (lib "request-structs.ss" "web-server")) (provide start) ;; get-number-from-user: string -> number diff --git a/collects/web-server/servlet.ss b/collects/web-server/servlet.ss index 292d03e240..a258e08093 100644 --- a/collects/web-server/servlet.ss +++ b/collects/web-server/servlet.ss @@ -6,8 +6,8 @@ "servlet/servlet-url.ss" "servlet/web.ss" "servlet/servlet-structs.ss" - "response-structs.ss" - "request-structs.ss") + "private/response-structs.ss" + "private/request-structs.ss") (provide (all-from "servlet/web.ss") (all-from "servlet/web-cells.ss") (all-from "servlet/helpers.ss") @@ -15,5 +15,5 @@ (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"))) \ No newline at end of file + (all-from "private/response-structs.ss") + (all-from "private/request-structs.ss"))) \ No newline at end of file diff --git a/collects/web-server/servlet/basic-auth.ss b/collects/web-server/servlet/basic-auth.ss index 3e4ddb5860..6ce733ea0f 100644 --- a/collects/web-server/servlet/basic-auth.ss +++ b/collects/web-server/servlet/basic-auth.ss @@ -2,7 +2,7 @@ (require (lib "contract.ss") (lib "plt-match.ss") (lib "base64.ss" "net")) - (require "../request-structs.ss") + (require "../private/request-structs.ss") ; Authentication ; extract-user-pass : (listof (cons sym bytes)) -> (or/c #f (cons str str)) diff --git a/collects/web-server/servlet/helpers.ss b/collects/web-server/servlet/helpers.ss index 3a32123eae..7802971233 100644 --- a/collects/web-server/servlet/helpers.ss +++ b/collects/web-server/servlet/helpers.ss @@ -3,8 +3,8 @@ (lib "kw.ss") (lib "plt-match.ss")) (require "../private/util.ss" - "../request-structs.ss" - "../response-structs.ss") + "../private/request-structs.ss" + "../private/response-structs.ss") (define (request-headers request) (map (match-lambda diff --git a/collects/web-server/servlet/servlet-structs.ss b/collects/web-server/servlet/servlet-structs.ss index 0c6f3c7cc9..478420979f 100644 --- a/collects/web-server/servlet/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 "../private/request-structs.ss" + "../private/response-structs.ss") (define servlet-response? any/c) diff --git a/collects/web-server/servlet/servlet-url.ss b/collects/web-server/servlet/servlet-url.ss index 7b22662df6..9200fb2658 100644 --- a/collects/web-server/servlet/servlet-url.ss +++ b/collects/web-server/servlet/servlet-url.ss @@ -2,7 +2,7 @@ (require (lib "list.ss") (lib "contract.ss") (lib "url.ss" "net")) - (require "../request-structs.ss" + (require "../private/request-structs.ss" "../private/util.ss") (define-struct servlet-url (url)) diff --git a/collects/web-server/servlet/web.ss b/collects/web-server/servlet/web.ss index a1dfecfdf6..ca27ddad5a 100644 --- a/collects/web-server/servlet/web.ss +++ b/collects/web-server/servlet/web.ss @@ -11,7 +11,7 @@ "../servlet/helpers.ss" "../servlet/web-cells.ss" "../servlet/servlet-structs.ss" - "../request-structs.ss") + "../private/request-structs.ss") ;; ************************************************************ ;; HELPERS diff --git a/collects/web-server/tests/test-post-patch.ss b/collects/web-server/tests/test-post-patch.ss index fd42750711..2ab3e425c5 100644 --- a/collects/web-server/tests/test-post-patch.ss +++ b/collects/web-server/tests/test-post-patch.ss @@ -4,7 +4,7 @@ (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)) (lib "connection-structs.ss" "web-server" "private") (lib "timer-structs.ss" "web-server" "private") - (lib "request-structs.ss" "web-server")) + (lib "request-structs.ss" "web-server" "private")) (require/expose (lib "request.ss" "web-server" "private") (read-bindings&post-data/raw))