From 345e61454eab4f94504a31eb7fedcdf43edc47a9 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 24 May 2007 17:07:48 +0000 Subject: [PATCH] Fixing paths and names svn: r6271 --- .../prototype-web-server/abort-resume.ss | 2 +- .../hardcoded-configuration.ss | 5 +++-- .../prototype-web-server/newcont/defun.ss | 2 +- .../prototype-web-server/newcont/elim-callcc.ss | 2 +- .../prototype-web-server/newcont/elim-letrec.ss | 5 ++--- .../newcont/examples/add-param.ss | 2 +- .../newcont/examples/add-simple.ss | 4 ++-- .../prototype-web-server/newcont/examples/add.ss | 2 +- .../prototype-web-server/newcont/examples/temp.ss | 2 +- .../newcont/examples/wc-comp.ss | 6 +++--- .../newcont/examples/wc-fake.ss | 2 +- .../prototype-web-server/newcont/examples/wc.ss | 4 ++-- .../prototype-web-server/newcont/newcont.ss | 8 ++++---- .../prototype-web-server/newcont/util.ss | 4 ++-- .../newcont/web-cell-component.ss | 2 +- .../prototype-web-server/newcont/web-cells.ss | 2 +- .../prototype-web-server/newcont/web-param.ss | 2 +- .../web-server/prototype-web-server/server.ss | 14 +++++++------- .../prototype-web-server/servlets/add01.ss | 2 +- .../prototype-web-server/servlets/add04.ss | 2 +- .../prototype-web-server/servlets/add05.ss | 2 +- .../prototype-web-server/servlets/quiz01.ss | 2 +- .../prototype-web-server/servlets/quiz02.ss | 2 +- .../prototype-web-server/servlets/toobig.ss | 2 +- .../web-server/prototype-web-server/stuff-url.ss | 7 ++++--- .../prototype-web-server/tests/language-tester.ss | 2 +- .../prototype-web-server/tests/modules/mm00.ss | 2 +- .../prototype-web-server/tests/modules/mm01.ss | 2 +- .../tests/persistent-close-tests.ss | 4 ++-- .../tests/persistent-interaction-tests.ss | 2 +- .../prototype-web-server/tests/stuff-url-tests.ss | 15 ++++++++------- 31 files changed, 59 insertions(+), 57 deletions(-) diff --git a/collects/web-server/prototype-web-server/abort-resume.ss b/collects/web-server/prototype-web-server/abort-resume.ss index 3c10310440..887f28dd46 100644 --- a/collects/web-server/prototype-web-server/abort-resume.ss +++ b/collects/web-server/prototype-web-server/abort-resume.ss @@ -2,7 +2,7 @@ (require "define-closure.ss" (lib "plt-match.ss") (lib "serialize.ss") - (lib "web-cells.ss" "newcont")) + (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")) (provide ;; AUXILLIARIES diff --git a/collects/web-server/prototype-web-server/hardcoded-configuration.ss b/collects/web-server/prototype-web-server/hardcoded-configuration.ss index 36b3817472..4e39d8a421 100644 --- a/collects/web-server/prototype-web-server/hardcoded-configuration.ss +++ b/collects/web-server/prototype-web-server/hardcoded-configuration.ss @@ -1,7 +1,8 @@ (module hardcoded-configuration mzscheme (require (lib "configuration-structures.ss" "web-server" "private") (lib "util.ss" "web-server" "private") - (lib "response.ss" "web-server")) + (lib "response.ss" "web-server") + (lib "dirs.ss" "setup")) (provide config:port config:max-waiting @@ -141,7 +142,7 @@ ; file-root (build-path server-root-path "htdocs") ; servlet-root - (build-path "~" "Development" "Projects" "exp" "prototype-web-server") + (build-path (find-collects-dir) "web-server" "prototype-web-server") ; mime-types (build-path server-root-path "mime.types") ; password-authentication diff --git a/collects/web-server/prototype-web-server/newcont/defun.ss b/collects/web-server/prototype-web-server/newcont/defun.ss index f6bc19a269..6dd10413f9 100644 --- a/collects/web-server/prototype-web-server/newcont/defun.ss +++ b/collects/web-server/prototype-web-server/newcont/defun.ss @@ -8,7 +8,7 @@ (lib "stx.ss" "syntax") "util.ss" "freevars.ss" - (lib "closure.ss" "prototype-web-server")) + (lib "closure.ss" "web-server" "prototype-web-server")) (provide defun) ; make-new-clouse-label : (syntax -> syntax) syntax -> syntax diff --git a/collects/web-server/prototype-web-server/newcont/elim-callcc.ss b/collects/web-server/prototype-web-server/newcont/elim-callcc.ss index 92f6d725dd..ee093c4d31 100644 --- a/collects/web-server/prototype-web-server/newcont/elim-callcc.ss +++ b/collects/web-server/prototype-web-server/newcont/elim-callcc.ss @@ -1,6 +1,6 @@ (module elim-callcc mzscheme (require-for-template mzscheme) - (require-for-template (lib "abort-resume.ss" "prototype-web-server")) + (require-for-template (lib "abort-resume.ss" "web-server" "prototype-web-server")) (require (lib "kerncase.ss" "syntax") #;(lib "etc.ss") (lib "list.ss") diff --git a/collects/web-server/prototype-web-server/newcont/elim-letrec.ss b/collects/web-server/prototype-web-server/newcont/elim-letrec.ss index 9372b8495e..5f34b1ac17 100644 --- a/collects/web-server/prototype-web-server/newcont/elim-letrec.ss +++ b/collects/web-server/prototype-web-server/newcont/elim-letrec.ss @@ -1,7 +1,6 @@ (module elim-letrec mzscheme - (require-for-template - (lib "abort-resume.ss" "prototype-web-server") - mzscheme) + (require-for-template (lib "abort-resume.ss" "web-server" "prototype-web-server") + mzscheme) (require (lib "kerncase.ss" "syntax") (lib "etc.ss") (lib "list.ss") diff --git a/collects/web-server/prototype-web-server/newcont/examples/add-param.ss b/collects/web-server/prototype-web-server/newcont/examples/add-param.ss index 5a53adfe09..40751d99b0 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add-param.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add-param.ss @@ -1,4 +1,4 @@ -(module add-param (lib "newcont.ss" "newcont") +(module add-param (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss b/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss index c64ce654f8..839d500a81 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss @@ -1,7 +1,7 @@ -(module add-simple (lib "newcont.ss" "newcont") +(module add-simple (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private") - (lib "web-param.ss" "newcont")) + (lib "web-param.ss" "web-server" "prototype-web-server" "newcont")) (provide start) (define msg (make-web-parameter "unknown")) diff --git a/collects/web-server/prototype-web-server/newcont/examples/add.ss b/collects/web-server/prototype-web-server/newcont/examples/add.ss index 7c49ddaf2a..9895da514e 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add.ss @@ -1,4 +1,4 @@ -(module add (lib "newcont.ss" "newcont") +(module add (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/temp.ss b/collects/web-server/prototype-web-server/newcont/examples/temp.ss index 4da80971a2..7eb9e22483 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/temp.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/temp.ss @@ -1,4 +1,4 @@ -(module temp (lib "newcont.ss" "newcont") +(module temp (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") (provide start) (define msg (make-parameter "unknown")) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss b/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss index c53f7782f1..a48aa9efec 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss @@ -1,6 +1,6 @@ -(module wc-comp (lib "newcont.ss" "newcont") - (require (lib "web-cells.ss" "newcont") - (lib "web-cell-component.ss" "newcont") +(module wc-comp (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") + (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") + (lib "web-cell-component.ss" "web-server" "prototype-web-server" "newcont") (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss b/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss index 105fc65726..340fd8de19 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss @@ -1,4 +1,4 @@ -(module wc-fake (lib "newcont.ss" "newcont") +(module wc-fake (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") (require (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc.ss b/collects/web-server/prototype-web-server/newcont/examples/wc.ss index 225949c019..873a1ec4dc 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc.ss @@ -1,5 +1,5 @@ -(module wc (lib "newcont.ss" "newcont") - (require (lib "web-cells.ss" "newcont") +(module wc (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") + (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/newcont.ss b/collects/web-server/prototype-web-server/newcont/newcont.ss index 4e7fdb01a9..71fa7dba89 100644 --- a/collects/web-server/prototype-web-server/newcont/newcont.ss +++ b/collects/web-server/prototype-web-server/newcont/newcont.ss @@ -1,13 +1,13 @@ (module newcont mzscheme (require-for-syntax (lib "etc.ss") - (lib "labels.ss" "prototype-web-server") + (lib "labels.ss" "web-server" "prototype-web-server") "util.ss" "elim-letrec.ss" "anormal.ss" "elim-callcc.ss" "defun.ss") - (require (lib "abort-resume.ss" "prototype-web-server")) - (require (only (lib "persistent-web-interaction.ss" "prototype-web-server") + (require (lib "abort-resume.ss" "web-server" "prototype-web-server")) + (require (only (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") send/suspend/hidden send/suspend/url send/suspend/dispatch @@ -15,7 +15,7 @@ redirect/get start-servlet)) (provide (rename lang-module-begin #%module-begin)) - (provide (all-from (lib "abort-resume.ss" "prototype-web-server")) + (provide (all-from (lib "abort-resume.ss" "web-server" "prototype-web-server")) (all-from-except mzscheme #%module-begin) send/suspend/hidden send/suspend/url diff --git a/collects/web-server/prototype-web-server/newcont/util.ss b/collects/web-server/prototype-web-server/newcont/util.ss index 1eb7148e9f..bf61f2f949 100644 --- a/collects/web-server/prototype-web-server/newcont/util.ss +++ b/collects/web-server/prototype-web-server/newcont/util.ss @@ -1,5 +1,6 @@ (module util mzscheme - (require-for-template mzscheme) + (require-for-template mzscheme + (lib "abort-resume.ss" "web-server" "prototype-web-server")) (require (lib "kerncase.ss" "syntax") (lib "etc.ss") (lib "list.ss") @@ -76,7 +77,6 @@ [_ (inner stx)])) - (require-for-template (lib "abort-resume.ss" "prototype-web-server")) (define ((make-lang-module-begin make-labeling transform) stx) (syntax-case stx () ((mb forms ...) diff --git a/collects/web-server/prototype-web-server/newcont/web-cell-component.ss b/collects/web-server/prototype-web-server/newcont/web-cell-component.ss index 69cf41697f..c6f9930936 100644 --- a/collects/web-server/prototype-web-server/newcont/web-cell-component.ss +++ b/collects/web-server/prototype-web-server/newcont/web-cell-component.ss @@ -1,5 +1,5 @@ (module web-cell-component mzscheme - (require (lib "web-cells.ss" "newcont")) + (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")) (provide define-component) (define-syntax define-component 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 435ee2c830..eff299eb0b 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 (lib "closure.ss" "prototype-web-server") + (require (lib "closure.ss" "web-server" "prototype-web-server") (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 0ad7958493..fb5429fc84 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 (lib "closure.ss" "prototype-web-server") + (require (lib "closure.ss" "web-server" "prototype-web-server") (lib "list.ss")) (provide make-web-parameter next-web-parameter-id diff --git a/collects/web-server/prototype-web-server/server.ss b/collects/web-server/prototype-web-server/server.ss index 4b1071fc0f..3ae0d5f628 100644 --- a/collects/web-server/prototype-web-server/server.ss +++ b/collects/web-server/prototype-web-server/server.ss @@ -10,14 +10,14 @@ (lib "plt-match.ss") (lib "configuration-structures.ss" "web-server" "private") (lib "dispatch.ss" "web-server" "dispatchers") - (lib "session.ss" "prototype-web-server") - (only (lib "abort-resume.ss" "prototype-web-server") + (lib "session.ss" "web-server" "prototype-web-server") + (only (lib "abort-resume.ss" "web-server" "prototype-web-server") abort/cc safe-call? the-cont-key) - (only (lib "persistent-web-interaction.ss" "prototype-web-server") + (only (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") start-servlet) - (lib "web-cells.ss" "newcont") + (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") "xexpr-extras.ss" "utils.ss" "hardcoded-configuration.ss") @@ -210,9 +210,9 @@ (define to-be-copied-module-specs '(mzscheme - (lib "web-cells.ss" "newcont") - (lib "abort-resume.ss" "prototype-web-server") - (lib "session.ss" "prototype-web-server") + (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 "request.ss" "web-server" "private"))) ;; get the names of those modules. diff --git a/collects/web-server/prototype-web-server/servlets/add01.ss b/collects/web-server/prototype-web-server/servlets/add01.ss index 20fd7c7b0d..2b7a83cc3d 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" "prototype-web-server") + (require (lib "session.ss" "web-server" "prototype-web-server") (lib "request.ss" "web-server" "private") (lib "request-structs.ss" "web-server") (lib "url.ss" "net")) diff --git a/collects/web-server/prototype-web-server/servlets/add04.ss b/collects/web-server/prototype-web-server/servlets/add04.ss index 4b016416d6..bc9fdd86e5 100644 --- a/collects/web-server/prototype-web-server/servlets/add04.ss +++ b/collects/web-server/prototype-web-server/servlets/add04.ss @@ -1,4 +1,4 @@ -(module add04 (lib "persistent-web-interaction.ss" "prototype-web-server") +(module add04 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) diff --git a/collects/web-server/prototype-web-server/servlets/add05.ss b/collects/web-server/prototype-web-server/servlets/add05.ss index f010a962dc..b11abbd531 100644 --- a/collects/web-server/prototype-web-server/servlets/add05.ss +++ b/collects/web-server/prototype-web-server/servlets/add05.ss @@ -1,4 +1,4 @@ -(module add05 (lib "persistent-web-interaction.ss" "prototype-web-server") +(module add05 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) diff --git a/collects/web-server/prototype-web-server/servlets/quiz01.ss b/collects/web-server/prototype-web-server/servlets/quiz01.ss index 27203ff63b..9f6026733b 100644 --- a/collects/web-server/prototype-web-server/servlets/quiz01.ss +++ b/collects/web-server/prototype-web-server/servlets/quiz01.ss @@ -1,4 +1,4 @@ -(module quiz01 (lib "persistent-web-interaction.ss" "prototype-web-server") +(module quiz01 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") (require "quiz-lib.ss" (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) diff --git a/collects/web-server/prototype-web-server/servlets/quiz02.ss b/collects/web-server/prototype-web-server/servlets/quiz02.ss index 116fd87695..a4726d4d26 100644 --- a/collects/web-server/prototype-web-server/servlets/quiz02.ss +++ b/collects/web-server/prototype-web-server/servlets/quiz02.ss @@ -1,4 +1,4 @@ -(module quiz02 (lib "persistent-web-interaction.ss" "prototype-web-server") +(module quiz02 (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") (require "quiz-lib.ss" (lib "servlet-helpers.ss" "web-server" "private")) diff --git a/collects/web-server/prototype-web-server/servlets/toobig.ss b/collects/web-server/prototype-web-server/servlets/toobig.ss index 21f52eb1fd..51eb8ba242 100644 --- a/collects/web-server/prototype-web-server/servlets/toobig.ss +++ b/collects/web-server/prototype-web-server/servlets/toobig.ss @@ -1,4 +1,4 @@ -(module toobig (lib "persistent-web-interaction.ss" "prototype-web-server") +(module toobig (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) diff --git a/collects/web-server/prototype-web-server/stuff-url.ss b/collects/web-server/prototype-web-server/stuff-url.ss index 3b972e62fc..5eb39772a0 100644 --- a/collects/web-server/prototype-web-server/stuff-url.ss +++ b/collects/web-server/prototype-web-server/stuff-url.ss @@ -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" "prototype-web-server") (caar mm)) + [(same-module? '(lib "abort-resume.ss" "web-server" "prototype-web-server") (caar mm)) (cons (cdar mm) (loop (cdr mm)))] [else (error "cannot construct abreviated module map" mod-map)]))) @@ -239,18 +239,19 @@ 1024) (error "the url is too big: " (url->string result-uri)))))))) + ; XXX Abstract this (require (lib "md5.ss")) (define (md5-store str) (define hash (md5 (string->bytes/utf-8 str))) (with-output-to-file - (format "/Users/jay/Development/plt/urls/~a" hash) + (build-path (find-system-path 'home-dir) ".urls" (format "~a" hash)) (lambda () (write str)) 'replace) (bytes->string/utf-8 hash)) (define (md5-lookup hash) (with-input-from-file - (format "/Users/jay/Development/plt/urls/~a" hash) + (build-path (find-system-path 'home-dir) ".urls" (format "~a" hash)) (lambda () (read)))) (define (stuff-url svl uri pth) diff --git a/collects/web-server/prototype-web-server/tests/language-tester.ss b/collects/web-server/prototype-web-server/tests/language-tester.ss index b5ed8c7b72..4e101938fd 100644 --- a/collects/web-server/prototype-web-server/tests/language-tester.ss +++ b/collects/web-server/prototype-web-server/tests/language-tester.ss @@ -21,7 +21,7 @@ (define (make-eval/mod-path pth) (let ([ns (make-namespace)]) (parameterize ([current-namespace ns]) - (eval `(require (lib "client.ss" "prototype-web-server") + (eval `(require (lib "client.ss" "web-server" "prototype-web-server") (lib "serialize.ss") (file ,pth))) (lambda (expr) diff --git a/collects/web-server/prototype-web-server/tests/modules/mm00.ss b/collects/web-server/prototype-web-server/tests/modules/mm00.ss index 7f1f22834a..c2d120c77e 100644 --- a/collects/web-server/prototype-web-server/tests/modules/mm00.ss +++ b/collects/web-server/prototype-web-server/tests/modules/mm00.ss @@ -1,4 +1,4 @@ -(module mm00 (lib "persistent-interaction.ss" "prototype-web-server") +(module mm00 (lib "persistent-interaction.ss" "web-server" "prototype-web-server") (define (gn which) (cadr diff --git a/collects/web-server/prototype-web-server/tests/modules/mm01.ss b/collects/web-server/prototype-web-server/tests/modules/mm01.ss index 940331f620..6b2a2af2df 100644 --- a/collects/web-server/prototype-web-server/tests/modules/mm01.ss +++ b/collects/web-server/prototype-web-server/tests/modules/mm01.ss @@ -1,4 +1,4 @@ -(module mm01 (lib "persistent-interaction.ss" "prototype-web-server") +(module mm01 (lib "persistent-interaction.ss" "web-server" "prototype-web-server") (define (gn which) (cadr diff --git a/collects/web-server/prototype-web-server/tests/persistent-close-tests.ss b/collects/web-server/prototype-web-server/tests/persistent-close-tests.ss index 8bf6a52ae5..b56cc41ea2 100644 --- a/collects/web-server/prototype-web-server/tests/persistent-close-tests.ss +++ b/collects/web-server/prototype-web-server/tests/persistent-close-tests.ss @@ -1,8 +1,8 @@ (module persistent-close-tests mzscheme - (require (lib "file-vector.ss" "prototype-web-server") + (require (lib "file-vector.ss" "web-server" "prototype-web-server") (planet "test.ss" ("schematics" "schemeunit.plt" 1 1)) (lib "serialize.ss") - (lib "persistent-close.ss" "prototype-web-server")) + (lib "persistent-close.ss" "web-server" "prototype-web-server")) (provide persistent-close-suite) diff --git a/collects/web-server/prototype-web-server/tests/persistent-interaction-tests.ss b/collects/web-server/prototype-web-server/tests/persistent-interaction-tests.ss index df13c1a146..7a38593d56 100644 --- a/collects/web-server/prototype-web-server/tests/persistent-interaction-tests.ss +++ b/collects/web-server/prototype-web-server/tests/persistent-interaction-tests.ss @@ -274,7 +274,7 @@ (let ([test-m06.1 (make-module-eval - (module m06.1 (lib "persistent-interaction.ss" "prototype-web-server") + (module m06.1 (lib "persistent-interaction.ss" "web-server" "prototype-web-server") (define (id x) x) (define (gn which) 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 7cd125a1f6..88a41cf832 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,12 +1,13 @@ (module stuff-url-tests mzscheme - (require (lib "stuff-url.ss" "prototype-web-server") + (require (lib "stuff-url.ss" "web-server" "prototype-web-server") (planet "test.ss" ("schematics" "schemeunit.plt" 1 1)) (planet "util.ss" ("schematics" "schemeunit.plt" 1)) (lib "url.ss" "net") + (lib "dirs.ss" "setup") (lib "file.ss") "language-tester.ss") - (require/expose (lib "stuff-url.ss" "prototype-web-server") + (require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server") (same-module? url-parts recover-serial)) (provide stuff-url-suite) @@ -33,17 +34,17 @@ "Test same-module?" (assert-true - (same-module? `(file ,(build-path "~/Development/Projects/exp/prototype-web-server/abort-resume.ss")) - '(lib "abort-resume.ss" "prototype-web-server"))) + (same-module? `(file ,(build-absolute-path (find-collects-dir) "web-server" "prototype-web-sever" "abort-resume.ss")) + '(lib "abort-resume.ss" "web-server" "prototype-web-server"))) (assert-true (same-module? `(file ,(build-absolute-path (current-directory) "../abort-resume.ss")) - '(lib "abort-resume.ss" "prototype-web-server"))) + '(lib "abort-resume.ss" "web-server" "prototype-web-server"))) (assert-true (same-module? - '(lib "abort-resume.ss" "prototype-web-server") - '(lib "./abort-resume.ss" "prototype-web-server")))) + '(lib "abort-resume.ss" "web-server" "prototype-web-server") + '(lib "./abort-resume.ss" "web-server" "prototype-web-server")))) (make-test-case "compose url-parts and recover-serial (1)"