From 1090572e21d37a8dc1269090491ab1e2603e4e7d Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 1 Jun 2007 15:29:15 +0000 Subject: [PATCH] Rearranging prototype svn: r6437 --- .../web-server/prototype-web-server/dispatch-servlets2.ss | 4 ++-- collects/web-server/prototype-web-server/lang-api.ss | 8 ++++---- .../{private => lang-api}/stuff-url.ss | 6 +++--- .../prototype-web-server/lang-api/web-extras.ss | 2 +- .../prototype-web-server/{private => lang-api}/web.ss | 6 +++--- .../{private => lang}/abort-resume.ss | 4 ++-- .../web-server/prototype-web-server/lang/elim-callcc.ss | 2 +- .../web-server/prototype-web-server/lang/elim-letrec.ss | 2 +- .../prototype-web-server/tests/stuff-url-tests.ss | 2 +- collects/web-server/prototype-web-server/tests/util.ss | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename collects/web-server/prototype-web-server/{private => lang-api}/stuff-url.ss (92%) rename collects/web-server/prototype-web-server/{private => lang-api}/web.ss (96%) rename collects/web-server/prototype-web-server/{private => lang}/abort-resume.ss (98%) diff --git a/collects/web-server/prototype-web-server/dispatch-servlets2.ss b/collects/web-server/prototype-web-server/dispatch-servlets2.ss index 0b5d125235..d91de7fa9c 100644 --- a/collects/web-server/prototype-web-server/dispatch-servlets2.ss +++ b/collects/web-server/prototype-web-server/dispatch-servlets2.ss @@ -3,7 +3,7 @@ (lib "contract.ss") (lib "url.ss" "net") (lib "session.ss" "web-server" "prototype-web-server" "private") - (only "private/web.ss" + (only "lang-api/web.ss" initialize-servlet) (lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api") "../private/request-structs.ss" @@ -62,7 +62,7 @@ (define ns (make-servlet-namespace #:additional-specs '((lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api") - (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") + (lib "abort-resume.ss" "web-server" "prototype-web-server" "lang") (lib "session.ss" "web-server" "prototype-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)))) diff --git a/collects/web-server/prototype-web-server/lang-api.ss b/collects/web-server/prototype-web-server/lang-api.ss index b8dd3bb986..d197ca5679 100644 --- a/collects/web-server/prototype-web-server/lang-api.ss +++ b/collects/web-server/prototype-web-server/lang-api.ss @@ -3,8 +3,8 @@ "../private/request-structs.ss" "../private/response-structs.ss" "../servlet/helpers.ss" - "private/abort-resume.ss" - "private/web.ss" + "lang/abort-resume.ss" + "lang-api/web.ss" "lang-api/web-cells.ss" "lang-api/web-param.ss" "lang-api/file-box.ss" @@ -14,8 +14,8 @@ (all-from "../private/request-structs.ss") (all-from "../private/response-structs.ss") (all-from "../servlet/helpers.ss") - (all-from "private/abort-resume.ss") - (all-from "private/web.ss") + (all-from "lang/abort-resume.ss") + (all-from "lang-api/web.ss") (all-from "lang-api/web-cells.ss") (all-from "lang-api/web-param.ss") (all-from "lang-api/file-box.ss") diff --git a/collects/web-server/prototype-web-server/private/stuff-url.ss b/collects/web-server/prototype-web-server/lang-api/stuff-url.ss similarity index 92% rename from collects/web-server/prototype-web-server/private/stuff-url.ss rename to collects/web-server/prototype-web-server/lang-api/stuff-url.ss index ec08ed910a..f7212334d5 100644 --- a/collects/web-server/prototype-web-server/private/stuff-url.ss +++ b/collects/web-server/prototype-web-server/lang-api/stuff-url.ss @@ -2,9 +2,9 @@ (require (lib "contract.ss") (lib "url.ss" "net") (lib "serialize.ss") - "utils.ss" - "url-param.ss" - "mod-map.ss") + "../private/utils.ss" + "../private/url-param.ss" + "../private/mod-map.ss") ; XXX url: first try continuation, then turn into hash diff --git a/collects/web-server/prototype-web-server/lang-api/web-extras.ss b/collects/web-server/prototype-web-server/lang-api/web-extras.ss index ce199b1d58..ab1997a1e5 100644 --- a/collects/web-server/prototype-web-server/lang-api/web-extras.ss +++ b/collects/web-server/prototype-web-server/lang-api/web-extras.ss @@ -1,6 +1,6 @@ (module web-extras mzscheme (require (lib "url.ss" "net") - "../private/web.ss" + "web.ss" "../../servlet/helpers.ss") (provide send/suspend/dispatch redirect/get) diff --git a/collects/web-server/prototype-web-server/private/web.ss b/collects/web-server/prototype-web-server/lang-api/web.ss similarity index 96% rename from collects/web-server/prototype-web-server/private/web.ss rename to collects/web-server/prototype-web-server/lang-api/web.ss index 195c07cb6e..d618fa513d 100644 --- a/collects/web-server/prototype-web-server/private/web.ss +++ b/collects/web-server/prototype-web-server/lang-api/web.ss @@ -3,10 +3,10 @@ (lib "plt-match.ss") (lib "url.ss" "net") "../../private/request-structs.ss" - "abort-resume.ss" - "session.ss" + "../lang/abort-resume.ss" + "../private/session.ss" "stuff-url.ss" - "url-param.ss") + "../private/url-param.ss") (provide ;; Server Interface diff --git a/collects/web-server/prototype-web-server/private/abort-resume.ss b/collects/web-server/prototype-web-server/lang/abort-resume.ss similarity index 98% rename from collects/web-server/prototype-web-server/private/abort-resume.ss rename to collects/web-server/prototype-web-server/lang/abort-resume.ss index f433175ccb..5c5a0a13de 100644 --- a/collects/web-server/prototype-web-server/private/abort-resume.ss +++ b/collects/web-server/prototype-web-server/lang/abort-resume.ss @@ -1,8 +1,8 @@ (module abort-resume mzscheme - (require "define-closure.ss" - (lib "list.ss") + (require (lib "list.ss") (lib "plt-match.ss") (lib "serialize.ss") + "../private/define-closure.ss" "../lang-api/web-cells.ss") (provide diff --git a/collects/web-server/prototype-web-server/lang/elim-callcc.ss b/collects/web-server/prototype-web-server/lang/elim-callcc.ss index 5ae77ad5de..68379e65d4 100644 --- a/collects/web-server/prototype-web-server/lang/elim-callcc.ss +++ b/collects/web-server/prototype-web-server/lang/elim-callcc.ss @@ -1,6 +1,6 @@ (module elim-callcc mzscheme (require-for-template mzscheme - "../private/abort-resume.ss") + "../lang/abort-resume.ss") (require (lib "kerncase.ss" "syntax") "util.ss") (provide elim-callcc) diff --git a/collects/web-server/prototype-web-server/lang/elim-letrec.ss b/collects/web-server/prototype-web-server/lang/elim-letrec.ss index 51331536d3..4ba2721653 100644 --- a/collects/web-server/prototype-web-server/lang/elim-letrec.ss +++ b/collects/web-server/prototype-web-server/lang/elim-letrec.ss @@ -1,6 +1,6 @@ (module elim-letrec mzscheme (require-for-template mzscheme - "../private/abort-resume.ss") + "../lang/abort-resume.ss") (require (lib "kerncase.ss" "syntax") (lib "etc.ss") (lib "list.ss") diff --git a/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss b/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss index ddf64799db..10d07ac9ea 100644 --- a/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss +++ b/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss @@ -1,5 +1,5 @@ (module stuff-url-tests mzscheme - (require (lib "stuff-url.ss" "web-server" "prototype-web-server" "private") + (require (lib "stuff-url.ss" "web-server" "prototype-web-server" "lang-api") (lib "mod-map.ss" "web-server" "prototype-web-server" "private") (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (lib "url.ss" "net") diff --git a/collects/web-server/prototype-web-server/tests/util.ss b/collects/web-server/prototype-web-server/tests/util.ss index a661223170..d7d08f95a0 100644 --- a/collects/web-server/prototype-web-server/tests/util.ss +++ b/collects/web-server/prototype-web-server/tests/util.ss @@ -7,7 +7,7 @@ [(_ (module m-id . rest)) #'(let ([ns (make-namespace)]) (parameterize ([current-namespace ns]) - (eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") + (eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "lang") (lib "serialize.ss"))) (eval '(module m-id . rest)) (eval '(require m-id))) @@ -21,7 +21,7 @@ (define (make-eval/mod-path pth) (let ([ns (make-namespace)]) (parameterize ([current-namespace ns]) - (eval `(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") + (eval `(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "lang") (lib "serialize.ss") ,pth))) (lambda (expr)