Fixing paths and names
svn: r6271
This commit is contained in:
parent
4867462a7f
commit
345e61454e
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ...)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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"))
|
||||
|
||||
|
|
|
@ -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"))
|
||||
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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"))
|
||||
|
||||
|
|
|
@ -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"))
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)"
|
||||
|
|
Loading…
Reference in New Issue
Block a user