dropped the concept of page file name

[Rakka.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 5db2fcceef8ee0ee0dfa1815dea1595cd3787ffa..b3313d68fd29ffb456b05d627e500e903d4a2f0d 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -9,6 +9,7 @@ import           Rakka.Resource.Index
 import           Rakka.Resource.JavaScript
 import           Rakka.Resource.PageEntity
 import           Rakka.Resource.Object
+import           Rakka.Resource.Render
 import           Rakka.Storage
 import           Subversion
 import           System.Console.GetOpt
@@ -40,7 +41,7 @@ data CmdOpt
 
 
 defaultPort :: PortNumber
-defaultPort = fromIntegral 8080
+defaultPort = toEnum 8080
 
 defaultLocalStateDir :: FilePath
 defaultLocalStateDir = LOCALSTATEDIR -- replaced by CPP
@@ -58,7 +59,7 @@ defaultLogLevel = NOTICE
 
 options :: [OptDescr CmdOpt]
 options = [ Option ['p'] ["port"]
-                   (ReqArg (OptPortNum . fromIntegral . read) "NUM")
+                   (ReqArg (OptPortNum . toEnum . read) "NUM")
                    ("Port number to listen. (default: " ++ show defaultPort ++ ")")
 
           , Option ['d'] ["localstatedir"]
@@ -136,8 +137,9 @@ main = withSubversion $
 resTree :: Environment -> ResTree
 resTree env
     = mkResTree [ ([]        , resIndex  env)
-                , (["object"], resObject env)
                 , (["js"    ], javaScript   )
+                , (["object"], resObject env)
+                , (["render"], resRender env)
                 ]