moving dispatchers in

svn: r3219

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

@@ -3,9 +3,9 @@
            (lib "xml.ss" "xml")
            (lib "list.ss"))
   (require "dispatch.ss"
-           "util.ss"
-           "mime-types.ss"
-           "response.ss")  
+           "../util.ss"
+           "../mime-types.ss"
+           "../response.ss")  
   (provide interface-version
            gen-dispatcher)
   

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

@@ -1,6 +1,6 @@
 (module dispatch-host mzscheme
   (require "dispatch.ss"
-           "servlet-helpers.ss")
+           "../servlet-helpers.ss")
   (provide interface-version
            gen-dispatcher)
   

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

@@ -4,7 +4,7 @@
            (lib "async-channel.ss")
            (lib "plt-match.ss"))
   (require "dispatch.ss"
-           "servlet-helpers.ss")  
+           "../servlet-helpers.ss")  
   (provide interface-version
            gen-dispatcher)
   

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

@@ -1,9 +1,9 @@
 (module dispatch-passwords mzscheme
   (require "dispatch.ss"
-           "util.ss"
-           "servlet-helpers.ss"
-           "connection-manager.ss"
-           "response.ss")
+           (all-except "../util.ss" translate-escapes)
+           "../servlet-helpers.ss"
+           "../connection-manager.ss"
+           "../response.ss")
   
   (provide interface-version
            gen-dispatcher)

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

@@ -1,7 +1,7 @@
 (module dispatch-pathprocedure mzscheme
   (require "dispatch.ss"
-           "util.ss"
-           "response.ss")
+           "../util.ss"
+           "../response.ss")
   (provide interface-version
            gen-dispatcher)
   

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

@@ -1,6 +1,6 @@
 (module dispatch-sequencer mzscheme
-  (require "dispatch.ss"
-           (lib "list.ss"))
+  (require (lib "list.ss"))
+  (require "dispatch.ss")
   (provide interface-version
            gen-dispatcher)
   

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

@@ -3,17 +3,17 @@
            (lib "plt-match.ss")
            (lib "unitsig.ss"))
   (require "dispatch.ss"
-           "web-server-structs.ss"
-           "connection-manager.ss"
-           "response.ss"
-           "servlet.ss"
-           "sig.ss"
-           "util.ss"
-           "managers/manager.ss"
-           "managers/timeouts.ss"
-           "private/url.ss"
-           "private/servlet.ss"
-           "private/cache-table.ss")  
+           "../web-server-structs.ss"
+           "../connection-manager.ss"
+           "../response.ss"
+           "../servlet.ss"
+           "../sig.ss"
+           (all-except "../util.ss" translate-escapes)
+           "../managers/manager.ss"
+           "../managers/timeouts.ss"
+           "../private/url.ss"
+           "../private/servlet.ss"
+           "../private/cache-table.ss")  
   (provide interface-version
            gen-dispatcher)
   

collects/web-server/dispatchers/dispatch.ss

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

collects/web-server/request-structs.ss

@@ -37,7 +37,7 @@
                                    [filename bytes?]
                                    [content bytes?])])
   
-  (define-struct request (method uri headers bindings/raw
+  (define-struct request (method uri headers/raw bindings/raw
                                  host-ip host-port client-ip))
   (provide/contract
    [struct request ([method symbol?] [uri url?] 

collects/web-server/servlet-helpers.ss

@@ -23,7 +23,7 @@
            (all-from "request-structs.ss")
            request-bindings
            request-headers
-           translate-escapes)    
+           translate-escapes)
   
   (define (request-headers request)
     (map (match-lambda

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

@@ -7,13 +7,13 @@
            "private/cache-table.ss"
            (rename "private/request.ss" 
                    the-read-request read-request))
-  (require (prefix sequencer: "dispatch-sequencer.ss")
-           (prefix passwords: "dispatch-passwords.ss")
-           (prefix files: "dispatch-files.ss")
-           (prefix servlets: "dispatch-servlets.ss")
-           (prefix path-procedure: "dispatch-pathprocedure.ss")
-           (prefix log: "dispatch-log.ss")
-           (prefix host: "dispatch-host.ss"))
+  (require (prefix sequencer: "dispatchers/dispatch-sequencer.ss")
+           (prefix passwords: "dispatchers/dispatch-passwords.ss")
+           (prefix files: "dispatchers/dispatch-files.ss")
+           (prefix servlets: "dispatchers/dispatch-servlets.ss")
+           (prefix path-procedure: "dispatchers/dispatch-pathprocedure.ss")
+           (prefix log: "dispatchers/dispatch-log.ss")
+           (prefix host: "dispatchers/dispatch-host.ss"))
   (require (lib "tcp-sig.ss" "net")
            (lib "unitsig.ss")
            (lib "string.ss")