From df22b0cbbd19805b0bdd2d36a74279d81e7ee4a9 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 26 Aug 2007 04:35:01 +0000 Subject: [PATCH] No need to change anything when using the new launcher svn: r7170 --- collects/help/help-desk.ss | 2 +- collects/help/launch.ss | 10 ++++++---- collects/help/private/config.ss | 9 +++++++-- collects/help/{servlets => }/private/platform.ss | 0 collects/help/servlets/home.ss | 4 ++-- collects/help/servlets/private/split-screen.ss | 4 ++-- collects/help/servlets/results.ss | 4 ++-- collects/help/servlets/static.ss | 4 ++-- 8 files changed, 22 insertions(+), 15 deletions(-) rename collects/help/{servlets => }/private/platform.ss (100%) diff --git a/collects/help/help-desk.ss b/collects/help/help-desk.ss index 7e25e9a7a1..8f1021c7f6 100644 --- a/collects/help/help-desk.ss +++ b/collects/help/help-desk.ss @@ -1,7 +1,7 @@ (module help-desk mzscheme (require "bug-report.ss" ;; this is require'd here to get the prefs defaults setup done early. - "servlets/private/platform.ss" ;; same reason + "private/platform.ss" ;; same reason "private/manuals.ss" "private/buginfo.ss" diff --git a/collects/help/launch.ss b/collects/help/launch.ss index 3b7bf1f1d3..4d95bfc9d0 100644 --- a/collects/help/launch.ss +++ b/collects/help/launch.ss @@ -21,16 +21,18 @@ (require (lib "web-server.ss" "web-server") (lib "web-config-unit.ss" "web-server") "private/config.ss" - "private/internal-hp.ss") + "private/internal-hp.ss" + "private/platform.ss") + +(current-helpdesk-platform 'external-browser) ;; start the HelpDesk server, and store a shutdown (define shutdown (serve/web-config@ config)) -(printf "Did you remember to change `current-helpdesk-platform' in \"platform.ss\"?\n\n") -(printf "Start here: http://~a:~a/servlets/home.ss\n\n" +(printf "\nStart here: http://~a:~a/servlets/home.ss\n\n" internal-host internal-port) -(format "Press enter to shutdown.\n") +(printf "Press enter to shutdown.\n") (read-line) ;(shutdown) diff --git a/collects/help/private/config.ss b/collects/help/private/config.ss index c2bcd95a6a..c5114afb31 100644 --- a/collects/help/private/config.ss +++ b/collects/help/private/config.ss @@ -3,7 +3,8 @@ (lib "web-config-unit.ss" "web-server") (lib "dirs.ss" "setup") (lib "config.ss" "planet") - "internal-hp.ss") + "internal-hp.ss" + (lib "namespace.ss" "web-server" "configuration")) (provide config) @@ -54,4 +55,8 @@ `(,virtual-host ,(make-host-config dir))) (cons planet-host (append doc-hosts collects-hosts)) - (cons (PLANET-DIR) (append doc-dirs collects-dirs))))))))) + (cons (PLANET-DIR) (append doc-dirs collects-dirs))))) + #:make-servlet-namespace + (make-make-servlet-namespace + #:to-be-copied-module-specs + '((lib "platform.ss" "help" "private"))))))) diff --git a/collects/help/servlets/private/platform.ss b/collects/help/private/platform.ss similarity index 100% rename from collects/help/servlets/private/platform.ss rename to collects/help/private/platform.ss diff --git a/collects/help/servlets/home.ss b/collects/help/servlets/home.ss index 14f7752171..39f4998e3b 100644 --- a/collects/help/servlets/home.ss +++ b/collects/help/servlets/home.ss @@ -10,7 +10,7 @@ "private/url.ss" "private/html.ss" "private/split-screen.ss" - "private/platform.ss") + "../private/platform.ss") (define copyright-year 2007) @@ -464,4 +464,4 @@ (p "A paper that discusses DrScheme in more detail is available in the paper: " (a ((href "http://www.ccs.neu.edu/scheme/pubs/#jfp01-fcffksf")) "DrScheme: A Programming Environment for Scheme.")))) - ))) \ No newline at end of file + ))) diff --git a/collects/help/servlets/private/split-screen.ss b/collects/help/servlets/private/split-screen.ss index 43cb9342df..8307922434 100644 --- a/collects/help/servlets/private/split-screen.ss +++ b/collects/help/servlets/private/split-screen.ss @@ -3,7 +3,7 @@ (only (lib "misc.ss" "swindle") mappend) "html.ss" "url.ss" - "platform.ss") + "../../private/platform.ss") ; These items are common to all split screens @@ -122,4 +122,4 @@ make-split-page/internal-browser make-simple-page/internal-browser) -) \ No newline at end of file +) diff --git a/collects/help/servlets/results.ss b/collects/help/servlets/results.ss index ecd8878864..5d9c64c41f 100644 --- a/collects/help/servlets/results.ss +++ b/collects/help/servlets/results.ss @@ -21,7 +21,7 @@ is stored in a module top-level and that's namespace-specific. "private/util.ss" "private/search-util.ss" "private/html.ss" - "private/platform.ss") + "../private/platform.ss") (provide interface-version timeout start) (define interface-version 'v1) (define timeout +inf.0) @@ -332,4 +332,4 @@ is stored in a module top-level and that's namespace-specific. [else #t]) lang-name)))]))))))) - \ No newline at end of file + diff --git a/collects/help/servlets/static.ss b/collects/help/servlets/static.ss index 51998a2df5..f1c79c4888 100644 --- a/collects/help/servlets/static.ss +++ b/collects/help/servlets/static.ss @@ -12,7 +12,7 @@ (lib "port.ss") "../private/standard-urls.ss" "../private/docpos.ss" - "private/platform.ss" + "../private/platform.ss" "private/html.ss") (provide interface-version timeout start) @@ -121,4 +121,4 @@ (format "Not foundFile not found: ~a" file-path))])))))) - ) \ No newline at end of file + )