From 98515e3062894536db8857cf003014c54c0d52f0 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 25 May 2007 18:19:05 +0000 Subject: [PATCH] Privitization svn: r6312 --- collects/web-server/prototype-web-server/lang.ss | 8 ++++---- .../prototype-web-server/lang/defun.ss | 2 +- .../prototype-web-server/lang/elim-callcc.ss | 2 +- .../prototype-web-server/lang/elim-letrec.ss | 2 +- .../prototype-web-server/newcont/web-cells.ss | 2 +- .../prototype-web-server/newcont/web-param.ss | 2 +- .../{ => private}/abort-resume.ss | 2 +- .../{ => private}/closure.ss | 0 .../{ => private}/define-closure.ss | 0 .../{ => private}/persistent-web-interaction.ss | 0 .../{ => private}/session.ss | 0 .../{ => private}/stuff-url.ss | 4 ++-- .../prototype-web-server/{ => private}/utils.ss | 0 .../web-server/prototype-web-server/server.ss | 12 ++++++------ .../prototype-web-server/servlets/add01.ss | 2 +- .../prototype-web-server/tests/closure-tests.ss | 2 +- .../tests/stuff-url-tests.ss | 16 ++++++++-------- .../prototype-web-server/tests/util.ss | 4 ++-- 18 files changed, 30 insertions(+), 30 deletions(-) rename collects/web-server/prototype-web-server/{ => private}/abort-resume.ss (99%) rename collects/web-server/prototype-web-server/{ => private}/closure.ss (100%) rename collects/web-server/prototype-web-server/{ => private}/define-closure.ss (100%) rename collects/web-server/prototype-web-server/{ => private}/persistent-web-interaction.ss (100%) rename collects/web-server/prototype-web-server/{ => private}/session.ss (100%) rename collects/web-server/prototype-web-server/{ => private}/stuff-url.ss (98%) rename collects/web-server/prototype-web-server/{ => private}/utils.ss (100%) diff --git a/collects/web-server/prototype-web-server/lang.ss b/collects/web-server/prototype-web-server/lang.ss index 4718f3f830..cbf0abf824 100644 --- a/collects/web-server/prototype-web-server/lang.ss +++ b/collects/web-server/prototype-web-server/lang.ss @@ -7,12 +7,12 @@ "lang/anormal.ss" "lang/elim-callcc.ss" "lang/defun.ss") - (require "abort-resume.ss" - "persistent-web-interaction.ss") + (require "private/abort-resume.ss" + "private/persistent-web-interaction.ss") (provide (rename lang-module-begin #%module-begin)) - (provide (all-from "abort-resume.ss") + (provide (all-from "private/abort-resume.ss") (all-from-except mzscheme #%module-begin) - (all-from "persistent-web-interaction.ss")) + (all-from "private/persistent-web-interaction.ss")) (define-syntax lang-module-begin (make-lang-module-begin diff --git a/collects/web-server/prototype-web-server/lang/defun.ss b/collects/web-server/prototype-web-server/lang/defun.ss index 760ae84bf3..cd6e4ad8bf 100644 --- a/collects/web-server/prototype-web-server/lang/defun.ss +++ b/collects/web-server/prototype-web-server/lang/defun.ss @@ -5,7 +5,7 @@ (lib "plt-match.ss") "util.ss" "freevars.ss" - "../closure.ss") + "../private/closure.ss") (provide defun) ; make-new-clouse-label : (syntax -> syntax) syntax -> syntax 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 ac2f106af4..3f1a331eb8 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 - "../abort-resume.ss") + "../private/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 a97f9d5d46..51331536d3 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 - "../abort-resume.ss") + "../private/abort-resume.ss") (require (lib "kerncase.ss" "syntax") (lib "etc.ss") (lib "list.ss") diff --git a/collects/web-server/prototype-web-server/newcont/web-cells.ss b/collects/web-server/prototype-web-server/newcont/web-cells.ss index a7a9e48a81..f10e609aff 100644 --- a/collects/web-server/prototype-web-server/newcont/web-cells.ss +++ b/collects/web-server/prototype-web-server/newcont/web-cells.ss @@ -1,5 +1,5 @@ (module web-cells mzscheme - (require "../closure.ss" + (require "../private/closure.ss" (lib "serialize.ss") (lib "list.ss") (lib "plt-match.ss") diff --git a/collects/web-server/prototype-web-server/newcont/web-param.ss b/collects/web-server/prototype-web-server/newcont/web-param.ss index 4a21c64303..7adb70721e 100644 --- a/collects/web-server/prototype-web-server/newcont/web-param.ss +++ b/collects/web-server/prototype-web-server/newcont/web-param.ss @@ -1,5 +1,5 @@ (module web-param mzscheme - (require "../closure.ss" + (require "../private/closure.ss" (lib "list.ss")) (provide make-web-parameter next-web-parameter-id diff --git a/collects/web-server/prototype-web-server/abort-resume.ss b/collects/web-server/prototype-web-server/private/abort-resume.ss similarity index 99% rename from collects/web-server/prototype-web-server/abort-resume.ss rename to collects/web-server/prototype-web-server/private/abort-resume.ss index cbc5396a08..115ad1df12 100644 --- a/collects/web-server/prototype-web-server/abort-resume.ss +++ b/collects/web-server/prototype-web-server/private/abort-resume.ss @@ -2,7 +2,7 @@ (require "define-closure.ss" (lib "plt-match.ss") (lib "serialize.ss") - "newcont/web-cells.ss") + "../newcont/web-cells.ss") (provide ;; AUXILLIARIES diff --git a/collects/web-server/prototype-web-server/closure.ss b/collects/web-server/prototype-web-server/private/closure.ss similarity index 100% rename from collects/web-server/prototype-web-server/closure.ss rename to collects/web-server/prototype-web-server/private/closure.ss diff --git a/collects/web-server/prototype-web-server/define-closure.ss b/collects/web-server/prototype-web-server/private/define-closure.ss similarity index 100% rename from collects/web-server/prototype-web-server/define-closure.ss rename to collects/web-server/prototype-web-server/private/define-closure.ss diff --git a/collects/web-server/prototype-web-server/persistent-web-interaction.ss b/collects/web-server/prototype-web-server/private/persistent-web-interaction.ss similarity index 100% rename from collects/web-server/prototype-web-server/persistent-web-interaction.ss rename to collects/web-server/prototype-web-server/private/persistent-web-interaction.ss diff --git a/collects/web-server/prototype-web-server/session.ss b/collects/web-server/prototype-web-server/private/session.ss similarity index 100% rename from collects/web-server/prototype-web-server/session.ss rename to collects/web-server/prototype-web-server/private/session.ss diff --git a/collects/web-server/prototype-web-server/stuff-url.ss b/collects/web-server/prototype-web-server/private/stuff-url.ss similarity index 98% rename from collects/web-server/prototype-web-server/stuff-url.ss rename to collects/web-server/prototype-web-server/private/stuff-url.ss index 5eb39772a0..6ac47c712b 100644 --- a/collects/web-server/prototype-web-server/stuff-url.ss +++ b/collects/web-server/prototype-web-server/private/stuff-url.ss @@ -154,7 +154,7 @@ (map (lambda (n-or-k) (if (symbol? n-or-k) - `((lib "abort-resume.ss" "prototype-web-server") . ,n-or-k) + `((lib "abort-resume.ss" "web-server" "prototype-web-server" "private") . ,n-or-k) (cons mod-path (string->symbol @@ -197,7 +197,7 @@ [(and (same-module? pth (caar mm)) (match-label (cdar mm))) => (lambda (lab) (cons lab (loop (cdr mm))))] - [(same-module? '(lib "abort-resume.ss" "web-server" "prototype-web-server") (caar mm)) + [(same-module? '(lib "abort-resume.ss" "web-server" "prototype-web-server" "private") (caar mm)) (cons (cdar mm) (loop (cdr mm)))] [else (error "cannot construct abreviated module map" mod-map)]))) diff --git a/collects/web-server/prototype-web-server/utils.ss b/collects/web-server/prototype-web-server/private/utils.ss similarity index 100% rename from collects/web-server/prototype-web-server/utils.ss rename to collects/web-server/prototype-web-server/private/utils.ss diff --git a/collects/web-server/prototype-web-server/server.ss b/collects/web-server/prototype-web-server/server.ss index 2371caa77f..89d989cd67 100644 --- a/collects/web-server/prototype-web-server/server.ss +++ b/collects/web-server/prototype-web-server/server.ss @@ -10,14 +10,14 @@ (lib "list.ss") (lib "plt-match.ss") (lib "dispatch.ss" "web-server" "dispatchers") - (lib "session.ss" "web-server" "prototype-web-server") - (only (lib "abort-resume.ss" "web-server" "prototype-web-server") + (lib "session.ss" "web-server" "prototype-web-server" "private") + (only (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") run-start) - (only "persistent-web-interaction.ss" + (only "private/persistent-web-interaction.ss" start-servlet) (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") "xexpr-extras.ss" - "utils.ss") + "private/utils.ss") (provide make) @@ -52,8 +52,8 @@ #:to-be-copied-module-specs '(mzscheme (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") - (lib "abort-resume.ss" "web-server" "prototype-web-server") - (lib "session.ss" "web-server" "prototype-web-server") + (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/servlets/add01.ss b/collects/web-server/prototype-web-server/servlets/add01.ss index a68c40d852..25e8148427 100644 --- a/collects/web-server/prototype-web-server/servlets/add01.ss +++ b/collects/web-server/prototype-web-server/servlets/add01.ss @@ -1,5 +1,5 @@ (module add01 mzscheme - (require (lib "session.ss" "web-server" "prototype-web-server") + (require (lib "session.ss" "web-server" "prototype-web-server" "private") (lib "request-structs.ss" "web-server") (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/tests/closure-tests.ss b/collects/web-server/prototype-web-server/tests/closure-tests.ss index 5cdaf1cd4d..c7e39c4dfc 100644 --- a/collects/web-server/prototype-web-server/tests/closure-tests.ss +++ b/collects/web-server/prototype-web-server/tests/closure-tests.ss @@ -3,7 +3,7 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (lib "serialize.ss") (lib "match.ss") - "../define-closure.ss") + "../private/define-closure.ss") (define-closure id (x) () x) 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 d19dadfd1f..6a2b767450 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") + (require (lib "stuff-url.ss" "web-server" "prototype-web-server" "private") (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (planet "util.ss" ("schematics" "schemeunit.plt" 2)) (lib "url.ss" "net") @@ -7,7 +7,7 @@ (lib "file.ss") "util.ss") - (require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server") + (require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server" "private") (same-module? url-parts recover-serial)) (provide stuff-url-suite) @@ -39,17 +39,17 @@ "Test same-module?" (check-true - (same-module? `(file ,(path->string (build-absolute-path (find-collects-dir) "web-server" "prototype-web-server" "abort-resume.ss"))) - '(lib "abort-resume.ss" "web-server" "prototype-web-server"))) + (same-module? `(file ,(path->string (build-absolute-path (find-collects-dir) "web-server" "prototype-web-server" "private" "abort-resume.ss"))) + '(lib "abort-resume.ss" "web-server" "prototype-web-server" "private"))) (check-true - (same-module? `(file ,(path->string (build-absolute-path (current-directory) "../abort-resume.ss"))) - '(lib "abort-resume.ss" "web-server" "prototype-web-server"))) + (same-module? `(file ,(path->string (build-absolute-path (current-directory) "../private/abort-resume.ss"))) + '(lib "abort-resume.ss" "web-server" "prototype-web-server" "private"))) (check-true (same-module? - '(lib "abort-resume.ss" "web-server" "prototype-web-server") - '(lib "./abort-resume.ss" "web-server" "prototype-web-server")))) + '(lib "abort-resume.ss" "web-server" "prototype-web-server" "private") + '(lib "./abort-resume.ss" "web-server" "prototype-web-server" "private")))) (test-case "compose url-parts and recover-serial (1)" diff --git a/collects/web-server/prototype-web-server/tests/util.ss b/collects/web-server/prototype-web-server/tests/util.ss index 2c65b69543..7ac1363542 100644 --- a/collects/web-server/prototype-web-server/tests/util.ss +++ b/collects/web-server/prototype-web-server/tests/util.ss @@ -16,7 +16,7 @@ [(_ (module m-id . rest)) #'(let ([ns (make-namespace)]) (parameterize ([current-namespace ns]) - (eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server") + (eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") (lib "serialize.ss"))) (eval '(module m-id . rest)) (eval '(require m-id))) @@ -32,7 +32,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") + (eval `(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private") (lib "serialize.ss") (file ,pth)))) (values (go ns)