Skip to content

Commit a052762

Browse files
pvlugterpvlugter
committed
Merge pull request scala-ide#5 from pvlugter/play-package
Move to play.twirl package
2 parents d2d745b + 67b070d commit a052762

File tree

24 files changed

+48
-48
lines changed

24 files changed

+48
-48
lines changed

Diff for: ‎api/src/main/scala-2.10/twirl/api/ScalaCompat.scala renamed to ‎api/src/main/scala-2.10/play/twirl/api/ScalaCompat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
/**
77
* Cross scala version compatibility.

Diff for: ‎api/src/main/scala-2.9.3/twirl/api/ScalaCompat.scala renamed to ‎api/src/main/scala-2.9.3/play/twirl/api/ScalaCompat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
/**
77
* Cross scala version compatibility.

Diff for: ‎api/src/main/scala/twirl/api/BaseScalaTemplate.scala renamed to ‎api/src/main/scala/play/twirl/api/BaseScalaTemplate.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
import scala.collection.immutable
77

@@ -16,7 +16,7 @@ case class BaseScalaTemplate[T <: Appendable[T], F <: Format[T]](format: F) {
1616
def _display_(x: T): T = x
1717

1818
def _display_(o: Any)(implicit m: Manifest[T]): T = {
19-
import twirl.api.ScalaCompat._ // for Manifest.runtimeClass
19+
import play.twirl.api.ScalaCompat._ // for Manifest.runtimeClass
2020
o match {
2121
case escaped if escaped != null && escaped.getClass == m.runtimeClass => escaped.asInstanceOf[T]
2222
case () => format.empty

Diff for: ‎api/src/main/scala/twirl/api/Content.scala renamed to ‎api/src/main/scala/play/twirl/api/Content.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
import scala.collection.immutable
77

Diff for: ‎api/src/main/scala/twirl/api/Format.scala renamed to ‎api/src/main/scala/play/twirl/api/Format.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
import scala.collection.immutable
77

Diff for: ‎api/src/main/scala/twirl/api/Formats.scala renamed to ‎api/src/main/scala/play/twirl/api/Formats.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
import org.apache.commons.lang3.StringEscapeUtils
77
import scala.collection.immutable

Diff for: ‎api/src/main/scala/twirl/api/Template.scala renamed to ‎api/src/main/scala/play/twirl/api/Template.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
trait Template0[Result] {
77
def render(): Result

Diff for: ‎api/src/main/scala/twirl/api/TemplateMagic.scala renamed to ‎api/src/main/scala/play/twirl/api/TemplateMagic.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
import scala.language.implicitConversions
77

Diff for: ‎build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ lazy val plugin = project
5353
// Shared settings
5454

5555
def common = Seq(
56-
organization := "com.typesafe.twirl",
56+
organization := "com.typesafe.play",
5757
version := "1.0-SNAPSHOT",
5858
scalaVersion := "2.10.4",
5959
scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8")

Diff for: ‎compiler/src/main/scala/twirl/compiler/TwirlCompiler.scala renamed to ‎compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.compiler
4+
package play.twirl.compiler
55

66
import java.io.File
77
import scala.annotation.tailrec
88
import scala.io.Codec
99
import scala.reflect.internal.Flags
1010
import scalax.file._
11-
import twirl.parser.{ PlayTwirlParser, TwirlParser }
11+
import play.twirl.parser.{ PlayTwirlParser, TwirlParser }
1212

1313
object Hash {
1414

@@ -151,7 +151,7 @@ case class GeneratedSourceVirtual(path: String) extends AbstractGeneratedSource
151151
}
152152

153153
object TwirlCompiler {
154-
import twirl.parser.TreeNodes._
154+
import play.twirl.parser.TreeNodes._
155155

156156
val UTF8 = Codec("UTF-8")
157157

@@ -310,8 +310,8 @@ object TwirlCompiler {
310310
Nil :+ """
311311
package """ :+ packageName :+ """
312312
313-
import twirl.api._
314-
import twirl.api.TemplateMagic._
313+
import play.twirl.api._
314+
import play.twirl.api.TemplateMagic._
315315
316316
""" :+ additionalImports :+ """
317317
/*""" :+ root.comment.map(_.msg).getOrElse("") :+ """*/
@@ -403,7 +403,7 @@ object """ :+ name :+ """ extends BaseScalaTemplate[""" :+ resultType :+ """,For
403403
p.name.toString + Option(p.tpt.toString).filter(_.startsWith("_root_.scala.<repeated>")).map(_ => ":_*").getOrElse("")
404404
}.mkString(",") + ")").mkString)
405405

