From f14f1e190b03c792ff45d457d8b44948f599976e Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Sun, 4 Jun 2006 22:11:22 +0000 Subject: [PATCH] moving dispatchers in svn: r3219 --- .../{ => dispatchers}/dispatch-files.ss | 6 ++--- .../{ => dispatchers}/dispatch-host.ss | 2 +- .../{ => dispatchers}/dispatch-log.ss | 2 +- .../{ => dispatchers}/dispatch-passwords.ss | 8 +++---- .../dispatch-pathprocedure.ss | 4 ++-- .../{ => dispatchers}/dispatch-sequencer.ss | 4 ++-- .../{ => dispatchers}/dispatch-servlets.ss | 22 +++++++++---------- .../web-server/{ => dispatchers}/dispatch.ss | 6 ++--- collects/web-server/request-structs.ss | 2 +- collects/web-server/servlet-helpers.ss | 2 +- collects/web-server/web-server-unit.ss | 14 ++++++------ 11 files changed, 36 insertions(+), 36 deletions(-) rename collects/web-server/{ => dispatchers}/dispatch-files.ss (96%) rename collects/web-server/{ => dispatchers}/dispatch-host.ss (77%) rename collects/web-server/{ => dispatchers}/dispatch-log.ss (97%) rename collects/web-server/{ => dispatchers}/dispatch-passwords.ss (96%) rename collects/web-server/{ => dispatchers}/dispatch-pathprocedure.ss (82%) rename collects/web-server/{ => dispatchers}/dispatch-sequencer.ss (81%) rename collects/web-server/{ => dispatchers}/dispatch-servlets.ss (97%) rename collects/web-server/{ => dispatchers}/dispatch.ss (62%) diff --git a/collects/web-server/dispatch-files.ss b/collects/web-server/dispatchers/dispatch-files.ss similarity index 96% rename from collects/web-server/dispatch-files.ss rename to collects/web-server/dispatchers/dispatch-files.ss index 3d2e6439d6..f79b768954 100644 --- a/collects/web-server/dispatch-files.ss +++ b/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) diff --git a/collects/web-server/dispatch-host.ss b/collects/web-server/dispatchers/dispatch-host.ss similarity index 77% rename from collects/web-server/dispatch-host.ss rename to collects/web-server/dispatchers/dispatch-host.ss index 7efd3e02e4..7686b92803 100644 --- a/collects/web-server/dispatch-host.ss +++ b/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) diff --git a/collects/web-server/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss similarity index 97% rename from collects/web-server/dispatch-log.ss rename to collects/web-server/dispatchers/dispatch-log.ss index a8782477e6..d95e49b1f5 100644 --- a/collects/web-server/dispatch-log.ss +++ b/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) diff --git a/collects/web-server/dispatch-passwords.ss b/collects/web-server/dispatchers/dispatch-passwords.ss similarity index 96% rename from collects/web-server/dispatch-passwords.ss rename to collects/web-server/dispatchers/dispatch-passwords.ss index a26f212a65..8d5269729b 100644 --- a/collects/web-server/dispatch-passwords.ss +++ b/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) diff --git a/collects/web-server/dispatch-pathprocedure.ss b/collects/web-server/dispatchers/dispatch-pathprocedure.ss similarity index 82% rename from collects/web-server/dispatch-pathprocedure.ss rename to collects/web-server/dispatchers/dispatch-pathprocedure.ss index 5f364cfa33..f4b8523030 100644 --- a/collects/web-server/dispatch-pathprocedure.ss +++ b/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) diff --git a/collects/web-server/dispatch-sequencer.ss b/collects/web-server/dispatchers/dispatch-sequencer.ss similarity index 81% rename from collects/web-server/dispatch-sequencer.ss rename to collects/web-server/dispatchers/dispatch-sequencer.ss index 59931d2387..48bf5ca5e9 100644 --- a/collects/web-server/dispatch-sequencer.ss +++ b/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) diff --git a/collects/web-server/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss similarity index 97% rename from collects/web-server/dispatch-servlets.ss rename to collects/web-server/dispatchers/dispatch-servlets.ss index 11ad642e9e..b4077aed2f 100644 --- a/collects/web-server/dispatch-servlets.ss +++ b/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) diff --git a/collects/web-server/dispatch.ss b/collects/web-server/dispatchers/dispatch.ss similarity index 62% rename from collects/web-server/dispatch.ss rename to collects/web-server/dispatchers/dispatch.ss index 6271145040..9aa88d8e00 100644 --- a/collects/web-server/dispatch.ss +++ b/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")) diff --git a/collects/web-server/request-structs.ss b/collects/web-server/request-structs.ss index df33536cad..ad246076d4 100644 --- a/collects/web-server/request-structs.ss +++ b/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?] diff --git a/collects/web-server/servlet-helpers.ss b/collects/web-server/servlet-helpers.ss index 8364925e0b..6826e1b75f 100644 --- a/collects/web-server/servlet-helpers.ss +++ b/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 diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss index 4e391854d9..81e9053e92 100644 --- a/collects/web-server/web-server-unit.ss +++ b/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")