Updating code for new io.servers code

diff --git a/extra/concurrency/distributed/distributed.factor b/extra/concurrency/distributed/distributed.factor
index c637f4baa34bf3e4a51116a1a97bdcb6292a01c8..c9257eb27ec52c64c6d978d8885425f70e31acc9 100755 (executable)
--- a/extra/concurrency/distributed/distributed.factor
+++ b/extra/concurrency/distributed/distributed.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: serialize sequences concurrency.messaging threads io
-io.server qualified arrays namespaces kernel io.encodings.binary
-accessors ;
+io.servers.connection io.encodings.binary
+qualified arrays namespaces kernel accessors ;
 FROM: io.sockets => host-name <inet> with-client ;
 IN: concurrency.distributed
 
@@ -10,21 +10,20 @@ SYMBOL: local-node
 
 : handle-node-client ( -- )
     deserialize
-    [ first2 get-process send ]
-    [ stop-server ] if* ;
+    [ first2 get-process send ] [ stop-server ] if* ;
 
-: (start-node) ( addrspecs addrspec -- )
+: (start-node) ( addrspec addrspec -- )
     local-node set-global
     [
-        "concurrency.distributed"
-        binary
-        [ handle-node-client ] with-server
+        <threaded-server>
+            swap >>insecure
+            binary >>encoding
+            "concurrency.distributed" >>name
+            [ handle-node-client ] >>handler
     ] curry "Distributed concurrency server" spawn drop ;
 
 : start-node ( port -- )
-    [ internet-server ]
-    [ host-name swap <inet> ] bi
-    (start-node) ;
+    host-name over <inet> (start-node) ;
 
 TUPLE: remote-process id node ;
 

diff --git a/extra/eval-server/authors.txt b/extra/eval-server/authors.txt
deleted file mode 100644 (file)
index 1901f27..0000000
--- a/extra/eval-server/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov

diff --git a/extra/eval-server/eval-server.factor b/extra/eval-server/eval-server.factor
deleted file mode 100644 (file)
index 3bfae61..0000000
--- a/extra/eval-server/eval-server.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-! Copyright (C) 2007 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: listener io.server strings parser byte-arrays ;
-IN: eval-server
-
-: eval-server ( -- )
-    9998 local-server "eval-server" [
-        >string eval>string >byte-array
-    ] with-datagrams ;
-
-MAIN: eval-server

diff --git a/extra/eval-server/summary.txt b/extra/eval-server/summary.txt
deleted file mode 100644 (file)
index b75930a..0000000
--- a/extra/eval-server/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Listens for UDP packets on localhost:9998, evaluates them and sends back result

diff --git a/extra/eval-server/tags.txt b/extra/eval-server/tags.txt
deleted file mode 100644 (file)
index f628c95..0000000
--- a/extra/eval-server/tags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-demos
-network
-tools
-applications

diff --git a/extra/smtp/server/server.factor b/extra/smtp/server/server.factor
index 824651030d3d58e1b83ee831e52d54f210760b06..a6a8bb2ccaa28ced9355e514ce1dbf6c35ce9543 100755 (executable)
--- a/extra/smtp/server/server.factor
+++ b/extra/smtp/server/server.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Elie CHAFTARI
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators kernel prettyprint io io.timeouts io.server
+USING: combinators kernel prettyprint io io.timeouts
 sequences namespaces io.sockets continuations calendar
 io.encodings.ascii io.streams.duplex destructors ;
 IN: smtp.server

diff --git a/extra/tty-server/tty-server.factor b/extra/tty-server/tty-server.factor
index d4b1a34e76701bfecc8ce866dc160507ffceed3d..e155c2068d237891390c603c3b7e265048178d88 100644 (file)
--- a/extra/tty-server/tty-server.factor
+++ b/extra/tty-server/tty-server.factor
@@ -1,11 +1,13 @@
-USING: listener io.server io.encodings.utf8 ;
+USING: listener io.servers.connection io.encodings.utf8 ;
 IN: tty-server
 
-: tty-server ( port -- )
-    local-server
-    "tty-server"
-    utf8 [ listener ] with-server ;
+: <tty-server> ( port -- )
+    <threaded-server>
+        "tty-server" >>name
+        utf8 >>encoding
+        swap local-server >>insecure
+        [ listener ] >>handler ;
 
-: default-tty-server ( -- ) 9999 tty-server ;
+: tty-server ( -- ) 9999 tty-server ;
 
-MAIN: default-tty-server
+MAIN: tty-server