(refs #464)Switch to play-twirl

2025-11-02 11:36:05 +01:00 · 2014-08-14 18:37:37 +09:00
parent b78d584d8a
commit 3bb69c623b
12 changed files with 74 additions and 53 deletions
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.5
--- a/project/build.scala
+++ b/project/build.scala
@@ -1,8 +1,9 @@
 import sbt._
 import Keys._
 import org.scalatra.sbt._
-import twirl.sbt.TwirlPlugin._
 import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys
+import play.twirl.sbt.SbtTwirl
+import play.twirl.sbt.Import.TwirlKeys._

 object MyBuild extends Build {
  val Organization = "jp.sf.amateras"
@@ -13,45 +14,47 @@ object MyBuild extends Build {

  lazy val project = Project (
    "gitbucket",
-    file("."),
-    settings = Defaults.defaultSettings ++ ScalatraPlugin.scalatraWithJRebel ++ Seq(
-      sourcesInBase := false,
-      organization := Organization,
-      name := Name,
-      version := Version,
-      scalaVersion := ScalaVersion,
-      resolvers ++= Seq(
-        Classpaths.typesafeReleases,
-        "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
-      ),
-      scalacOptions := Seq("-deprecation", "-language:postfixOps"),
-      libraryDependencies ++= Seq(
-        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.1.201406201815-r",
-        "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.1.201406201815-r",
-        "org.scalatra" %% "scalatra" % ScalatraVersion,
-        "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
-        "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-        "org.json4s" %% "json4s-jackson" % "3.2.10",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
-        "commons-io" % "commons-io" % "2.4",
-        "org.pegdown" % "pegdown" % "1.4.1",
-        "org.apache.commons" % "commons-compress" % "1.5",
-        "org.apache.commons" % "commons-email" % "1.3.1",
-        "org.apache.httpcomponents" % "httpclient" % "4.3",
-        "org.apache.sshd" % "apache-sshd" % "0.11.0",
-        "com.typesafe.slick" %% "slick" % "2.1.0-RC3",
-        "com.novell.ldap" % "jldap" % "2009-10-07",
-        "org.quartz-scheduler" % "quartz" % "2.2.1",
-        "com.h2database" % "h2" % "1.4.180",
-        "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
-        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
-        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
-        "junit" % "junit" % "4.11" % "test"
-      ),
-      EclipseKeys.withSource := true,
-      javacOptions in compile ++= Seq("-target", "6", "-source", "6"),
-      testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
-      packageOptions += Package.MainClass("JettyLauncher")
-    ) ++ seq(Twirl.settings: _*)
+    file(".")
  )
+  .settings(ScalatraPlugin.scalatraWithJRebel: _*)
+  .settings(
+    sourcesInBase := false,
+    organization := Organization,
+    name := Name,
+    version := Version,
+    scalaVersion := ScalaVersion,
+    resolvers ++= Seq(
+      Classpaths.typesafeReleases,
+      "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
+    ),
+    scalacOptions := Seq("-deprecation", "-language:postfixOps"),
+    libraryDependencies ++= Seq(
+      "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.1.201406201815-r",
+      "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.1.201406201815-r",
+      "org.scalatra" %% "scalatra" % ScalatraVersion,
+      "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
+      "org.scalatra" %% "scalatra-json" % ScalatraVersion,
+      "org.json4s" %% "json4s-jackson" % "3.2.10",
+      "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
+      "commons-io" % "commons-io" % "2.4",
+      "org.pegdown" % "pegdown" % "1.4.1",
+      "org.apache.commons" % "commons-compress" % "1.5",
+      "org.apache.commons" % "commons-email" % "1.3.1",
+      "org.apache.httpcomponents" % "httpclient" % "4.3",
+      "org.apache.sshd" % "apache-sshd" % "0.11.0",
+      "com.typesafe.slick" %% "slick" % "2.1.0-RC3",
+      "com.novell.ldap" % "jldap" % "2009-10-07",
+      "org.quartz-scheduler" % "quartz" % "2.2.1",
+      "com.h2database" % "h2" % "1.4.180",
+      "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
+      "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
+      "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
+      "junit" % "junit" % "4.11" % "test",
+      "com.typesafe.play" %% "twirl-compiler" % "1.0.2"
+    ),
+    EclipseKeys.withSource := true,
+    javacOptions in compile ++= Seq("-target", "6", "-source", "6"),
+    testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
+    packageOptions += Package.MainClass("JettyLauncher")
+  ).enablePlugins(SbtTwirl)
 }
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,8 +4,6 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

 addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")

-resolvers += "spray repo" at "http://repo.spray.io"
-
-addSbtPlugin("io.spray" % "sbt-twirl" % "0.7.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2")

 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.4")
--- a/sbt-launch-0.13.5.jar
+++ b/sbt-launch-0.13.5.jar
--- a/sbt.bat
+++ b/sbt.bat
@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.1.jar" %*
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.5.jar" %*
--- a/sbt.sh
+++ b/sbt.sh
@@ -1 +1 @@
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.1.jar "$@"
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.5.jar "$@"
--- a/src/main/scala/plugin/ScalaPlugin.scala
+++ b/src/main/scala/plugin/ScalaPlugin.scala
@@ -10,6 +10,7 @@ import plugin.Security._
 import service.RepositoryService.RepositoryInfo
 import scala.reflect.runtime.currentMirror
 import scala.tools.reflect.ToolBox
+import play.twirl.compiler.TwirlCompiler

 // TODO This is a sample implementation for Scala based plug-ins.
 class ScalaPlugin(val id: String, val version: String,
@@ -49,7 +50,7 @@ class ScalaPlugin(val id: String, val version: String,

 }

-object ScalaPlugin {
+object ScalaPlugin extends App {

  def define(id: String, version: String, author: String, url: String, description: String)
    = new ScalaPlugin(id, version, author, url, description)
@@ -60,4 +61,23 @@ object ScalaPlugin {
    toolbox.eval(tree)
  }

+  def compileTemplate(source: String) = {
+    val result = TwirlCompiler.compileVirtual(source,
+      new java.io.File("./sample.scala.html"),
+      new java.io.File("."),
+      "twirl.api.HtmlFormat.Appendable",
+      "twirl.api.HtmlFormat")
+
+    println(result.content)
+  }
+
+    compileTemplate(
+      """@(value: String)
+        | <html>@value</html>
+        | """.stripMargin)
+
+  compileTemplate(
+    """@(value: String)
+      | <b>@value</b>
+      | """.stripMargin)
 }
--- a/src/main/scala/servlet/PluginActionInvokeFilter.scala
+++ b/src/main/scala/servlet/PluginActionInvokeFilter.scala
@@ -3,7 +3,7 @@ package servlet
 import javax.servlet._
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import org.apache.commons.io.IOUtils
-import twirl.api.Html
+import play.twirl.api.Html
 import service.{AccountService, RepositoryService, SystemSettingsService}
 import model.{Account, Session}
 import util.{JGitUtil, Keys}
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -1,7 +1,7 @@
 package view

 import service.RequestCache
-import twirl.api.Html
+import play.twirl.api.Html
 import util.StringUtil

 trait AvatarImageProvider { self: RequestCache =>
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -1,7 +1,7 @@
 package view
 import java.util.Date
 import java.text.SimpleDateFormat
-import twirl.api.Html
+import play.twirl.api.Html
 import util.StringUtil
 import service.RequestCache

--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -1,4 +1,4 @@
-@(listparts: twirl.api.Html,
+@(listparts: play.twirl.api.Html,
  allCount: Int,
  assignedCount: Int,
  createdByCount: Int,
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ b/src/main/twirl/dashboard/pulls.scala.html
@@ -1,4 +1,4 @@
-@(listparts: twirl.api.Html,
+@(listparts: play.twirl.api.Html,
  counts: List[service.PullRequestService.PullRequestCount],
  repositories: List[(String, String, Int)],
  condition: service.IssuesService.IssueSearchCondition,