Fix load errors

diff --git a/extra/furnace/auth/basic/basic.factor b/extra/furnace/auth/basic/basic.factor
index c57f78b315cbc4664a1a99932db61abe354c3504..c8d542c219180074b7e501b4b71dab784bb8daa5 100755 (executable)
--- a/extra/furnace/auth/basic/basic.factor
+++ b/extra/furnace/auth/basic/basic.factor
@@ -1,9 +1,9 @@
 ! Copyright (c) 2007 Chris Double.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: accessors quotations assocs kernel splitting\r
-base64 html.elements io combinators http.server\r
-furnace.auth.providers furnace.auth.login\r
-http sequences ;\r
+base64 html.elements io combinators sequences\r
+http http.server.filters http.server.responses http.server\r
+furnace.auth.providers furnace.auth.login ;\r
 IN: furnace.auth.basic\r
 \r
 TUPLE: basic-auth < filter-responder realm provider ;\r

diff --git a/extra/html/components/components-tests.factor b/extra/html/components/components-tests.factor
index 90dc156ea63660cb73ad85b89d9aca775236457d..1f77768115fe4be1bfa17bef03b189bde8d85788 100644 (file)
--- a/extra/html/components/components-tests.factor
+++ b/extra/html/components/components-tests.factor
@@ -1,7 +1,7 @@
 IN: html.components.tests
 USING: tools.test kernel io.streams.string
 io.streams.null accessors inspector html.streams
-html.components namespaces ;
+html.elements html.components namespaces ;
 
 [ ] [ blank-values ] unit-test
 

diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor
index 9ce45b5c470adb4a9647319c44f2cff9984f0ed6..47d352b6b806ba54a90111518737547db300a1ef 100755 (executable)
--- a/extra/html/parser/analyzer/analyzer.factor
+++ b/extra/html/parser/analyzer/analyzer.factor
@@ -1,6 +1,6 @@
 USING: assocs html.parser kernel math sequences strings ascii
 arrays shuffle unicode.case namespaces splitting http
-sequences.lib accessors io combinators http.client ;
+sequences.lib accessors io combinators http.client urls ;
 IN: html.parser.analyzer
 
 TUPLE: link attributes clickable ;

diff --git a/extra/html/templates/chloe/chloe-tests.factor b/extra/html/templates/chloe/chloe-tests.factor
index 3a2cd10494cb894bf550ae53e9bff3cddc8348bf..d4c02061b2c5ef38c11d61308d5088a9561b66dc 100644 (file)
--- a/extra/html/templates/chloe/chloe-tests.factor
+++ b/extra/html/templates/chloe/chloe-tests.factor
@@ -1,7 +1,7 @@
 USING: html.templates html.templates.chloe
 tools.test io.streams.string kernel sequences ascii boxes
 namespaces xml html.components
-splitting unicode.categories ;
+splitting unicode.categories furnace ;
 IN: html.templates.chloe.tests
 
 [ f ] [ f parse-query-attr ] unit-test
@@ -49,7 +49,7 @@ IN: html.templates.chloe.tests
     [
         [
             "test2" test-template call-template
-        ] [ "test3" test-template ] with-boilerplate
+        ] "test3" test-template with-boilerplate
     ] run-template
 ] unit-test
 
@@ -137,7 +137,7 @@ TUPLE: person first-name last-name ;
 
 [ "<table><tr><td>RBaxter</td><td>Unknown</td></tr><tr><td>Doug</td><td>Coleman</td></tr></table>" ] [
     [
-        "test9" test-template call-template
+        "test8" test-template call-template
     ] run-template [ blank? not ] filter
 ] unit-test
 
@@ -145,6 +145,6 @@ TUPLE: person first-name last-name ;
 
 [ "<a name=\"1\">Hello</a>" ] [
     [
-        "test10" test-template call-template
+        "test9" test-template call-template
     ] run-template
 ] unit-test

