Privatization

svn: r6436

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"
+  (require "../private/response-structs.ss"
-           "../request-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

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"
+  (require "../private/response-structs.ss"
-           "../request-structs.ss")
+           "../private/request-structs.ss")
   
   ; error-response : nat str str [(cons sym str) ...] -> response
   ; XXX - cache files with a refresh option.

collects/web-server/dispatchers/dispatch-const.ss

@@ -2,8 +2,8 @@
   (require (lib "contract.ss"))
   (require "dispatch.ss"
            "../private/response.ss"
-           "../request-structs.ss"
+           "../private/request-structs.ss"
-           "../response-structs.ss")
+           "../private/response-structs.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]
    [make ((request? . -> . response?) . -> . dispatcher?)])

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?])

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?]

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?]

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)  

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")  

collects/web-server/dispatchers/dispatch-pathprocedure.ss

@@ -4,8 +4,8 @@
   (require "dispatch.ss"
            "../private/util.ss"
            "../private/response.ss"
-           "../request-structs.ss"
+           "../private/request-structs.ss"
-           "../response-structs.ss")
+           "../private/response-structs.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]
    [make (string? (request? . -> . response?) . -> . dispatcher?)])

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"
+           "../private/request-structs.ss"
-           "../servlet/servlet-structs.ss"
+           "../private/response-structs.ss"
-           "../response-structs.ss"
            "../servlet/web-cells.ss"
            "../servlet/web.ss"
            "../configuration/responders.ss"

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"
+           "../private/request-structs.ss")
-           "../response-structs.ss")
   
   (define dispatcher? 
     (connection? request? . -> . void))

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?))])

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

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))

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]

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"
+           "../private/request-structs.ss"
-           "../response-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 "../private/request-structs.ss")
-           (all-from "../response-structs.ss")
+           (all-from "../private/response-structs.ss")
            (all-from "../servlet/helpers.ss")
            (all-from "private/abort-resume.ss")
            (all-from "private/web.ss")

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"
+           "../../private/response-structs.ss"
-           "../../request-structs.ss"
+           "../../private/request-structs.ss"
            "url-param.ss")
   (provide current-session)
   

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"

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)
 

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

collects/web-server/servlet.ss

@@ -6,8 +6,8 @@
            "servlet/servlet-url.ss"
            "servlet/web.ss"
            "servlet/servlet-structs.ss"
-           "response-structs.ss"
+           "private/response-structs.ss"
-           "request-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 "private/response-structs.ss")
-           (all-from "request-structs.ss")))
+           (all-from "private/request-structs.ss")))

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))

collects/web-server/servlet/helpers.ss

@@ -3,8 +3,8 @@
            (lib "kw.ss")
            (lib "plt-match.ss"))
   (require "../private/util.ss"
-           "../request-structs.ss"
+           "../private/request-structs.ss"
-           "../response-structs.ss")
+           "../private/response-structs.ss")
   
   (define (request-headers request)
     (map (match-lambda

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"
+  (require "../private/request-structs.ss"
-           "../response-structs.ss")  
+           "../private/response-structs.ss")  
   
   (define servlet-response?
     any/c)

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))

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

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))