diff --git a/collects/web-server/info.ss b/collects/web-server/info.ss index 681a7dc0e6..c4416c2f21 100644 --- a/collects/web-server/info.ss +++ b/collects/web-server/info.ss @@ -1,9 +1,9 @@ (module info (lib "infotab.ss" "setup") (define name "Web Server") (define mzscheme-launcher-libraries - (list "text-launch.ss" "monitor-launch.ss" "setup-launch.ss" )) + (list "private/text-launch.ss" "private/monitor-launch.ss" "private/setup-launch.ss" )) (define mzscheme-launcher-names (list "PLT Web Server Text" "PLT Web Server Monitor" "PLT Web Server Setup")) - (define mred-launcher-libraries (list "gui-launch.ss")) + (define mred-launcher-libraries (list "private/gui-launch.ss")) (define mred-launcher-names (list "PLT Web Server"))) diff --git a/collects/web-server/gui-launch.ss b/collects/web-server/private/gui-launch.ss similarity index 94% rename from collects/web-server/gui-launch.ss rename to collects/web-server/private/gui-launch.ss index 53408494bc..8412e8dbfb 100644 --- a/collects/web-server/gui-launch.ss +++ b/collects/web-server/private/gui-launch.ss @@ -1,7 +1,7 @@ (module gui-launch mzscheme (require (lib "class.ss") (lib "mred.ss" "mred")) - (require "private/launch.ss") + (require "launch.ss") (define shutdown (serve)) diff --git a/collects/web-server/monitor-launch.ss b/collects/web-server/private/monitor-launch.ss similarity index 94% rename from collects/web-server/monitor-launch.ss rename to collects/web-server/private/monitor-launch.ss index 671d1244cc..b2a1754081 100644 --- a/collects/web-server/monitor-launch.ss +++ b/collects/web-server/private/monitor-launch.ss @@ -1,7 +1,7 @@ ; The main program of the "web-server-monitor" launcher. (module monitor-launch mzscheme - (require "private/monitor-server.ss" - "private/util.ss" + (require "monitor-server.ss" + "util.ss" (lib "cmdline.ss")) ; handle-numeric-flag : sym -> str str -> (cons sym num) diff --git a/collects/web-server/setup-launch.ss b/collects/web-server/private/setup-launch.ss similarity index 91% rename from collects/web-server/setup-launch.ss rename to collects/web-server/private/setup-launch.ss index 8dbab46699..29f91ba2c2 100644 --- a/collects/web-server/setup-launch.ss +++ b/collects/web-server/private/setup-launch.ss @@ -2,10 +2,10 @@ (require (lib "cmdline.ss") (lib "file.ss") (lib "struct.ss")) - (require "configuration.ss" - "private/configuration-table-structs.ss" - "private/util.ss" - "private/configuration-util.ss") + (require "../configuration.ss" + "configuration-table-structs.ss" + "util.ss" + "configuration-util.ss") (parse-command-line "web-server-setup" diff --git a/collects/web-server/private/text-launch.ss b/collects/web-server/private/text-launch.ss new file mode 100644 index 0000000000..0ad4b41f8a --- /dev/null +++ b/collects/web-server/private/text-launch.ss @@ -0,0 +1,4 @@ +(module text-launch mzscheme + (require "launch.ss") + (serve) + (semaphore-wait (make-semaphore))) \ No newline at end of file diff --git a/collects/web-server/text-launch.ss b/collects/web-server/text-launch.ss deleted file mode 100644 index 624b4c0373..0000000000 --- a/collects/web-server/text-launch.ss +++ /dev/null @@ -1,4 +0,0 @@ -(module text-launch mzscheme - (require "private/launch.ss") - (serve) - (semaphore-wait (make-semaphore))) \ No newline at end of file