privacy

svn: r4373

collects/web-server/configuration.ss

@@ -2,12 +2,12 @@
   (require (lib "unitsig.ss")
            (lib "list.ss")
            (lib "contract.ss"))
-  (require "configuration-structures.ss"
+  (require "private/configuration-structures.ss"
-           "configuration-table-structs.ss"
+           "private/configuration-table-structs.ss"
-           "sig.ss"
+           "private/util.ss"
-           "util.ss"
+           "private/parse-table.ss"
-           "parse-table.ss"
            "private/cache-table.ss"
+           "sig.ss"
            "response.ss")
   
   (define default-configuration-table-path

collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss

@@ -1,6 +1,5 @@
 (require (lib "unitsig.ss")
          (lib "servlet-sig.ss" "web-server")
-         (lib "servlet-helpers.ss" "web-server")
          (lib "date.ss"))
 
 (unit/sig () (import servlet^)

collects/web-server/default-web-root/servlets/configure.ss

@@ -3,6 +3,6 @@
 ; The servlet accepts requests only from the *same machine* as the Web server
 ; for security purposes.
 
-(require (lib "configure.ss" "web-server"))
+(require (lib "configure.ss" "web-server" "private"))
 
 servlet

collects/web-server/default-web-root/servlets/tests/cut-module.ss

@@ -1,9 +1,7 @@
 ; purpose: to test send/suspend, send/forward, send/back, and send/finish
 (module cut-module mzscheme
   (provide interface-version timeout start)
-  (require (lib "servlet.ss" "web-server")
+  (require (lib "servlet.ss" "web-server"))
-           (lib "servlet-helpers.ss" "web-server")
-           (lib "servlet-sig.ss" "web-server"))
   
   (define interface-version 'v1)
   

collects/web-server/default-web-root/servlets/tests/incremental.ss

@@ -1,5 +1,4 @@
 (require (lib "servlet-sig.ss" "web-server")
-;         (lib "servlet-helpers.ss" "web-server")
          (lib "unitsig.ss"))
 
 (unit/sig ()

collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss

@@ -1,8 +1,6 @@
 (module module-suspended-init mzscheme
   (provide interface-version timeout start)
-  (require (lib "servlet.ss" "web-server")
+  (require (lib "servlet.ss" "web-server"))
-           (lib "servlet-helpers.ss" "web-server")
-           (lib "servlet-sig.ss" "web-server"))
   
   (define interface-version 'v1)
   

collects/web-server/default-web-root/servlets/tests/suspended-module.ss

@@ -1,7 +1,6 @@
 (module suspended-module mzscheme
   (provide interface-version timeout start)
   (require (lib "servlet.ss" "web-server")
-           (lib "servlet-helpers.ss" "web-server")
            (lib "servlet-sig.ss" "web-server"))
   
   (define interface-version 'v1)

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

@@ -8,10 +8,10 @@
   (require (lib "pretty.ss"))         
   (require "dispatch.ss"
            "../configuration.ss"
-           "../util.ss"
+           "../private/util.ss"
-           "../mime-types.ss"
+           "../private/mime-types.ss"
            "../private/request.ss"
-           "../servlet-helpers.ss"
+           "../private/servlet-helpers.ss"
            "../response.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?])

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

@@ -1,7 +1,7 @@
 (module dispatch-host mzscheme
   (require (lib "contract.ss"))
   (require "dispatch.ss"
-           "../servlet-helpers.ss")
+           "../private/servlet-helpers.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]
    [make ((symbol? . -> . dispatcher?) . -> . dispatcher?)])

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

@@ -6,7 +6,7 @@
            (lib "plt-match.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           "../servlet-helpers.ss")  
+           "../private/servlet-helpers.ss")  
   (provide/contract
    [interface-version dispatcher-interface-version?])
   (provide ; XXX contract kw

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

@@ -2,10 +2,10 @@
   (require (lib "kw.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           (all-except "../util.ss" translate-escapes)
+           (all-except "../private/util.ss" translate-escapes)
            "../configuration.ss"
-           "../servlet-helpers.ss"
+           "../private/servlet-helpers.ss"
-           "../connection-manager.ss"
+           "../private/connection-manager.ss"
            "../response.ss")  
   (provide/contract
    [interface-version dispatcher-interface-version?])

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

@@ -1,7 +1,7 @@
 (module dispatch-pathprocedure mzscheme
   (require (lib "contract.ss"))
   (require "dispatch.ss"
-           "../util.ss"
+           "../private/util.ss"
            "../response.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]

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

@@ -5,13 +5,13 @@
            (lib "unitsig.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           "../web-server-structs.ss"
+           "../private/web-server-structs.ss"
-           "../connection-manager.ss"
+           "../private/connection-manager.ss"
            "../response.ss"
            "../servlet.ss"
            "../sig.ss"
            "../configuration.ss"
-           (all-except "../util.ss" translate-escapes)
+           (all-except "../private/util.ss" translate-escapes)
            "../managers/manager.ss"
            "../managers/timeouts.ss"
            "../managers/lru.ss"

collects/web-server/dispatchers/dispatch.ss

@@ -1,6 +1,6 @@
 (module dispatch mzscheme
   (require (lib "contract.ss"))
-  (require "../connection-structs.ss"
+  (require "../private/connection-structs.ss"
            "../request-structs.ss"
            "../response-structs.ss")
   

collects/web-server/gui-launch.ss

@@ -1,7 +1,7 @@
 (module gui-launch mzscheme
-  (require "launch.ss"
+  (require (lib "class.ss")
-	   (lib "class.ss")
 	   (lib "mred.ss" "mred"))
+  (require "private/launch.ss")
 
   (define shutdown (serve))
 

collects/web-server/managers/timeouts.ss

@@ -2,7 +2,7 @@
   (require (lib "plt-match.ss")
            (lib "contract.ss"))
   (require "manager.ss")
-  (require "../timer.ss"
+  (require "../private/timer.ss"
            "../servlet-structs.ss")
   (provide/contract
    [create-timeout-manager (expiration-handler? number? number? . -> . manager?)])

collects/web-server/monitor-launch.ss

@@ -1,7 +1,7 @@
 ; The main program of the "web-server-monitor" launcher. 
 (module monitor-launch mzscheme
-  (require "monitor-server.ss"
+  (require "private/monitor-server.ss"
-           "util.ss"
+           "private/util.ss"
            (lib "cmdline.ss"))
   
   ; handle-numeric-flag : sym -> str str -> (cons sym num)

collects/web-server/private/configuration-structures.ss

@@ -2,8 +2,8 @@
   (require (lib "unitsig.ss")
            (lib "contract.ss")
            (lib "url.ss" "net"))
-  (require "response-structs.ss"
+  (require "configuration-table-structs.ss"
-           "configuration-table-structs.ss")
+           "../response-structs.ss")           
   
   ; configuration is now a unit.  See sig.ss
   ; XXX contract

collects/web-server/private/configure.ss

@@ -9,10 +9,10 @@
            (lib "contract.ss")
            (only (lib "configuration.ss" "web-server")
                  default-configuration-table-path)
-           (lib "configuration-table-structs.ss" "web-server")
+           (lib "configuration-table-structs.ss" "web-server" "private")
-           (lib "parse-table.ss" "web-server")
+           (lib "parse-table.ss" "web-server" "private")
-           (lib "configuration-util.ss" "web-server")
+           (lib "configuration-util.ss" "web-server" "private")
-           (all-except (lib "util.ss" "web-server") translate-escapes))
+           (all-except (lib "util.ss" "web-server" "private") translate-escapes))
   (provide/contract
    [servlet unit/sig?]
    ; XXX contract

collects/web-server/private/launch.ss

@@ -6,10 +6,10 @@
            (lib "unitsig.ss")
            (lib "tcp-sig.ss" "net"))
   (require "util.ss"           
-           "web-server-unit.ss"
+           "configuration-structures.ss"
-           "sig.ss"
+           "../web-server-unit.ss"
-           "configuration.ss"
+           "../sig.ss"
-           "configuration-structures.ss")
+           "../configuration.ss")
 
   (define configuration@
     (parse-command-line

collects/web-server/private/request.ss

@@ -3,8 +3,8 @@
            (lib "plt-match.ss")
            (lib "url.ss" "net")
            (lib "list.ss"))
-  (require "../util.ss"
+  (require "util.ss"
-           "../connection-manager.ss"
+           "connection-manager.ss"
            "../request-structs.ss")
   
   (provide/contract

collects/web-server/private/servlet-helpers.ss

@@ -6,12 +6,12 @@
            (lib "base64.ss" "net")
            (lib "url.ss" "net"))
   (require "util.ss"
-           "response.ss"
-           "request-structs.ss"
            "bindings.ss"
-           "servlet-structs.ss")
+           "../servlet-structs.ss"
+           "../request-structs.ss"
+           "../response.ss")
   (provide (all-from "bindings.ss")
-           (all-from "request-structs.ss"))  
+           (all-from "../request-structs.ss"))  
   
   (define (request-headers request)
     (map (match-lambda

collects/web-server/private/servlet.ss

@@ -2,7 +2,7 @@
   (require (lib "contract.ss"))
   (require "../managers/manager.ss"
            "../servlet-structs.ss"
-           "../connection-structs.ss"
+           "connection-structs.ss"
            "../request-structs.ss")
   
   (define-struct (exn:fail:servlet:instance exn:fail) ())

collects/web-server/private/util.ss

@@ -6,7 +6,7 @@
            (lib "url.ss" "net")
            (lib "errortrace-lib.ss" "errortrace")
            (lib "uri-codec.ss" "net"))
-  (require "request-structs.ss")
+  (require "../request-structs.ss")
   
   ;; valid-port? : any/c -> boolean?
   (define (valid-port? p)

collects/web-server/response.ss

@@ -5,9 +5,9 @@
            (lib "pretty.ss")
            (lib "xml.ss" "xml")
            (lib "string.ss" "srfi" "13")
-           "connection-manager.ss"
+           "private/connection-manager.ss"
            "response-structs.ss"
-           "util.ss")
+           "private/util.ss")
   (provide (all-from "response-structs.ss"))
   
   ;; Weak contracts for output-response because the response? is checked inside

collects/web-server/servlet-env.ss

@@ -4,7 +4,7 @@
   (require "configuration.ss"
            "web-server.ss"
            "sig.ss"
-           "util.ss"
+           "private/util.ss"
            "response.ss"
            "managers/timeouts.ss"
            "private/servlet.ss"

collects/web-server/servlet-sig.ss

@@ -1,6 +1,6 @@
 ;; Default choice for writing signed-unit servlets
 (module servlet-sig mzscheme
   (require "sig.ss"
-           "servlet-helpers.ss")
+           "private/servlet-helpers.ss")
   (provide (all-from "sig.ss")
-           (all-from "servlet-helpers.ss")))
+           (all-from "private/servlet-helpers.ss")))

collects/web-server/servlet.ss

@@ -5,8 +5,8 @@
   (require "managers/manager.ss"
            "private/servlet.ss"
            "private/url.ss"
-           "servlet-helpers.ss"
+           "private/servlet-helpers.ss"
-           "web-cells.ss"
+           "private/web-cells.ss"
            "servlet-structs.ss")  
   
   ;; ************************************************************
@@ -41,8 +41,8 @@
    [send/suspend/callback (xexpr/callback? . -> . any/c)])
   
   (require "url.ss")
-  (provide (all-from "web-cells.ss")
+  (provide (all-from "private/web-cells.ss")
-           (all-from "servlet-helpers.ss")
+           (all-from "private/servlet-helpers.ss")
            (all-from "url.ss")
            (all-from "servlet-structs.ss"))
   

collects/web-server/setup-launch.ss

@@ -3,9 +3,9 @@
            (lib "file.ss")
            (lib "struct.ss"))
   (require "configuration.ss"
-           "configuration-table-structs.ss"
+           "private/configuration-table-structs.ss"
-           "util.ss"
+           "private/util.ss"
-           "configuration-util.ss")
+           "private/configuration-util.ss")
   
   (parse-command-line
    "web-server-setup"

collects/web-server/sig.ss

@@ -1,6 +1,6 @@
 (module sig mzscheme
   (require (lib "unitsig.ss"))
-  (require "dispatch-server-sig.ss")
+  (require "private/dispatch-server-sig.ss")
   (provide ; XXX contract signature
    web-server^ servlet^ web-config^ web-config/pervasive^ web-config/local^)
 

collects/web-server/text-launch.ss

@@ -1,7 +1,4 @@
-
 (module text-launch mzscheme
-  (require "launch.ss")
+  (require "private/launch.ss")
-
   (serve)
-
   (semaphore-wait (make-semaphore)))

collects/web-server/web-server-unit.ss

@@ -3,10 +3,10 @@
            (lib "contract.ss")
            (lib "unitsig.ss"))
   (require "sig.ss"
-           "dispatch-server-unit.ss"
+           "private/dispatch-server-unit.ss"
-           "dispatch-server-sig.ss"
+           "private/dispatch-server-sig.ss"
-           "web-server-structs.ss"
+           "private/web-server-structs.ss"
-           "configuration-structures.ss"
+           "private/configuration-structures.ss"
            "private/cache-table.ss"
            (rename "private/request.ss" 
                    the-read-request read-request))

collects/web-server/web-server.ss

@@ -5,7 +5,7 @@
            "sig.ss"
            "web-server-unit.ss"
 	   "configuration.ss"
-           "configuration-structures.ss")
+           "private/configuration-structures.ss")
   (provide/contract
    [serve (case-> [configuration? . -> . (-> void?)]
                   [configuration? natural-number/c . -> . (-> void?)]