diff --git a/collects/web-server/configuration/configuration-table.ss b/collects/web-server/configuration/configuration-table.ss index cecf293909..83727fb215 100644 --- a/collects/web-server/configuration/configuration-table.ss +++ b/collects/web-server/configuration/configuration-table.ss @@ -1,8 +1,7 @@ -#lang scheme/base -(require mzlib/contract - mzlib/list - mzlib/pretty) -(require "configuration-table-structs.ss" +#lang scheme +(require scheme/pretty + scheme/runtime-path + "configuration-table-structs.ss" web-server/http/bindings) (define configuration-table-sexpr? list?) @@ -14,8 +13,9 @@ [sexpr->configuration-table (configuration-table-sexpr? . -> . configuration-table?)] [default-configuration-table-path path?]) -(define default-configuration-table-path - (build-path (collection-path "web-server") "default-web-root" "configuration-table.ss")) +(define-runtime-path default-configuration-table-path + (list 'lib + "web-server/default-web-root/configuration-table.ss")) (define (get-binding key bindings default) (first (get-binding* key bindings (list default)))) diff --git a/collects/web-server/configuration/namespace.ss b/collects/web-server/configuration/namespace.ss index 1d9d4a1471..a7c0e8c945 100644 --- a/collects/web-server/configuration/namespace.ss +++ b/collects/web-server/configuration/namespace.ss @@ -1,6 +1,4 @@ -#lang scheme/base -(require mzlib/list - scheme/contract) +#lang scheme (define default-to-be-copied-module-specs '(mzscheme mred)) diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/quiz.ss b/collects/web-server/default-web-root/htdocs/servlets/examples/quiz.ss index e532381c6c..26db0ec6b3 100644 --- a/collects/web-server/default-web-root/htdocs/servlets/examples/quiz.ss +++ b/collects/web-server/default-web-root/htdocs/servlets/examples/quiz.ss @@ -1,3 +1,4 @@ +#lang scheme ;; Written by Don Felgar, edited by Greg Pettyjohn ;; ;; Multiple-choice quiz PLT servlet sample. @@ -11,11 +12,11 @@ ;; choices = (listof string), possible answers to the question ;; correct-answer = integer, index into choices ;; -#lang scheme/base ;; Configuration -(define *data-file* - (build-path (collection-path "web-server") - "default-web-root" "htdocs" "servlets" "examples" "english-measure-questions.ss")) +(require scheme/runtime-path) +(define-runtime-path *data-file* + (list 'lib + "web-server/default-web-root/htdocs/servlets/examples/english-measure-questions.ss")) (define *questions-per-quiz* 5) (require web-server/servlet diff --git a/collects/web-server/servlet-env.ss b/collects/web-server/servlet-env.ss index 46b514abea..63bb1b2c22 100644 --- a/collects/web-server/servlet-env.ss +++ b/collects/web-server/servlet-env.ss @@ -1,6 +1,6 @@ ; Derived from plai/web/server, which was based on an older version of this ; Also derived from planet/untyped/instaservlet -#lang scheme/base +#lang scheme (require (prefix-in net: net/sendurl) scheme/contract scheme/list