Controller -> Handler

yesod/scaffold.hs

@@ -160,7 +160,7 @@ scaffold = do
     writeFile' ".ghci" $(codegen ".ghci")
     writeFile' "LICENSE" $(codegen "LICENSE")
     writeFile' (sitearg ++ ".hs") $ ifTiny $(codegen "tiny/sitearg.hs") $(codegen "sitearg.hs")
-    writeFile' "Controller.hs" $ ifTiny $(codegen "tiny/Controller.hs") $(codegen "Controller.hs")
+    writeFile' "Handler.hs" $ ifTiny $(codegen "tiny/Handler.hs") $(codegen "Handler.hs")
     writeFile' "Handler/Root.hs" $ ifTiny $(codegen "tiny/Handler/Root.hs") $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "config/Settings.hs" $ ifTiny $(codegen "tiny/config/Settings.hs") $(codegen "config/Settings.hs")

yesod/scaffold/Handler.hs.cg

@@ -3,7 +3,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Controller
+module Handler
     ( with~sitearg~
     , withDevelApp
     ) where

yesod/scaffold/main.hs.cg

@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP, DeriveDataTypeable #-}
 import qualified Settings as Settings
 import Settings (AppConfig(..))
-import Controller (with~sitearg~)
+import Handler (with~sitearg~)
 import Network.Wai.Handler.Warp (run)
 import System.Console.CmdArgs hiding (args)
 import Data.Char (toUpper, toLower)

yesod/scaffold/project.cabal.cg

@@ -25,7 +25,7 @@ library
         Buildable: True
     else
         Buildable: False
-    exposed-modules: Controller
+    exposed-modules: Handler
     hs-source-dirs: ., config
     other-modules:   ~sitearg~
                      Model

yesod/scaffold/sitearg.hs.cg

@@ -69,7 +69,7 @@ type Widget = GWidget ~sitearg~ ~sitearg~
 -- * Creates the associated type:
 --       type instance Route ~sitearg~ = ~sitearg~Route
 -- * Creates the value resources~sitearg~ which contains information on the
---   resources declared below. This is used in Controller.hs by the call to
+--   resources declared below. This is used in Handler.hs by the call to
 --   mkYesodDispatch
 --
 -- What this function does *not* do is create a YesodSite instance for

yesod/scaffold/tiny/Handler.hs.cg

@@ -2,7 +2,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Controller
+module Handler
     ( with~sitearg~
     , withDevelApp
     ) where

yesod/scaffold/tiny/cabal.cg

@@ -25,7 +25,7 @@ library
         Buildable: True
     else
         Buildable: False
-    exposed-modules: Controller
+    exposed-modules: Handler
     hs-source-dirs: ., config
     other-modules:   ~sitearg~
                      Settings

yesod/scaffold/tiny/sitearg.hs.cg

@@ -57,7 +57,7 @@ type Widget = GWidget ~sitearg~ ~sitearg~
 -- * Creates the associated type:
 --       type instance Route ~sitearg~ = ~sitearg~Route
 -- * Creates the value resources~sitearg~ which contains information on the
---   resources declared below. This is used in Controller.hs by the call to
+--   resources declared below. This is used in Handler.hs by the call to
 --   mkYesodDispatch
 --
 -- What this function does *not* do is create a YesodSite instance for

yesod/yesod.cabal

@@ -25,7 +25,7 @@ extra-source-files:
   scaffold/mongoDBConnPool.cg
   scaffold/tiny/sitearg.hs.cg
   scaffold/tiny/cabal.cg
-  scaffold/tiny/Controller.hs.cg
+  scaffold/tiny/Handler.hs.cg
   scaffold/tiny/hamlet/homepage.hamlet.cg
   scaffold/tiny/Handler/Root.hs.cg
   scaffold/tiny/config/routes.cg
@@ -35,7 +35,7 @@ extra-source-files:
   scaffold/sqliteConnPool.cg
   scaffold/.ghci.cg
   scaffold/project.cabal.cg
-  scaffold/Controller.hs.cg
+  scaffold/Handler.hs.cg
   scaffold/julius/homepage.julius.cg
   scaffold/hamlet/homepage.hamlet.cg
   scaffold/hamlet/default-layout.hamlet.cg