From b7aa4f360b946761f856c20e9f2310c7a47652f4 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Thu, 7 Sep 2006 03:19:54 +0000
Subject: [PATCH] httpd load fix

---
 contrib/README.txt        | 10 +++++++---
 contrib/all.factor        | 14 +++++++-------
 contrib/httpd/load.factor |  3 ---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/contrib/README.txt b/contrib/README.txt
index 0fcfa52365..7838acfa69 100644
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -3,12 +3,13 @@ library, but is useful enough to ship with the Factor distribution.
 
 Modules can be loaded from the listener:
 
-  "modulename" require
+  "contrib/modulename" require
 
-Credits:
+Available libraries:
 
 - action-field -- Extended field gadget for UI (Eduardo Cavazos)
 - automata -- Graphics demo for the UI (Eduardo Cavazos)
+- benchmarks -- Various performance benchmarks (Slava Pestov)
 - boids -- Graphics demo for the UI (Eduardo Cavazos)
 - cairo -- cairo bindings (Sampo Vuori)
 - calendar -- timestamp/calendar with timezones (Doug Coleman)
@@ -21,7 +22,9 @@ Credits:
 - factory -- X11 window manager (Eduardo Cavazos)
 - gap-buffer -- Efficient text editor buffer (Alex Chapman)
 - hexdump -- Hexdump routine (Doug Coleman)
-- httpd -- Web framework (HTTP server, client, XML parser, HTML generation...) (Slava Pestov, Chris Double, Daniel Ehrenberg)
+- http -- Code shared by HTTP server and client (Slava Pestov)
+- httpd -- HTTP server (Slava Pestov, Chris Double)
+- http-client -- HTTP client (Slava Pestov)
 - jedit -- jEdit editor integration (Slava Pestov)
 - json -- JSON reader and writer (Chris Double)
 - lambda -- Lambda calculus interpreter (Matthew Willis)
@@ -43,3 +46,4 @@ Credits:
 - vars -- Alternative syntax for variables (Eduardo Cavazos)
 - vim -- VIM integration (Alex Chapman)
 - x11 -- X Window System client library (Eduardo Cavazos)
+- xml -- XML parser (Daniel Ehrenberg)
diff --git a/contrib/all.factor b/contrib/all.factor
index f248499892..6b0699c3b6 100644
--- a/contrib/all.factor
+++ b/contrib/all.factor
@@ -3,13 +3,13 @@ USING: kernel modules words ;
 REQUIRES: contrib/automata contrib/boids contrib/cairo
 contrib/calendar contrib/concurrency contrib/coroutines
 contrib/crypto contrib/dlists contrib/emacs contrib/embedded
-contrib/gap-buffer contrib/hexdump contrib/httpd contrib/jedit
-contrib/json contrib/lambda contrib/lazy-lists contrib/math
-contrib/parser-combinators contrib/postgresql contrib/process
-contrib/random-tester contrib/rss contrib/serialize
-contrib/slate contrib/space-invaders contrib/splay-trees
-contrib/sqlite contrib/topology contrib/units contrib/vars
-contrib/vim ;
+contrib/gap-buffer contrib/hexdump contrib/httpd
+contrib/http-client contrib/jedit contrib/json contrib/lambda
+contrib/lazy-lists contrib/math contrib/parser-combinators
+contrib/postgresql contrib/process contrib/random-tester
+contrib/rss contrib/serialize contrib/slate
+contrib/space-invaders contrib/splay-trees contrib/sqlite
+contrib/topology contrib/units contrib/vars contrib/vim ;
 
 "x11" vocab [
     "contrib/factory" require
diff --git a/contrib/httpd/load.factor b/contrib/httpd/load.factor
index 7037eb30c4..f6b2581815 100644
--- a/contrib/httpd/load.factor
+++ b/contrib/httpd/load.factor
@@ -5,8 +5,6 @@ contrib/xml ;
 
 PROVIDE: contrib/httpd { 
     "mime.factor"
-    "xml.factor"
-    "http-common.factor"
     "html-tags.factor"
     "responder.factor"
     "httpd.factor"
@@ -19,7 +17,6 @@ PROVIDE: contrib/httpd {
     "inspect-responder.factor"
     "browser-responder.factor"
     "default-responders.factor"
-    "http-client.factor"
 } {
     "test/html.factor"
     "test/http-client.factor"