io.sockets.secure.unix.debug: move to io.sockets.secure.debug (not unix specific).

diff --git a/basis/io/sockets/secure/debug/debug.factor b/basis/io/sockets/secure/debug/debug.factor
new file mode 100644 (file)
index 0000000..faf22df
--- /dev/null
+++ b/basis/io/sockets/secure/debug/debug.factor
@@ -0,0 +1,14 @@
+! Copyright (C) 2008, 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors io.sockets.secure kernel ;
+IN: io.sockets.secure.debug
+
+: <test-secure-config> ( -- config )
+    <secure-config>
+        "vocab:openssl/test/server.pem" >>key-file
+        "vocab:openssl/test/dh1024.pem" >>dh-file
+        "password" >>password ;
+
+: with-test-context ( quot -- )
+    <test-secure-config>
+    swap with-secure-context ; inline

diff --git a/basis/io/sockets/secure/unix/debug/debug.factor b/basis/io/sockets/secure/unix/debug/debug.factor
deleted file mode 100644 (file)
index 9481a7c..0000000
--- a/basis/io/sockets/secure/unix/debug/debug.factor
+++ /dev/null
@@ -1,14 +0,0 @@
-! Copyright (C) 2008, 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors io.sockets.secure kernel ;
-IN: io.sockets.secure.unix.debug
-
-: <test-secure-config> ( -- config )
-    <secure-config>
-        "vocab:openssl/test/server.pem" >>key-file
-        "vocab:openssl/test/dh1024.pem" >>dh-file
-        "password" >>password ;
-
-: with-test-context ( quot -- )
-    <test-secure-config>
-    swap with-secure-context ; inline

diff --git a/basis/io/sockets/secure/unix/unix-tests.factor b/basis/io/sockets/secure/unix/unix-tests.factor
index 551e0c65ade9969ec9079508c8f9320c5dae2390..d8619d9bac76c217364255ba62a57782a430a958 100644 (file)
--- a/basis/io/sockets/secure/unix/unix-tests.factor
+++ b/basis/io/sockets/secure/unix/unix-tests.factor
@@ -3,7 +3,7 @@ USING: accessors kernel namespaces io io.sockets
 io.sockets.secure io.encodings.ascii io.streams.duplex
 io.backend.unix classes words destructors threads tools.test
 concurrency.promises byte-arrays locals calendar io.timeouts
-io.sockets.secure.unix.debug ;
+io.sockets.secure.debug ;
 
 { 1 0 } [ [ ] with-secure-context ] must-infer-as
 

diff --git a/basis/smtp/server/server.factor b/basis/smtp/server/server.factor
index cb4bb753e8d7181a799e8824cf33dcfab93a6e1a..ad27a1a9fc1cfe7bbe156adf0f5bc43e2942858d 100644 (file)
--- a/basis/smtp/server/server.factor
+++ b/basis/smtp/server/server.factor
@@ -4,7 +4,7 @@ USING: combinators kernel prettyprint io io.timeouts sequences
 namespaces io.sockets io.sockets.secure continuations calendar
 io.encodings.ascii io.streams.duplex destructors locals
 concurrency.promises threads accessors smtp.private
-io.sockets.secure.unix.debug io.crlf ;
+io.sockets.secure.debug io.crlf ;
 IN: smtp.server
 
 ! Mock SMTP server for testing purposes.

diff --git a/extra/pop3/server/server.factor b/extra/pop3/server/server.factor
index aefec65cd395091a445271580c86d3dc4e3b6cbe..8774a2287e03d8572768c6fa5ae4450ee26ae578 100644 (file)
--- a/extra/pop3/server/server.factor
+++ b/extra/pop3/server/server.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar combinators concurrency.promises
 destructors fry io io.crlf io.encodings.utf8 io.sockets
-io.sockets.secure.unix.debug io.streams.duplex io.timeouts
+io.sockets.secure.debug io.streams.duplex io.timeouts
 kernel locals math.parser namespaces prettyprint sequences
 splitting threads ;
 IN: pop3.server

diff --git a/extra/webapps/site-watcher/site-watcher.factor b/extra/webapps/site-watcher/site-watcher.factor
index a3545443995f0dd37f1a3a4bc0523a009e735228..5045e4fdafa48954ec503ca7ad98f4c3b24d9f37 100644 (file)
--- a/extra/webapps/site-watcher/site-watcher.factor
+++ b/extra/webapps/site-watcher/site-watcher.factor
@@ -7,7 +7,7 @@ furnace.auth.features.recover-password
 furnace.auth.features.registration furnace.auth.login
 furnace.boilerplate furnace.redirection html.forms http.server
 http.server.dispatchers kernel namespaces site-watcher site-watcher.db
-site-watcher.private urls validators io.sockets.secure.unix.debug
+site-watcher.private urls validators io.sockets.secure.debug
 io.servers io.files.temp db db.tuples sequences
 webapps.site-watcher.common webapps.site-watcher.watching
 webapps.site-watcher.spidering ;