Cabal

[Lucu.git] / examples / HelloWorld.hs

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index 20be0ce1a9969dd4dc49fd0bfe5b4984fdb0ae06..468de85da37b3dfedad4940d8250248b230f8940 100644 (file)
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,29 +1,11 @@
-import Control.Monad.Trans
-import Data.Maybe
 import Network
-import Network.HTTP.Lucu.Config
-import Network.HTTP.Lucu.ETag
-import Network.HTTP.Lucu.Httpd
-import Network.HTTP.Lucu.MIMEType
-import Network.HTTP.Lucu.MIMEType.Guess
-import Network.HTTP.Lucu.Parser
-import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Resource
-import Network.HTTP.Lucu.Resource.Tree
-import Network.HTTP.Lucu.Response
-import Network.HTTP.Lucu.StaticFile
-import Network.URI
-import System.Posix.Signals
-import System.Time
+import Network.HTTP.Lucu
 
 main :: IO ()
 main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
            resources = mkResTree [ ( []
                                    , helloWorld )
 
-                                 , ( ["index.html"]
-                                   , staticFile "/Users/admin/Sites/index.html" )
-
                                  , ( ["urandom"]
                                    , staticFile "/dev/urandom" )
 
@@ -31,8 +13,7 @@ main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
                                    , staticDir "/usr/include" )
                                  ]
        in
-         do installHandler sigPIPE Ignore Nothing
-            runHttpd config resources
+         runHttpd config resources
 
 
 helloWorld :: ResourceDef
@@ -43,7 +24,7 @@ helloWorld
       , resGet
           = Just $ do --time <- liftIO $ getClockTime
                       --foundEntity (strongETag "abcde") time
-                      setContentType $ "text" +/+ "hello"
+                      setContentType $ "text" </> "hello"
                       outputChunk "Hello, "
                       outputChunk "World!\n"
       , resHead   = Nothing
@@ -51,7 +32,7 @@ helloWorld
           = Just $ do str1 <- inputChunk 3
                       str2 <- inputChunk 3
                       str3 <- inputChunk 3
-                      setContentType $ "text" +/+ "hello"
+                      setContentType $ "text" </> "hello"
                       output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
       , resPut    = Nothing
       , resDelete = Nothing