X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=examples%2FHelloWorld.hs;h=f21e052d7c0a8219ae0ee6b91510e081ee4032e4;hb=7b141208b4c741de208ec147eff6b2462ce26e80;hp=f3a36219fbd69fda04fefef40648dc1d5ca98b63;hpb=c6b11025d1f81c668e9995e856b7bb34175230d3;p=Lucu.git

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index f3a3621..f21e052 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,25 +1,19 @@
-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.URI
-import System.Posix.Signals
-import System.Time
+import Network.HTTP.Lucu
 
 main :: IO ()
 main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
-           resources = mkResTree [ ([], helloWorld) ]
+           resources = mkResTree [ ( []
+                                   , helloWorld )
+
+                                 , ( ["urandom"]
+                                   , staticFile "/dev/urandom" )
+
+                                 , ( ["inc"]
+                                   , staticDir "/usr/include" )
+                                 ]
        in
-         do installHandler sigPIPE Ignore Nothing
+         do putStrLn "Access http://localhost:9999/ with your browser."
             runHttpd config resources
 
 
@@ -29,9 +23,9 @@ helloWorld
         resUsesNativeThread = False
       , resIsGreedy         = False
       , resGet
-          = Just $ do time <- liftIO $ getClockTime
-                      foundEntity (strongETag "abcde") time
-                      setContentType $ "text" +/+ "hello"
+          = Just $ do --time <- liftIO $ getClockTime
+                      --foundEntity (strongETag "abcde") time
+                      setContentType $ read "text/hello"
                       outputChunk "Hello, "
                       outputChunk "World!\n"
       , resHead   = Nothing
@@ -39,7 +33,7 @@ helloWorld
           = Just $ do str1 <- inputChunk 3
                       str2 <- inputChunk 3
                       str3 <- inputChunk 3
-                      setContentType $ "text" +/+ "hello"
+                      setContentType $ read "text/hello"
                       output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
       , resPut    = Nothing
       , resDelete = Nothing