From c2177d41227811400ba2a42c2604974b254dd079 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 25 May 2007 18:23:46 +0000 Subject: [PATCH] Standardize name and revert last change svn: r6314 --- .../prototype-web-server/{server.ss => dispatch-servlets2.ss} | 3 ++- collects/web-server/prototype-web-server/run.ss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename collects/web-server/prototype-web-server/{server.ss => dispatch-servlets2.ss} (98%) diff --git a/collects/web-server/prototype-web-server/server.ss b/collects/web-server/prototype-web-server/dispatch-servlets2.ss similarity index 98% rename from collects/web-server/prototype-web-server/server.ss rename to collects/web-server/prototype-web-server/dispatch-servlets2.ss index 285803584d..1e45d1f580 100644 --- a/collects/web-server/prototype-web-server/server.ss +++ b/collects/web-server/prototype-web-server/dispatch-servlets2.ss @@ -1,4 +1,4 @@ -(module server mzscheme +(module dispatch-servlets2 mzscheme (require (lib "kw.ss") "../private/configuration.ss" (lib "connection-manager.ss" "web-server" "private") @@ -53,6 +53,7 @@ '(mzscheme (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") (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")))) (define/kw (make #:key diff --git a/collects/web-server/prototype-web-server/run.ss b/collects/web-server/prototype-web-server/run.ss index 3b95bbb459..2e105f3b8d 100644 --- a/collects/web-server/prototype-web-server/run.ss +++ b/collects/web-server/prototype-web-server/run.ss @@ -8,7 +8,7 @@ (prefix files: (lib "dispatch-files.ss" "web-server" "dispatchers")) (prefix sequencer: (lib "dispatch-sequencer.ss" "web-server" "dispatchers"))) (require "hardcoded-configuration.ss" - (prefix prototype: "server.ss")) + (prefix servlets2: "dispatch-servlets2.ss")) (define port 8080) (define listen-ip #f) @@ -18,7 +18,7 @@ (define read-request http:read-request) (define dispatch (sequencer:make - (prototype:make #:servlet-root (paths-servlet (host-paths host-info)) + (servlets2:make #:servlet-root (paths-servlet (host-paths host-info)) #:timeouts-servlet-connection (timeouts-servlet-connection (host-timeouts host-info)) #:responders-servlet-loading (responders-servlet-loading (host-responders host-info)) #:responders-servlet (responders-servlet (host-responders host-info))