diff --git a/extra/http/server/cgi/cgi.factor b/extra/http/server/cgi/cgi.factor
index a706ee69988e571ea310c5a6e3b2ea482f7048e3..cf8a35f141ce67d1de0f247d024837d0e23820b0 100755 (executable)
--- a/extra/http/server/cgi/cgi.factor
+++ b/extra/http/server/cgi/cgi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: namespaces kernel assocs io.files io.streams.duplex\r
 combinators arrays io.launcher io http.server.static http.server\r
-http accessors sequences strings math.parser fry ;\r
+http accessors sequences strings math.parser fry urls ;\r
 IN: http.server.cgi\r
 \r
 : post? request get method>> "POST" = ;\r
@@ -28,7 +28,7 @@ IN: http.server.cgi
         "" "REMOTE_IDENT" set\r
 \r
         request get method>> "REQUEST_METHOD" set\r
-        request get query>> assoc>query "QUERY_STRING" set\r
+        request get url>> query>> assoc>query "QUERY_STRING" set\r
         request get "cookie" header "HTTP_COOKIE" set \r
 \r
         request get "user-agent" header "HTTP_USER_AGENT" set\r

diff --git a/extra/http/server/server.factor b/extra/http/server/server.factor
index 68baeb28aa24473a0659f619b1c476e709e69ce6..02424ef97442e0dc9f13c7b323a512f5c683c4a4 100755 (executable)
--- a/extra/http/server/server.factor
+++ b/extra/http/server/server.factor
@@ -63,7 +63,8 @@ LOG: httpd-hit NOTICE
     url>> path>> split-path main-responder get call-responder ;
 
 : do-request ( request -- response )
