From d1362485ecd44f3870cf7efa70928deb5a4a66d5 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Sun, 14 Aug 2011 09:35:26 -0700 Subject: [PATCH] Controller -> Handler --- yesod/scaffold.hs | 2 +- yesod/scaffold/{Controller.hs.cg => Handler.hs.cg} | 2 +- yesod/scaffold/main.hs.cg | 2 +- yesod/scaffold/project.cabal.cg | 2 +- yesod/scaffold/sitearg.hs.cg | 2 +- yesod/scaffold/tiny/{Controller.hs.cg => Handler.hs.cg} | 2 +- yesod/scaffold/tiny/cabal.cg | 2 +- yesod/scaffold/tiny/sitearg.hs.cg | 2 +- yesod/yesod.cabal | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) rename yesod/scaffold/{Controller.hs.cg => Handler.hs.cg} (99%) rename yesod/scaffold/tiny/{Controller.hs.cg => Handler.hs.cg} (99%) diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs index bdd5764d..80668d4e 100644 --- a/yesod/scaffold.hs +++ b/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") diff --git a/yesod/scaffold/Controller.hs.cg b/yesod/scaffold/Handler.hs.cg similarity index 99% rename from yesod/scaffold/Controller.hs.cg rename to yesod/scaffold/Handler.hs.cg index 3717ef1b..ec5d8ace 100644 --- a/yesod/scaffold/Controller.hs.cg +++ b/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 diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg index 178c61de..25692ff6 100644 --- a/yesod/scaffold/main.hs.cg +++ b/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) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 49923e84..490a11c2 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/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 diff --git a/yesod/scaffold/sitearg.hs.cg b/yesod/scaffold/sitearg.hs.cg index 0ee06976..500352f7 100644 --- a/yesod/scaffold/sitearg.hs.cg +++ b/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 diff --git a/yesod/scaffold/tiny/Controller.hs.cg b/yesod/scaffold/tiny/Handler.hs.cg similarity index 99% rename from yesod/scaffold/tiny/Controller.hs.cg rename to yesod/scaffold/tiny/Handler.hs.cg index 111676e7..41de5c45 100644 --- a/yesod/scaffold/tiny/Controller.hs.cg +++ b/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 diff --git a/yesod/scaffold/tiny/cabal.cg b/yesod/scaffold/tiny/cabal.cg index bb90305e..216aec13 100644 --- a/yesod/scaffold/tiny/cabal.cg +++ b/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 diff --git a/yesod/scaffold/tiny/sitearg.hs.cg b/yesod/scaffold/tiny/sitearg.hs.cg index a39c7db6..f8060d0c 100644 --- a/yesod/scaffold/tiny/sitearg.hs.cg +++ b/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 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index b4bc2921..a97b528f 100644 --- a/yesod/yesod.cabal +++ b/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