From 44112e32e6d66429a0a344f56efd520b5bf5b177 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 17 Jun 2008 05:21:45 -0500 Subject: [PATCH] Fix build errors --- .../distributed/distributed-tests.factor | 10 ++- .../distributed/distributed.factor | 1 + extra/io/servers/connection/connection.factor | 4 +- extra/io/sockets/secure/secure-tests.factor | 2 +- extra/tty-server/tty-server.factor | 8 +- extra/webapps/counter/counter.factor | 2 +- .../factor-website/factor-website.factor | 73 ----------------- extra/webapps/factor-website/page.css | 78 ------------------- extra/webapps/factor-website/page.xml | 28 ------- 9 files changed, 16 insertions(+), 190 deletions(-) delete mode 100644 extra/webapps/factor-website/factor-website.factor delete mode 100644 extra/webapps/factor-website/page.css delete mode 100644 extra/webapps/factor-website/page.xml diff --git a/extra/concurrency/distributed/distributed-tests.factor b/extra/concurrency/distributed/distributed-tests.factor index ca1da0deaa..dc20e7ad5c 100755 --- a/extra/concurrency/distributed/distributed-tests.factor +++ b/extra/concurrency/distributed/distributed-tests.factor @@ -1,9 +1,9 @@ IN: concurrency.distributed.tests USING: tools.test concurrency.distributed kernel io.files arrays io.sockets system combinators threads math sequences -concurrency.messaging continuations ; +concurrency.messaging continuations accessors prettyprint ; -: test-node +: test-node ( -- addrspec ) { { [ os unix? ] [ "distributed-concurrency-test" temp-file ] } { [ os windows? ] [ "127.0.0.1" 1238 ] } @@ -11,9 +11,9 @@ concurrency.messaging continuations ; [ ] [ [ "distributed-concurrency-test" temp-file delete-file ] ignore-errors ] unit-test -[ ] [ test-node dup 1array swap (start-node) ] unit-test +[ ] [ test-node dup (start-node) ] unit-test -[ ] [ 100 sleep ] unit-test +[ ] [ 1000 sleep ] unit-test [ ] [ [ @@ -30,4 +30,6 @@ concurrency.messaging continuations ; receive ] unit-test +[ ] [ 1000 sleep ] unit-test + [ ] [ test-node stop-node ] unit-test diff --git a/extra/concurrency/distributed/distributed.factor b/extra/concurrency/distributed/distributed.factor index c9257eb27e..9ae2627505 100755 --- a/extra/concurrency/distributed/distributed.factor +++ b/extra/concurrency/distributed/distributed.factor @@ -20,6 +20,7 @@ SYMBOL: local-node binary >>encoding "concurrency.distributed" >>name [ handle-node-client ] >>handler + start-server ] curry "Distributed concurrency server" spawn drop ; : start-node ( port -- ) diff --git a/extra/io/servers/connection/connection.factor b/extra/io/servers/connection/connection.factor index f01112a70f..b062322142 100755 --- a/extra/io/servers/connection/connection.factor +++ b/extra/io/servers/connection/connection.factor @@ -86,14 +86,14 @@ M: threaded-server handle-client* handler>> call ; if* ] [ accept-loop ] bi ; inline -\ accept-loop ERROR add-error-logging - : start-accept-loop ( server -- ) threaded-server get encoding>> [ threaded-server get sockets>> push ] [ [ accept-loop ] with-disposal ] bi ; +\ start-accept-loop ERROR add-error-logging + : init-server ( threaded-server -- threaded-server ) dup semaphore>> [ dup max-connections>> [ diff --git a/extra/io/sockets/secure/secure-tests.factor b/extra/io/sockets/secure/secure-tests.factor index 75ac39e190..78de43d379 100644 --- a/extra/io/sockets/secure/secure-tests.factor +++ b/extra/io/sockets/secure/secure-tests.factor @@ -1,4 +1,4 @@ IN: io.sockets.secure.tests -USING: io.sockets.secure tools.test ; +USING: accessors kernel io.sockets io.sockets.secure tools.test ; [ "hello" 24 ] [ "hello" 24 [ host>> ] [ port>> ] bi ] unit-test diff --git a/extra/tty-server/tty-server.factor b/extra/tty-server/tty-server.factor index e155c2068d..4ba38ad06a 100644 --- a/extra/tty-server/tty-server.factor +++ b/extra/tty-server/tty-server.factor @@ -1,4 +1,5 @@ -USING: listener io.servers.connection io.encodings.utf8 ; +USING: listener io.servers.connection io.encodings.utf8 +accessors kernel ; IN: tty-server : ( port -- ) @@ -6,8 +7,9 @@ IN: tty-server "tty-server" >>name utf8 >>encoding swap local-server >>insecure - [ listener ] >>handler ; + [ listener ] >>handler + start-server ; -: tty-server ( -- ) 9999 tty-server ; +: tty-server ( -- ) 9999 ; MAIN: tty-server diff --git a/extra/webapps/counter/counter.factor b/extra/webapps/counter/counter.factor index 30c5d403de..a14d6d9823 100644 --- 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 furnace.actions furnace.sessions +furnace furnace.actions furnace.sessions furnace.redirection html.components html.forms html.templates.chloe fry urls ; IN: webapps.counter diff --git a/extra/webapps/factor-website/factor-website.factor b/extra/webapps/factor-website/factor-website.factor deleted file mode 100644 index c0bd856d5d..0000000000 --- a/extra/webapps/factor-website/factor-website.factor +++ /dev/null @@ -1,73 +0,0 @@ -! Copyright (c) 2008 Slava Pestov -! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel sequences assocs io.files io.sockets -io.server -namespaces db db.tuples db.sqlite smtp -logging.insomniac -http.server -http.server.dispatchers -furnace.alloy -furnace.auth.login -furnace.auth.providers.db -furnace.auth.features.edit-profile -furnace.auth.features.recover-password -furnace.auth.features.registration -furnace.boilerplate -webapps.blogs -webapps.pastebin -webapps.planet -webapps.todo -webapps.wiki -webapps.wee-url -webapps.user-admin ; -IN: webapps.factor-website - -: test-db ( -- db params ) "resource:test.db" sqlite-db ; - -: init-factor-db ( -- ) - test-db [ - init-furnace-tables - - { - post comment - paste annotation - blog posting - todo - short-url - article revision - } ensure-tables - ] with-db ; - -TUPLE: factor-website < dispatcher ; - -: ( -- responder ) - factor-website new-dispatcher - "blogs" add-responder - "todo" add-responder - "pastebin" add-responder - "planet" add-responder - "wiki" add-responder - "wee-url" add-responder - "user-admin" add-responder - "Factor website" - "Factor website" >>name - allow-registration - allow-password-recovery - allow-edit-profile - - { factor-website "page" } >>template - test-db ; - -: init-factor-website ( -- ) - "factorcode.org" 25 smtp-server set-global - "todo@factorcode.org" lost-password-from set-global - "website@factorcode.org" insomniac-sender set-global - "slava@factorcode.org" insomniac-recipients set-global - init-factor-db - main-responder set-global ; - -: start-factor-website ( -- ) - test-db start-expiring - test-db start-update-task - httpd-insomniac - 8812 httpd ; diff --git a/extra/webapps/factor-website/page.css b/extra/webapps/factor-website/page.css deleted file mode 100644 index 49e26883ad..0000000000 --- a/extra/webapps/factor-website/page.css +++ /dev/null @@ -1,78 +0,0 @@ -body, button { - font:9pt "Lucida Grande", "Lucida Sans Unicode", verdana, geneva, sans-serif; - color:#444; -} - -.link-button { - padding: 0px; - background: none; - border: none; -} - -a, .link { - color: #222; - border-bottom:1px dotted #666; - text-decoration:none; -} - -a:hover, .link:hover { - border-bottom:1px solid #66a; -} - -.error { color: #a00; } - -.errors li { color: #a00; } - -.field-label { - text-align: right; -} - -.inline { - display: inline; -} - -.navbar { - background-color: #eee; - padding: 5px; - border: 1px solid #ccc; -} - -.big-field-label { - vertical-align: top; -} - -.description { - padding: 5px; - color: #000; -} - -.description pre { - border: 1px dashed #ccc; - background-color: #f5f5f5; -} - -.description p:first-child { - margin-top: 0px; -} - -.description p:last-child { - margin-bottom: 0px; -} - -.description table, .description td { - border-color: #666; - border-style: solid; -} - -.description table { - border-width: 0 0 1px 1px; - border-spacing: 0; - border-collapse: collapse; -} - -.description td { - margin: 0; - padding: 4px; - border-width: 1px 1px 0 0; -} - diff --git a/extra/webapps/factor-website/page.xml b/extra/webapps/factor-website/page.xml deleted file mode 100644 index 32e1223c58..0000000000 --- a/extra/webapps/factor-website/page.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -