[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 1bf0a181b2c0d104eb515f9667129cb7a71e85e4
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 10:02:09 2006 +0100

    Renamed MissingH.Network.FTP.Server to Network.FTP.Server, refs #1

diff --git a/MissingH.cabal b/MissingH.cabal
index 9e28d1d..a6ed32a 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -29,7 +29,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
   MissingH.Network,
     Network.FTP.Client,
     Network.FTP.Client.Parser,
-    MissingH.Network.FTP.Server,
+    Network.FTP.Server,
     Network.FTP.Server.Parser,
   MissingH.Network.SocketServer,
   Data.Either.Utils,
diff --git a/MissingH/Network/SocketServer.hs b/MissingH/Network/SocketServer.hs
index 9f31fc0..4893ce4 100644
--- a/MissingH/Network/SocketServer.hs
+++ b/MissingH/Network/SocketServer.hs
@@ -33,7 +33,7 @@ Please note: this module is designed to work with TCP, UDP, and Unix domain
 sockets, but only TCP sockets have been tested to date.
 
 This module is presently under-documented.  For an example of usage, please
-see the description of "MissingH.Network.FTP.Server".
+see the description of "Network.FTP.Server".
 -}
 
 module MissingH.Network.SocketServer(-- * Generic Options and Types
diff --git a/MissingH/Network/FTP/Server.hs b/src/Network/FTP/Server.hs
similarity index 98%
rename from MissingH/Network/FTP/Server.hs
rename to src/Network/FTP/Server.hs
index 7c5bde7..4eeac31 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/src/Network/FTP/Server.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Network.FTP.Server
+   Module     : Network.FTP.Server
    Copyright  : Copyright (C) 2004 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -55,7 +55,7 @@ Your patches would also be welcomed.
 Here is an example server that serves up the entire local filesystem
 in a read-only manner:
 
->import MissingH.Network.FTP.Server
+>import Network.FTP.Server
 >import MissingH.Network.SocketServer
 >import System.Log.Logger
 >import System.IO.HVFS
@@ -63,7 +63,7 @@ in a read-only manner:
 >
 >main = do
 >       updateGlobalLogger "" (setLevel DEBUG)
->       updateGlobalLogger "MissingH.Network.FTP.Server" (setLevel DEBUG)
+>       updateGlobalLogger "Network.FTP.Server" (setLevel DEBUG)
 >       let opts = (simpleTCPOptions 12345) {reuse = True}
 >       serveTCPforever opts $
 >            threadedHandler $
@@ -75,7 +75,7 @@ Hint: if you wantto serve up only part of a filesystem, see
 'System.IO.HVFS.Combinators.newHVFSChroot'.
 -}
 
-module MissingH.Network.FTP.Server(
+module Network.FTP.Server(
                                    anonFtpHandler
                                   )
 where
@@ -121,7 +121,7 @@ data FTPState = FTPState
 data FTPServer = forall a. HVFSOpenable a => FTPServer Handle a FTPState
 
 s_crlf = "\r\n"
-logname = "MissingH.Network.FTP.Server"
+logname = "Network.FTP.Server"
 ftpPutStrLn :: FTPServer -> String -> IO ()
 ftpPutStrLn (FTPServer h _ _) text =
     do hPutStr h (text ++ s_crlf)
@@ -153,7 +153,7 @@ anonFtpHandler f h saremote salocal =
              let s = serv (FTPState {auth = authr, datatype = typer,
                                     rename = renamer, datachan = chanr,
                                     local = salocal, remote = saremote})
-             sendReply s 220 "Welcome to MissingH.Network.FTP.Server."
+             sendReply s 220 "Welcome to Network.FTP.Server."
              commandLoop s
 
 type CommandHandler = FTPServer -> String -> IO Bool
@@ -622,7 +622,7 @@ cmd_help h@(FTPServer _ _ state) args =
           [" --- General Help Response ---"
           ,""
           ,"Welcome to the FTP server, " ++ addr ++ "."
-          ,"This server is implemented as the MissingH.Network.FTP.Server"
+          ,"This server is implemented as the Network.FTP.Server"
           ,"component of the MissingH library.  The MissingH library"
           ,"is available from http://quux.org/devel/missingh."
           ,""
diff --git a/src/Network/FTP/Server/Parser.hs b/src/Network/FTP/Server/Parser.hs
index 537103d..c4ca6ff 100644
--- a/src/Network/FTP/Server/Parser.hs
+++ b/src/Network/FTP/Server/Parser.hs
@@ -26,8 +26,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    Portability: systems with networking
 
 This module provides a parser that is used internally by
-"MissingH.Network.FTP.Server".  You almost certainly do not want to use
-this module directly.  Use "MissingH.Network.FTP.Server" instead.
+"Network.FTP.Server".  You almost certainly do not want to use
+this module directly.  Use "Network.FTP.Server" instead.
 
 Written by John Goerzen, jgoerzen\@complete.org
 

-- 
haskell-testpack