Start to implement WikiController.

Changed controllers from servlet to filter by mapping flexibility.
This commit is contained in:
takezoe
2013-05-02 02:01:51 +09:00
parent f1957e5c1f
commit 36ce53477f
14 changed files with 253 additions and 207 deletions

View File

@@ -11,7 +11,7 @@ import jp.sf.amateras.scalatra.forms._
/**
* Creates new repository.
*/
class CreateRepositoryServlet extends ServletBase {
class CreateRepositoryController extends ControllerBase {
case class RepositoryCreationForm(name: String, description: String)

View File

@@ -64,7 +64,7 @@ case class ContentInfo(viewType: String, content: Option[String])
/**
* The repository viewer.
*/
class RepositoryViewerServlet extends ServletBase {
class RepositoryViewerController extends ControllerBase {
/**
* Displays user information.

View File

@@ -9,7 +9,7 @@ import jp.sf.amateras.scalatra.forms._
/**
* Provides generic features for ScalatraServlet implementations.
*/
abstract class ServletBase extends ScalatraServlet with ClientSideValidationFormSupport with JacksonJsonSupport {
abstract class ControllerBase extends ScalatraFilter with ClientSideValidationFormSupport with JacksonJsonSupport {
implicit val jsonFormats = DefaultFormats

View File

@@ -0,0 +1,9 @@
package app
class UsersController extends ControllerBase {
get("/"){
}
}

View File

@@ -1,9 +0,0 @@
package app
class UsersServlet extends ServletBase {
get("/"){
}
}

View File

@@ -0,0 +1,14 @@
package app
import util.{WikiUtil, JGitUtil}
class WikiController extends ControllerBase {
get("/:owner/:repository/wiki"){
val owner = params("owner")
val repository = params("repository")
html.wiki(WikiUtil.getPage(owner, repository, "Home"), JGitUtil.getRepositoryInfo(owner, repository, servletContext))
}
}