[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 15:17:48 UTC 2010
The following commit has been merged in the master branch:
commit 2fc7de12a42484d01764f8c30176e4801c6392c4
Author: John Goerzen <jgoerzen at complete.org>
Date: Sun Dec 3 10:00:41 2006 +0100
More renaming, refs #1
diff --git a/MissingH.cabal b/MissingH.cabal
index b538c69..ce09b18 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -5,14 +5,14 @@ License: GPL
Maintainer: John Goerzen <jgoerzen at complete.org>
Stability: Beta
Copyright: Copyright (c) 2004-2006 John Goerzen
-Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, MissingH.List,
+Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
System.Daemon,
MissingH.Parsec,
Test.HUnit.Utils,
Network.Email.Mailbox,
- MissingH.Logging, MissingH.Logging.Handler,
- MissingH.Logging.Handler.Simple, MissingH.Logging.Handler.Syslog,
- MissingH.Logging.Logger,
+ System.Log, System.Log.Handler,
+ System.Log.Handler.Simple, System.Log.Handler.Syslog,
+ System.Log.Logger,
MissingH.Threads,
Network.Email.Sendmail,
Language.RFC2234.Parse, Language.RFC2821.Parse,
@@ -23,7 +23,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, MissingH.List,
MissingH.ProgressTracker,
MissingH.ProgressMeter,
MissingH.Quantity,
- MissingH.Map, MissingH.Path, MissingH.Path.NameManip,
+ Data.Map.Utils, MissingH.Path, MissingH.Path.NameManip,
MissingH.Path.FilePath, MissingH.Path.WildMatch, MissingH.Path.Glob,
MissingH.Time, MissingH.Time.ParseDate,
MissingH.Network,
@@ -33,7 +33,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, MissingH.List,
MissingH.Network.FTP.ParserServer,
MissingH.Network.SocketServer,
Data.Either.Utils,
- MissingH.Maybe,
+ Data.Maybe.Utils,
Data.ConfigFile,
Data.ConfigFile.Types,
Data.ConfigFile.Parser,
@@ -53,7 +53,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, MissingH.List,
System.IO.PlafCompat, System.IO.Posix.Consts,
Network.Email.Parser,
System.Debian, System.Debian.ControlParser,
- MissingH.MIMETypes,
+ Data.MIME.Types,
MissingH.Wash.Mail.Email,
MissingH.Wash.Mail.EmailConfig,
MissingH.Wash.Mail.HeaderField,
diff --git a/MissingH/Network/FTP/Client.hs b/MissingH/Network/FTP/Client.hs
index f18cfc5..8996a10 100644
--- a/MissingH/Network/FTP/Client.hs
+++ b/MissingH/Network/FTP/Client.hs
@@ -151,12 +151,12 @@ or make sure you consume the 'nlst' data first.
Here is a partial list of commands effected: 'nlst', 'dir', 'getbinary',
'getlines', 'downloadbinary'.
-The 'MissingH.List.seqList' function could be quite helpful here. For instance:
+The 'Data.List.Utils.seqList' function could be quite helpful here. For instance:
> x <- nlst h Nothing
> map (\fn -> ...download files from FTP... ) (seqList x)
-If you omit the call to 'MissingH.List.seqList', commands to download files
+If you omit the call to 'Data.List.Utils.seqList', commands to download files
will be issued before the entire directory listing is read. FTP cannot handle
this.
@@ -169,7 +169,7 @@ This will be fairly rare. Just be aware of this.
This module logs messages under @MissingH.Network.FTP.Client@ for outgoing
traffic and @MissingH.Network.FTP.ParserClient@ for incoming traffic, all with the
-'MissingH.Logging.DEBUG' priority, so by default, no log messages are seen.
+'System.Log.DEBUG' priority, so by default, no log messages are seen.
The 'enableFTPDebugging' function will adjust the priorities of these
two handlers so debug messages are seen. Only control channel conversations
are logged. Data channel conversations are never logged.
@@ -228,7 +228,7 @@ import System.IO.Binary
import qualified Network
import System.IO
import System.IO.Unsafe
-import MissingH.Logging.Logger
+import System.Log.Logger
import MissingH.Network
import MissingH.Str
data FTPConnection = FTPConnection {readh :: IO String,
@@ -253,7 +253,7 @@ easyConnectFTP :: Network.HostName -> IO FTPConnection
easyConnectFTP h = do x <- connectFTP h 21
return (fst x)
-{- | Enable logging of FTP messages through 'MissingH.Logging.Logger'.
+{- | Enable logging of FTP messages through 'System.Log.Logger'.
This sets the log levels of @MissingH.Network.FTP.ParserClient@ and
@MissingH.Network.FTP.Client@ to DEBUG. By default, this means that
full protocol dumps will be sent to stderr.
diff --git a/MissingH/Network/FTP/ParserClient.hs b/MissingH/Network/FTP/ParserClient.hs
index 27cd04e..a6bdbde 100644
--- a/MissingH/Network/FTP/ParserClient.hs
+++ b/MissingH/Network/FTP/ParserClient.hs
@@ -47,10 +47,10 @@ where
import Text.ParserCombinators.Parsec
import MissingH.Parsec
-import MissingH.List
+import Data.List.Utils
import Data.Bits.Utils
import MissingH.Str
-import MissingH.Logging.Logger
+import System.Log.Logger
import Network.Socket(SockAddr(..), PortNumber(..), inet_addr, inet_ntoa)
import System.IO(Handle, hGetContents)
import System.IO.Unsafe
diff --git a/MissingH/Network/FTP/ParserServer.hs b/MissingH/Network/FTP/ParserServer.hs
index 25c5732..f9a9eac 100644
--- a/MissingH/Network/FTP/ParserServer.hs
+++ b/MissingH/Network/FTP/ParserServer.hs
@@ -40,10 +40,10 @@ where
import MissingH.Network.FTP.ParserClient
import Text.ParserCombinators.Parsec
import MissingH.Parsec
-import MissingH.List
+import Data.List.Utils
import Data.Bits.Utils
import MissingH.Str
-import MissingH.Logging.Logger
+import System.Log.Logger
import Network.Socket(SockAddr(..), PortNumber(..), inet_addr, inet_ntoa)
import System.IO(Handle, hGetContents)
import System.IO(hGetLine)
diff --git a/MissingH/Network/FTP/Server.hs b/MissingH/Network/FTP/Server.hs
index ef13480..a555b0a 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/MissingH/Network/FTP/Server.hs
@@ -44,7 +44,7 @@ as a filesystem. It does this by using the
In addition, basic networking and multitasking configuration is handled
via "MissingH.Network.SocketServer" and logging via
-"MissingH.Logging.Logger".
+"System.Log.Logger".
This module is believed to be secure, but it not believed to be robust enough
for use on a public FTP server. In particular, it may be vulnerable to denial
@@ -57,7 +57,7 @@ in a read-only manner:
>import MissingH.Network.FTP.Server
>import MissingH.Network.SocketServer
->import MissingH.Logging.Logger
+>import System.Log.Logger
>import System.IO.HVFS
>import System.IO.HVFS.Combinators
>
@@ -86,7 +86,7 @@ import Network.Socket
import qualified Network
import System.IO
import System.IO.Error
-import MissingH.Logging.Logger
+import System.Log.Logger
import MissingH.Network
import MissingH.Network.SocketServer
import MissingH.Str
diff --git a/MissingH/Network/SocketServer.hs b/MissingH/Network/SocketServer.hs
index 377b3f6..9f31fc0 100644
--- a/MissingH/Network/SocketServer.hs
+++ b/MissingH/Network/SocketServer.hs
@@ -59,7 +59,7 @@ import Network.BSD
import MissingH.Network
import Control.Concurrent
import System.IO
-import qualified MissingH.Logging.Logger
+import qualified System.Log.Logger
{- | Options for your server. -}
data InetServerOptions = InetServerOptions {listenQueueSize :: Int,
@@ -152,24 +152,24 @@ serveTCPforever options func =
----------------------------------------------------------------------
{- | Log each incoming connection using the interface in
-"MissingH.Logging.Logger".
+"System.Log.Logger".
Log when the incoming connection disconnects.
Also, log any failures that may occur in the child handler. -}
loggingHandler :: String -- ^ Name of logger to use
- -> MissingH.Logging.Logger.Priority -- ^ Priority of logged messages
+ -> System.Log.Logger.Priority -- ^ Priority of logged messages
-> HandlerT -- ^ Handler to call after logging
-> HandlerT -- ^ Resulting handler
loggingHandler hname prio nexth socket r_sockaddr l_sockaddr =
do sockStr <- showSockAddr r_sockaddr
- MissingH.Logging.Logger.logM hname prio
+ System.Log.Logger.logM hname prio
("Received connection from " ++ sockStr)
- MissingH.Logging.Logger.traplogging hname
- MissingH.Logging.Logger.WARNING "" (nexth socket r_sockaddr
+ System.Log.Logger.traplogging hname
+ System.Log.Logger.WARNING "" (nexth socket r_sockaddr
l_sockaddr)
- MissingH.Logging.Logger.logM hname prio
+ System.Log.Logger.logM hname prio
("Connection " ++ sockStr ++ " disconnected")
diff --git a/MissingH/Path.hs b/MissingH/Path.hs
index 861d8b4..e6a80fa 100644
--- a/MissingH/Path.hs
+++ b/MissingH/Path.hs
@@ -42,7 +42,7 @@ module MissingH.Path(-- * Name processing
)
where
import Data.List
-import MissingH.List
+import Data.List.Utils
#ifndef mingw32_HOST_OS
import System.Posix.Files
import System.Posix.Directory (createDirectory)
diff --git a/MissingH/Path/Glob.hs b/MissingH/Path/Glob.hs
index af95d1c..6aa4f00 100644
--- a/MissingH/Path/Glob.hs
+++ b/MissingH/Path/Glob.hs
@@ -32,7 +32,7 @@ in "MissingH.Path.WildMatch".
-}
module MissingH.Path.Glob(glob, vGlob) where
-import MissingH.List
+import Data.List.Utils
import System.IO
import System.IO.HVFS
import MissingH.Path.FilePath
diff --git a/MissingH/Str.hs b/MissingH/Str.hs
index f46cbe3..7cbf3af 100644
--- a/MissingH/Str.hs
+++ b/MissingH/Str.hs
@@ -35,14 +35,14 @@ module MissingH.Str
strip, lstrip, rstrip,
-- * Tests
-- | Note: These functions are aliases for functions
- -- in "MissingH.List".
+ -- in "Data.List.Utils".
startswith, endswith,
-- * Conversions
-- | Note: Some of these functions are aliases for functions
- -- in "MissingH.List".
+ -- in "Data.List.Utils".
join, split, splitWs, splitRe, replace, subRe, escapeRe
) where
-import MissingH.List(startswith, endswith, join, split, replace)
+import Data.List.Utils(startswith, endswith, join, split, replace)
import Data.Char
import Text.Regex
diff --git a/src/Data/ConfigFile.hs b/src/Data/ConfigFile.hs
index c264439..4d19707 100644
--- a/src/Data/ConfigFile.hs
+++ b/src/Data/ConfigFile.hs
@@ -105,7 +105,7 @@ module Data.ConfigFile
) where
import Data.ConfigFile.Types
import Data.ConfigFile.Parser
-import MissingH.Map
+import Data.Map.Utils
import Data.Either.Utils
import MissingH.Str
import qualified Data.Map as Map
diff --git a/MissingH/List.hs b/src/Data/List/Utils.hs
similarity index 98%
rename from MissingH/List.hs
rename to src/Data/List/Utils.hs
index f39e99b..ecb0f1f 100644
--- a/MissingH/List.hs
+++ b/src/Data/List/Utils.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.List
+ Module : Data.List.Utils
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -30,7 +30,7 @@ This module provides various helpful utilities for dealing with lists.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.List(-- * Merging
+module Data.List.Utils(-- * Merging
merge, mergeBy,
-- * Tests
startswith, endswith, contains, hasAny,
@@ -313,8 +313,8 @@ strToAL inp =
case reads line of
[(key, remainder)] -> case remainder of
',':valstr -> (key, read valstr)
- _ -> error "MissingH.List.strToAL: Parse error on value"
- _ -> error "MissingH.List.strToAL: Parse error on key"
+ _ -> error "Data.List.Utils.strToAL: Parse error on value"
+ _ -> error "Data.List.Utils.strToAL: Parse error on key"
in map worker (lines inp)
diff --git a/MissingH/MIMETypes.hs b/src/Data/MIME/Types.hs
similarity index 99%
rename from MissingH/MIMETypes.hs
rename to src/Data/MIME/Types.hs
index 5944f47..01a0762 100644
--- a/MissingH/MIMETypes.hs
+++ b/src/Data/MIME/Types.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.MIMETypes
+ Module : Data.MIME.Types
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -30,7 +30,7 @@ Utilities for guessing MIME types of files.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.MIMETypes (-- * Creating Lookup Objects
+module Data.MIME.Types (-- * Creating Lookup Objects
defaultmtd,
readMIMETypes,
hReadMIMETypes,
@@ -51,7 +51,7 @@ import System.IO
import System.IO.Error
import System.IO
import MissingH.Path
-import MissingH.Map
+import Data.Map.Utils
import Data.Char
----------------------------------------------------------------------
diff --git a/MissingH/Map.hs b/src/Data/Map/Utils.hs
similarity index 89%
rename from MissingH/Map.hs
rename to src/Data/Map/Utils.hs
index 3ef5621..29f9f13 100644
--- a/MissingH/Map.hs
+++ b/src/Data/Map/Utils.hs
@@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Map
+ Module : Data.Map.Utils
Copyright : Copyright (C) 2004-2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -29,7 +29,7 @@ This module provides various helpful utilities for dealing with Data.Maps.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Map (-- * Basic Utilities
+module Data.Map.Utils (-- * Basic Utilities
flipM, flippedLookupM, forceLookupM,
-- * Conversions
strToM,
@@ -38,10 +38,10 @@ module MissingH.Map (-- * Basic Utilities
where
import qualified Data.Map
-import MissingH.List(flipAL, strToAL, strFromAL)
+import Data.List.Utils(flipAL, strToAL, strFromAL)
{- | Converts a String, String Map into a string representation.
-See 'MissingH.List.strFromAL' for more on the similar function for
+See 'Data.List.Utils.strFromAL' for more on the similar function for
association lists. This implementation is simple:
>strFromM = strFromAL . Data.Map.toList
@@ -52,7 +52,7 @@ strFromM :: (Show a, Show b, Ord a) => Data.Map.Map a b -> String
strFromM = strFromAL . Data.Map.toList
{- | Converts a String into a String, String Map. See
-'MissingH.List.strToAL' for more on the similar function for association
+'Data.List.Utils.strToAL' for more on the similar function for association
lists.
This implementation is simple:
@@ -65,7 +65,7 @@ representations. -}
strToM :: (Read a, Read b, Ord a) => String -> Data.Map.Map a b
strToM = Data.Map.fromList . strToAL
-{- | Flips a Map. See 'MissingH.List.flipAL' for more on the similar
+{- | Flips a Map. See 'Data.List.Utils.flipAL' for more on the similar
function for lists. -}
flipM :: (Ord key, Ord val) => Data.Map.Map key val -> Data.Map.Map val [key]
diff --git a/MissingH/Maybe.hs b/src/Data/Maybe/Utils.hs
similarity index 96%
rename from MissingH/Maybe.hs
rename to src/Data/Maybe/Utils.hs
index 58dd737..f520477 100644
--- a/MissingH/Maybe.hs
+++ b/src/Data/Maybe/Utils.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Maybe
+ Module : Data.Maybe.Utils
Copyright : Copyright (C) 2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -29,7 +29,7 @@ Utilities for working with the Either data type
Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Maybe
+module Data.Maybe.Utils
(
forceMaybe, forceMaybeMsg
) where
diff --git a/src/Database/AnyDBM.hs b/src/Database/AnyDBM.hs
index dafc491..b5ff734 100644
--- a/src/Database/AnyDBM.hs
+++ b/src/Database/AnyDBM.hs
@@ -43,7 +43,7 @@ import Prelude hiding (lookup)
import System.IO
import Data.HashTable
import Control.Exception
-import MissingH.List(strFromAL, strToAL)
+import Data.List.Utils(strFromAL, strToAL)
{- | The main class for items implementing this interface.
@@ -148,13 +148,13 @@ mapA :: AnyDBM a => a -> ((String, String) -> IO b) -> IO [b]
mapA h func = do l <- toListA h
mapM func l
-{- | Similar to 'MissingH.List.strToAL' -- load a string representation
+{- | Similar to 'Data.List.Utils.strToAL' -- load a string representation
into the AnyDBM. You must supply an existing AnyDBM object;
the items loaded from the string will be added to it. -}
strToA :: AnyDBM a => a -> String -> IO ()
strToA h s = insertListA h (strToAL s)
-{- | Similar to 'MissingH.List.strFromAL' -- get a string representation of
+{- | Similar to 'Data.List.Utils.strFromAL' -- get a string representation of
the entire AnyDBM. -}
strFromA :: AnyDBM a => a -> IO String
strFromA h = do l <- toListA h
diff --git a/src/System/Cmd/Utils.hs b/src/System/Cmd/Utils.hs
index 08fabeb..6286b76 100644
--- a/src/System/Cmd/Utils.hs
+++ b/src/System/Cmd/Utils.hs
@@ -33,7 +33,7 @@ Written by John Goerzen, jgoerzen\@complete.org
Please note: Most of this module is not compatible with Hugs.
-Command lines executed will be logged using "MissingH.Logging.Logger" at the
+Command lines executed will be logged using "System.Log.Logger" at the
DEBUG level. Failure messages will be logged at the WARNING level in addition
to being raised as an exception. Both are logged under
\"System.Cmd.Utils.funcname\" -- for instance,
@@ -43,8 +43,8 @@ globally, you can simply run:
> updateGlobalLogger "System.Cmd.Utils.safeSystem"
> (setLevel CRITICAL)
-See also: 'MissingH.Logging.Logger.updateGlobalLogger',
-"MissingH.Logging.Logger".
+See also: 'System.Log.Logger.updateGlobalLogger',
+"System.Log.Logger".
It is possible to set up pipelines with these utilities. Example:
@@ -106,7 +106,7 @@ where
import System.Exit
import System.Cmd
-import MissingH.Logging.Logger
+import System.Log.Logger
#ifndef mingw32_HOST_OS
import System.Posix.IO
import System.Posix.Process
diff --git a/src/System/Daemon.hs b/src/System/Daemon.hs
index 3b9debe..c47f443 100644
--- a/src/System/Daemon.hs
+++ b/src/System/Daemon.hs
@@ -33,7 +33,7 @@ Written by John Goerzen, jgoerzen\@complete.org
Please note: Most of this module is not compatible with Hugs.
Messages from this module are logged under @System.Daemon at . See
-'MissingH.Logging.Logger' for details.
+'System.Log.Logger' for details.
Based on background
from <http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16> and
@@ -54,7 +54,7 @@ where
import System.Posix.Process
import System.Posix.IO
import System.Directory
-import MissingH.Logging.Logger
+import System.Log.Logger
import System.Exit
diff --git a/MissingH/Logging.hs b/src/System/Log.hs
similarity index 95%
rename from MissingH/Logging.hs
rename to src/System/Log.hs
index 7324f11..26d934a 100644
--- a/MissingH/Logging.hs
+++ b/src/System/Log.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Logging
+ Module : System.Log
Copyright : Copyright (C) 2004 John Goerzen
License : GNU GPL, version 2 or above
@@ -34,13 +34,13 @@ This module defines basic types used for logging.
/This API is new and in a state of flux./
Extensive documentation is available in
-"MissingH.Logging.Logger".
+"System.Log.Logger".
-}
-module MissingH.Logging(-- * Types
+module System.Log(-- * Types
Priority(..),
LogRecord
)
diff --git a/MissingH/Logging/Handler.hs b/src/System/Log/Handler.hs
similarity index 89%
rename from MissingH/Logging/Handler.hs
rename to src/System/Log/Handler.hs
index 8ff6597..8c27b7c 100644
--- a/MissingH/Logging/Handler.hs
+++ b/src/System/Log/Handler.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Logging.Handler
+ Module : System.Log.Handler
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -27,19 +27,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Definition of log handler support
-For some handlers, check out "MissingH.Logging.Handler.Simple" and
-"MissingH.Logging.Handler.Syslog".
+For some handlers, check out "System.Log.Handler.Simple" and
+"System.Log.Handler.Syslog".
-Please see "MissingH.Logging.Logger" for extensive documentation on the
+Please see "System.Log.Logger" for extensive documentation on the
logging system.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Logging.Handler(-- * Basic Types
+module System.Log.Handler(-- * Basic Types
LogHandler(..)
) where
-import MissingH.Logging
+import System.Log
import IO
{- | All log handlers should adhere to this. -}
diff --git a/MissingH/Logging/Handler/Simple.hs b/src/System/Log/Handler/Simple.hs
similarity index 95%
rename from MissingH/Logging/Handler/Simple.hs
rename to src/System/Log/Handler/Simple.hs
index cda5651..6bd70fb 100644
--- a/MissingH/Logging/Handler/Simple.hs
+++ b/src/System/Log/Handler/Simple.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Logging.Handler.Simple
+ Module : System.Log.Handler.Simple
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -30,12 +30,12 @@ Simple log handlers
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Logging.Handler.Simple(streamHandler, fileHandler,
+module System.Log.Handler.Simple(streamHandler, fileHandler,
verboseStreamHandler)
where
-import MissingH.Logging
-import MissingH.Logging.Handler
+import System.Log
+import System.Log.Handler
import IO
import Control.Concurrent.MVar
diff --git a/MissingH/Logging/Handler/Syslog.hs b/src/System/Log/Handler/Syslog.hs
similarity index 97%
rename from MissingH/Logging/Handler/Syslog.hs
rename to src/System/Log/Handler/Syslog.hs
index 4ab123e..e223eea 100644
--- a/MissingH/Logging/Handler/Syslog.hs
+++ b/src/System/Log/Handler/Syslog.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Logging.Handler.Syslog
+ Module : System.Log.Handler.Syslog
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -41,11 +41,11 @@ or remote machine using the Syslog protocol.
You can create a new Syslog 'LogHandler' by calling 'openlog'.
More information on the Haskell Logging Framework can be found at
-"MissingH.Logging.Logger". This module can also be used outside
+"System.Log.Logger". This module can also be used outside
of the rest of that framework for those interested in that.
-}
-module MissingH.Logging.Handler.Syslog(
+module System.Log.Handler.Syslog(
-- * Handler Initialization
openlog,
-- * Advanced handler initialization
@@ -59,8 +59,8 @@ module MissingH.Logging.Handler.Syslog(
Option(..)
) where
-import MissingH.Logging
-import MissingH.Logging.Handler
+import System.Log
+import System.Log.Handler
import Data.Bits
import Network.Socket
import Network.BSD
@@ -148,7 +148,7 @@ data SyslogHandler = SyslogHandler {options :: [Option],
priority :: Priority}
{- | Initialize the Syslog system using the local system's default interface,
-\/dev\/log. Will return a new 'MissingH.Logging.Handler.LogHandler'.
+\/dev\/log. Will return a new 'System.Log.Handler.LogHandler'.
On Windows, instead of using \/dev\/log, this will attempt to send
UDP messages to something listening on the syslog port (514) on localhost.
diff --git a/MissingH/Logging/Logger.hs b/src/System/Log/Logger.hs
similarity index 97%
rename from MissingH/Logging/Logger.hs
rename to src/System/Log/Logger.hs
index 51e5533..8931989 100644
--- a/MissingH/Logging/Logger.hs
+++ b/src/System/Log/Logger.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Logging.Logger
+ Module : System.Log.Logger
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -78,7 +78,7 @@ that 'Logger's do. They act just like the 'Priority' value in the
under no circumstances will a mere 'DEBUG' message show up in your syslog.
There are three built-in handlers given in two built-in modules:
-"MissingH.Logging.Handler.Simple" and "MissingH.Logging.Handler.Syslog".
+"System.Log.Handler.Simple" and "System.Log.Handler.Syslog".
There is a special logger known as the /root logger/ that sits at the top
of the logger hierarchy. It is always present, and handlers attached
@@ -87,8 +87,8 @@ it or 'rootLoggerName' to work with it by name.
Here's an example to illustrate some of these concepts:
-> import MissingH.Logging.Logger
-> import MissingH.Logging.Handler.Syslog
+> import System.Log.Logger
+> import System.Log.Handler.Syslog
>
> -- By default, all messages of level WARNING and above are sent to stderr.
> -- Everything else is ignored.
@@ -126,10 +126,10 @@ Here's an example to illustrate some of these concepts:
-}
-module MissingH.Logging.Logger(
+module System.Log.Logger(
-- * Basic Types
Logger,
- -- ** Re-Exported from MissingH.Logging
+ -- ** Re-Exported from System.Log
Priority(..),
-- * Logging Messages
-- ** Basic
@@ -172,10 +172,10 @@ logger hierarchy. -}
updateGlobalLogger
) where
import MissingH.Str
-import MissingH.Logging
-import MissingH.Logging.Handler(LogHandler)
-import qualified MissingH.Logging.Handler(handle)
-import MissingH.Logging.Handler.Simple
+import System.Log
+import System.Log.Handler(LogHandler)
+import qualified System.Log.Handler(handle)
+import System.Log.Handler.Simple
import IO
import System.IO.Unsafe
import Control.Concurrent.MVar
@@ -386,7 +386,7 @@ handle l (pri, msg) =
callHandler :: LogRecord -> String -> HandlerT -> IO ()
callHandler lr loggername ht =
case ht of
- HandlerT x -> MissingH.Logging.Handler.handle x lr loggername
+ HandlerT x -> System.Log.Handler.handle x lr loggername
-- | Generate IO actions for the handlers.
handlerActions :: [HandlerT] -> LogRecord -> String -> [IO ()]
diff --git a/testsrc/AnyDBMtest.hs b/testsrc/AnyDBMtest.hs
index 9da1579..a84e8cb 100644
--- a/testsrc/AnyDBMtest.hs
+++ b/testsrc/AnyDBMtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module AnyDBMtest(mf, generic_persist_test, generic_test, tests) where
import Test.HUnit
-import MissingH.List
+import Data.List.Utils
import System.IO.HVFS
import System.IO.HVFS.InstanceHelpers
import Database.AnyDBM
diff --git a/testsrc/Listtest.hs b/testsrc/Listtest.hs
index 5029249..ff829b1 100644
--- a/testsrc/Listtest.hs
+++ b/testsrc/Listtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Listtest(tests) where
import Test.HUnit
-import MissingH.List
+import Data.List.Utils
import Data.List
import Test.HUnit
import Test.QuickCheck as QC
diff --git a/testsrc/MIMETypestest.hs b/testsrc/MIMETypestest.hs
index 763e138..be6416d 100644
--- a/testsrc/MIMETypestest.hs
+++ b/testsrc/MIMETypestest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module MIMETypestest(tests) where
import Test.HUnit
import Data.List
-import MissingH.MIMETypes
+import Data.MIME.Types
test_readMIMETypes =
let omtd = readMIMETypes defaultmtd True "testsrc/mime.types.test"
diff --git a/testsrc/Maptest.hs b/testsrc/Maptest.hs
index 0c9b5dc..4f102cf 100644
--- a/testsrc/Maptest.hs
+++ b/testsrc/Maptest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Maptest(tests) where
import Test.HUnit
-import MissingH.Map
+import Data.Map.Utils
import Data.Map as M
test_flipM =
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list