406-
val templateType = "twirl.api.Template%s[%s%s]".format(
406+
val templateType = "play.twirl.api.Template%s[%s%s]".format(
407407
params.flatten.size,
408408
params.flatten.map {
409409
case ByNameParam(_, paramType) => paramType

Diff for: ‎compiler/src/test/scala/twirl/compiler/test/Benchmark.scala renamed to ‎compiler/src/test/scala/play/twirl/compiler/test/Benchmark.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package twirl.compiler.test
1+
package play.twirl.compiler.test
22

3-
import twirl.api.Html
4-
import twirl.compiler.test.Helper.CompilerHelper
53
import java.io.File
4+
import play.twirl.api.Html
5+
import play.twirl.compiler.test.Helper.CompilerHelper
66

77
/**
88
* Easiest way to run this:
99
*
10-
* sbt compiler/test:runMain twirl.compiler.test.Benchmark
10+
* sbt compiler/test:runMain play.twirl.compiler.test.Benchmark
1111
*/
1212
object Benchmark extends App {
1313

Diff for: ‎compiler/src/test/scala/twirl/compiler/test/CompilerSpec.scala renamed to ‎compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.compiler
4+
package play.twirl.compiler
55
package test
66

77
import java.io._
88
import org.specs2.mutable._
9-
import twirl.api.Html
9+
import play.twirl.api.Html
1010

1111
object CompilerSpec extends Specification {
1212

@@ -129,15 +129,15 @@ object Helper {
129129

130130
val twirlCompiler = TwirlCompiler
131131

132-
val classloader = new URLClassLoader(Array(generatedClasses.toURI.toURL), Class.forName("twirl.compiler.TwirlCompiler").getClassLoader)
132+
val classloader = new URLClassLoader(Array(generatedClasses.toURI.toURL), Class.forName("play.twirl.compiler.TwirlCompiler").getClassLoader)
133133

134134
// A list of the compile errors from the most recent compiler run
135135
val compileErrors = new mutable.ListBuffer[CompilationError]
136136

137137
val compiler = {
138138

139139
def additionalClassPathEntry: Option[String] = Some(
140-
Class.forName("twirl.compiler.TwirlCompiler").getClassLoader.asInstanceOf[URLClassLoader].getURLs.map(_.getFile).mkString(":"))
140+
Class.forName("play.twirl.compiler.TwirlCompiler").getClassLoader.asInstanceOf[URLClassLoader].getURLs.map(_.getFile).mkString(":"))
141141

142142
val settings = new Settings
143143
val scalaObjectSource = Class.forName("scala.ScalaObject").getProtectionDomain.getCodeSource
@@ -163,7 +163,7 @@ object Helper {
163163

164164
def compile[T](templateName: String, className: String): T = {
165165
val templateFile = new File(sourceDir, templateName)
166-
val Some(generated) = twirlCompiler.compile(templateFile, sourceDir, generatedDir, "twirl.api.HtmlFormat")
166+
val Some(generated) = twirlCompiler.compile(templateFile, sourceDir, generatedDir, "play.twirl.api.HtmlFormat")
167167

168168
val mapper = GeneratedSource(generated)
169169

Diff for: ‎compiler/src/test/scala/twirl/compiler/test/TemplateUtilsSpec.scala renamed to ‎compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.compiler
4+
package play.twirl.compiler
55
package test
66

77
import org.specs2.mutable._
8-
import twirl.api._
8+
import play.twirl.api._
99
import scala.collection.immutable
1010

1111
object TemplateUtilsSpec extends Specification {

Diff for: ‎parser/src/main/scala-2.10/twirl/api/ScalaCompat.scala renamed to ‎parser/src/main/scala-2.10/play/twirl/api/ScalaCompat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
/**
77
* Cross scala version compatibility.

Diff for: ‎parser/src/main/scala-2.9.3/twirl/api/ScalaCompat.scala renamed to ‎parser/src/main/scala-2.9.3/play/twirl/api/ScalaCompat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.api
4+
package play.twirl.api
55

66
/**
77
* Cross scala version compatibility.

Diff for: ‎parser/src/main/scala/twirl/parser/PlayTwirlParser.scala renamed to ‎parser/src/main/scala/play/twirl/parser/PlayTwirlParser.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.parser
4+
package play.twirl.parser
55

66
import scala.annotation.tailrec
77
import scala.language.postfixOps
88
import scala.util.parsing.combinator.JavaTokenParsers
99
import scala.util.parsing.input.CharSequenceReader
1010
import scala.util.parsing.input.OffsetPosition
11-
import twirl.parser.TreeNodes._
11+
import play.twirl.parser.TreeNodes._
1212

1313
class PlayTwirlParser extends JavaTokenParsers {
1414

Diff for: ‎parser/src/main/scala/twirl/parser/TreeNodes.scala renamed to ‎parser/src/main/scala/play/twirl/parser/TreeNodes.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.parser
4+
package play.twirl.parser
55

66
import scala.util.parsing.input.Positional
77

Diff for: ‎parser/src/main/scala/twirl/parser/TwirlParser.scala renamed to ‎parser/src/main/scala/play/twirl/parser/TwirlParser.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.parser
4+
package play.twirl.parser
55

66
import scala.collection.mutable.ArrayBuffer
77
import scala.util.parsing.input.OffsetPosition
@@ -94,7 +94,7 @@ import scala.annotation.elidable._
9494

9595
class TwirlParser(val shouldParseInclusiveDot: Boolean) {
9696

97-
import twirl.parser.TreeNodes._
97+
import play.twirl.parser.TreeNodes._
9898
import scala.util.parsing.input.Positional
9999

100100
sealed abstract class ParseResult
@@ -303,7 +303,7 @@ class TwirlParser(val shouldParseInclusiveDot: Boolean) {
303303

304304
/** Match zero or more `parser` */
305305
def several[T, BufferType <: Buffer[T]](parser: () => T, provided: BufferType = null)(implicit manifest: Manifest[BufferType]): BufferType = {
306-
import twirl.api.ScalaCompat._ // for Manifest.runtimeClass
306+
import play.twirl.api.ScalaCompat._ // for Manifest.runtimeClass
307307
val ab = if (provided != null) provided else manifest.runtimeClass.newInstance().asInstanceOf[BufferType]
308308
var parsed = parser()
309309
while (parsed != null) {

Diff for: ‎parser/src/test/scala/twirl/parser/test/ParserSpec.scala renamed to ‎parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.parser
4+
package play.twirl.parser
55
package test
66

77
import org.specs2.mutable._

Diff for: ‎sbt-twirl/src/main/scala/twirl/sbt/SbtTwirl.scala renamed to ‎sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.sbt
4+
package play.twirl.sbt
55

66
import sbt._
77
import sbt.Keys._
@@ -60,14 +60,14 @@ object SbtTwirl extends AutoPlugin {
6060

6161
def dependencySettings: Seq[Setting[_]] = Seq(
6262
twirlVersion := readResourceProperty("twirl.version.properties", "twirl.api.version"),
63-
libraryDependencies += "com.typesafe.twirl" %% "twirl-api" % twirlVersion.value
63+
libraryDependencies += "com.typesafe.play" %% "twirl-api" % twirlVersion.value
6464
)
6565

6666
def defaultFormats = Map(
67-
"html" -> "twirl.api.HtmlFormat",
68-
"txt" -> "twirl.api.TxtFormat",
69-
"xml" -> "twirl.api.XmlFormat",
70-
"js" -> "twirl.api.JavaScriptFormat"
67+
"html" -> "play.twirl.api.HtmlFormat",
68+
"txt" -> "play.twirl.api.TxtFormat",
69+
"xml" -> "play.twirl.api.XmlFormat",
70+
"js" -> "play.twirl.api.JavaScriptFormat"
7171
)
7272

7373
def compileTemplatesTask = Def.task {

Diff for: ‎sbt-twirl/src/main/scala/twirl/sbt/TemplateCompiler.scala renamed to ‎sbt-twirl/src/main/scala/play/twirl/sbt/TemplateCompiler.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.sbt
4+
package play.twirl.sbt
55

66
import java.io.File
77
import sbt._
8-
import twirl.compiler._
8+
import play.twirl.compiler._
99

1010
object TemplateCompiler {
1111
def compile(sourceDirectories: Seq[File], targetDirectory: File, templateFormats: Map[String, String], templateImports: Seq[String], includeFilter: FileFilter, excludeFilter: FileFilter, log: Logger) = {

Diff for: ‎sbt-twirl/src/main/scala/twirl/sbt/TemplateProblem.scala renamed to ‎sbt-twirl/src/main/scala/play/twirl/sbt/TemplateProblem.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*
22
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
33
*/
4-
package twirl.sbt
4+
package play.twirl.sbt
55

66
import sbt._
7-
import twirl.compiler.{ GeneratedSource, MaybeGeneratedSource }
7+
import play.twirl.compiler.{ GeneratedSource, MaybeGeneratedSource }
88
import xsbti.{ CompileFailed, Maybe, Position, Problem, Severity }
99

1010
object TemplateProblem {

Diff for: ‎sbt-twirl/src/sbt-test/scala/2.9/src/test/scala/test/Test.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test
22

3-
import twirl.api._
3+
import play.twirl.api._
44

55
object Test extends App {
66
def test(template: HtmlFormat.Appendable, expected: String) = {

Diff for: ‎sbt-twirl/src/sbt-test/twirl/compile/src/test/scala/test/Test.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test
22

3-
import twirl.api._
3+
import play.twirl.api._
44

55
object Test extends App {
66
def test(template: HtmlFormat.Appendable, expected: String) = {

0 commit comments

Comments
 (0)