-    [
+    '[
+        ,
         [ init-request ]
         [ log-request ]
         [ dispatch-request ] tri

diff --git a/extra/webapps/counter/counter.factor b/extra/webapps/counter/counter.factor
index 9ac70f452a14da9e261ddaf9dc5894e6a0f96929..da646fb76f2ea253f218fe3e0f4c542c1bd7e0c7 100644 (file)
--- a/extra/webapps/counter/counter.factor
+++ b/extra/webapps/counter/counter.factor
@@ -1,5 +1,5 @@
 USING: math kernel accessors http.server http.server.dispatchers
-furnace.actions furnace.sessions
+furnace furnace.actions furnace.sessions
 html.components html.templates.chloe
 fry urls ;
 IN: webapps.counter

diff --git a/extra/webapps/wiki/diff.xml b/extra/webapps/wiki/diff.xml
index 55f3ef0b238cddd68146c8fed8db891bb0275f33..35afe51b66dd66bf4974970e81fd25411f6eabf0 100644 (file)
--- a/extra/webapps/wiki/diff.xml
+++ b/extra/webapps/wiki/diff.xml
@@ -2,9 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-       <t:bind t:name="old">
-               <t:title>Diff: <t:label t:name="title" /></t:title>
-       </t:bind>
+       <t:title>Diff: <t:label t:name="title" /></t:title>
 
        <table>
                <tr>
@@ -23,11 +21,4 @@
 
        <t:comparison t:name="diff" />
 
-       <div class="navbar">
-               <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
-               | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
-               | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
-               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
-       </div>
-
 </t:chloe>

diff --git a/extra/webapps/wiki/edit.xml b/extra/webapps/wiki/edit.xml
index 37cc6d9a5b8d75890f98b03ef6981de6439325a6..057b7f8f7129d8e0886e075bea0ea58675c7e7e4 100644 (file)
--- a/extra/webapps/wiki/edit.xml
+++ b/extra/webapps/wiki/edit.xml
@@ -16,10 +16,4 @@
 
        </t:form>
 
-       <div class="navbar">
-               <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
-               | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
-               | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
-               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
-       </div>
 </t:chloe>

diff --git a/extra/webapps/wiki/page-common.xml b/extra/webapps/wiki/page-common.xml
new file mode 100644 (file)
index 0000000..1d4b507
--- /dev/null
+++ b/extra/webapps/wiki/page-common.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' ?>
+
+<t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
+
+       <t:call-next-template />
+
+       <div class="navbar">
+               <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
+               | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
+               | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
+               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
+       </div>
+
+</t:chloe>

diff --git a/extra/webapps/wiki/revisions.xml b/extra/webapps/wiki/revisions.xml
index 0a0de8e470e2d8e945e71ac488fad715b028e4a5..2a909e6ab3a017680bd2eb26a2f757f12456c7f2 100644 (file)
--- a/extra/webapps/wiki/revisions.xml
+++ b/extra/webapps/wiki/revisions.xml
@@ -53,13 +53,4 @@
                <input type="submit" value="View" />
        </form>
 
-       <br/>
-
-       <div class="navbar">
-               <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
-               | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
-               | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
-               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
-       </div>
-
 </t:chloe>

diff --git a/extra/webapps/wiki/view.xml b/extra/webapps/wiki/view.xml
index 0e1f0f74786a09f17947801b41020880dbfaed62..30dfb71270eca5578e5badae38c79b9e874d88cb 100644 (file)
--- a/extra/webapps/wiki/view.xml
+++ b/extra/webapps/wiki/view.xml
@@ -10,11 +10,4 @@
 
        <p><em>This revision created on <t:label t:name="date" /> by <t:a t:href="user-edits" t:query="author"><t:label t:name="author" /></t:a>.</em></p>
 
-       <div class="navbar">
-               <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
-               | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
-               | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
-               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
-       </div>
-
 </t:chloe>

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 31b5a12c4144ad9853eb8380e63cc0eeaab01625..6dcf89e208514eb547d7f1bf10842e248eaad77f 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -216,16 +216,20 @@ revision "REVISIONS" {
 
 : <wiki> ( -- dispatcher )
     wiki new-dispatcher
-        <main-article-action> "" add-responder
-        <view-article-action> "view" add-responder
-        <view-revision-action> "revision" add-responder
-        <list-revisions-action> "revisions" add-responder
+        <dispatcher>
+            <main-article-action> "" add-responder
+            <view-article-action> "view" add-responder
+            <view-revision-action> "revision" add-responder
+            <list-revisions-action> "revisions" add-responder
+            <diff-action> "diff" add-responder
+            <edit-article-action> { } <protected> "edit" add-responder
+        <boilerplate>
+            { wiki "page-common" } >>template
+        >>default
         <rollback-action> "rollback" add-responder
         <user-edits-action> "user-edits" add-responder
-        <diff-action> "diff" add-responder
         <list-articles-action> "articles" add-responder
         <list-changes-action> "changes" add-responder
-        <edit-article-action> { } <protected> "edit" add-responder
         <delete-action> { } <protected> "delete" add-responder
     <boilerplate>
         { wiki "wiki-common" } >>template ;

diff --git a/extra/xmode/code2html/responder/responder.factor b/extra/xmode/code2html/responder/responder.factor
index 67cb60f8a0d53def24381d8e3210ce78df3d363c..2bc766dbc6507b12503fec26e5bcfbfd26ff0a41 100755 (executable)
--- a/extra/xmode/code2html/responder/responder.factor
+++ b/extra/xmode/code2html/responder/responder.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: io io.files io.encodings.utf8 namespaces http.server\r
-http.server.static http xmode.code2html kernel sequences\r
-accessors fry ;\r
+http.server.responses http.server.static http xmode.code2html\r
+kernel sequences accessors fry ;\r
 IN: xmode.code2html.responder\r
 \r
 : <sources> ( root -- responder )\r

diff --git a/extra/yahoo/yahoo.factor b/extra/yahoo/yahoo.factor
index dd7ce962c23888071392aae0e7ada08f0f8da1fd..c17de206c4b788efa045866f9ede8822e11ddef1 100755 (executable)
--- a/extra/yahoo/yahoo.factor
+++ b/extra/yahoo/yahoo.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2006 Daniel Ehrenberg, Walton Chan
 ! See http://factorcode.org/license.txt for BSD license.
 USING: http.client xml xml.utilities kernel sequences
-namespaces http math.parser help math.order locals accessors ;
+namespaces http math.parser help math.order locals
+urls accessors ;
 IN: yahoo
 
 TUPLE: result title url summary ;