playframework · McDamon · May 22, 2013 · May 24, 2013 · Jul 9, 2013
diff --git a/dust/README.md b/dust/README.md
@@ -1,27 +1,21 @@
 # Dust Plugin
 
-This plugin provides build time compilation for [Dust](https://github.com/akdubya/dustjs) templates.
-
-
+This plugin provides build time compilation for the LinkedIn fork of [Dust](https://github.com/linkedin/dustjs) templates.
 
 # How to install
 
 * add 
 
-play 2.0.2:
-
-```addSbtPlugin("com.typesafe" % "play-plugins-dust" % "1.4")```
+play 2.1:
 
-play 2.0.1:
-
-```addSbtPlugin("com.typesafe" % "play-plugins-dust" % "1.0-SNAPSHOT")``` 
+```addSbtPlugin("com.typesafe" % "play-plugins-dust" % "1.5")```
 
 to your plugin.sbt
 
 # How to Use
 
-* Include dust. Note that this is not provided by the sbt plugin. It can be found here: [dust-core-0.6.0.min.js](https://raw.github.com/typesafehub/play-plugins/master/dust/sample/public/javascripts/dust-core-0.6.0.min.js) 
-```<script src="@routes.Assets.at("javascripts/dust-core-0.6.0.min.js")"></script>
+* Include dust. Note that this is not provided by the sbt plugin. It can be found here: [dust-core-1.2.3.min.js](https://raw.github.com/typesafehub/play-plugins/master/dust/sample/public/javascripts/dust-core-1.2.3.min.js) 
+```<script src="@routes.Assets.at("javascripts/dust-core-1.2.3.min.js")"></script>
 ```
 
 * Put your dust template .tl files under the ```app/assets``` directory
@@ -41,10 +35,27 @@ to your plugin.sbt
   });
 ```
 
+# Settings
+
+## dustOutputRelativePath
+
+Specify path relative to public assets folder to place compiled javascript templates.
+
+Example:
+
+    DustPlugin.dustOutputRelativePath := "javascripts/templates/"
+
+## dustNativePath
+
+Elect to use a native Dust.js compiler (via Node) if installed.
+
+Example:
+
+    DustPlugin.dustNativePath := Some("/usr/local/shared/npm/bin/dustc")
 
 # Sample
 
-For an example, see the bundled sample app
+For an example, see the bundled sample app.
 
 ## Licence
 

diff --git a/dust/build.sbt b/dust/build.sbt
@@ -4,19 +4,15 @@ sbtPlugin := true
 
 name := "play-plugins-dust"
 
-version := "1.4.1-09122012"
+version := "1.5"
 
 organization := "com.typesafe"
 
-resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+scalacOptions ++= Seq("-deprecation")
 
-libraryDependencies <++= (scalaVersion) { 
-	case (scalaVersion) => Seq(
-		sbtPluginExtra("play" % "sbt-plugin" % "2.1-09092012" % "provided", "0.12", scalaVersion)
-	)
-}
+addSbtPlugin("play" % "sbt-plugin" % "2.1-PRODUCTDEV")
 
-libraryDependencies += "commons-io" % "commons-io" % "2.2"
+libraryDependencies += "commons-io" % "commons-io" % "2.4"
 
 libraryDependencies += "org.specs2" %% "specs2" % "1.12.3" % "test"
 

diff --git a/dust/project/build.properties b/dust/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.0
+sbt.version=0.12.4
diff --git a/dust/project/plugins.sbt b/dust/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
diff --git a/dust/sample/app/controllers/Application.java b/dust/sample/app/controllers/Application.java
diff --git a/dust/sample/app/controllers/Application.scala b/dust/sample/app/controllers/Application.scala
@@ -0,0 +1,21 @@
+package controllers;
+
+import play.api.mvc._
+import play.api.libs.json._
+
+import views.html._
+
+object Application extends Controller {
+  def frame = Action {
+    Ok(index.render());
+  }
+
+  def data() = Action {
+	val json = Json.obj(
+	  "name" -> "Json",
+	  "count" -> 1
+	)
+
+	Ok(json);
+  }
+}
diff --git a/dust/sample/app/views/index.scala.html b/dust/sample/app/views/index.scala.html
@@ -6,8 +6,8 @@
 <html>
     <head>
         <title>Test</title>
-        <script src="@routes.Assets.at("javascripts/jquery-1.7.1.min.js")"></script>
-        <script src="@routes.Assets.at("javascripts/dust-core-0.6.0.min.js")"></script>
+        <script src="@routes.Assets.at("javascripts/jquery-1.9.1.min.js")"></script>
+        <script src="@routes.Assets.at("javascripts/dust-core-1.2.3.min.js")"></script>
         <script src="@routes.Assets.at("example.js")"></script>
         <script>
   $(function() {

diff --git a/dust/sample/build.sbt b/dust/sample/build.sbt
@@ -1 +1,3 @@
+com.typesafe.plugin.DustPlugin.defaultSettings
+
 name := "dust-sample"
diff --git a/dust/sample/conf/application.conf b/dust/sample/conf/application.conf
@@ -54,9 +54,3 @@ logger.play=INFO
 
 # Logger provided to your application:
 logger.application=DEBUG
-
-# Static conf
-static.lib.root = "/Users/bguan/p/content/static/lib"
-static.js.root = "/Users/bguan/p/content/static/js"
-static.tl.root = "/Users/bguan/p/content/static/tl"
-app.root = ""
diff --git a/dust/sample/project/Build.scala b/dust/sample/project/Build.scala
@@ -1,19 +1,13 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
-
     val appName         = "play-plugins-dust-sample"
-    val appVersion      = "1.0-SNAPSHOT"
-
-    val appDependencies = Seq(
-      // Add your project dependencies here,
-    )
-
-    val main = PlayProject(appName, appVersion, appDependencies, mainLang = JAVA).settings(
-
-    )
+    val appVersion      = "1.5"
+
 
+    val appDependencies = Seq()
 
+    val main = play.Project(appName, appVersion, appDependencies).settings()
 }
diff --git a/dust/sample/project/build.properties b/dust/sample/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.3
diff --git a/dust/sample/project/plugins.sbt b/dust/sample/project/plugins.sbt
@@ -8,6 +8,7 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
 resolvers += Resolver.url("Typesafe Ivy Snapshots Repository", url("http://repo.typesafe.com/typesafe/ivy-snapshots/"))(Resolver.ivyStylePatterns)
 
 // The Dust plugin
-addSbtPlugin("com.typesafe" % "play-plugins-dust" % "1.4.1")
+addSbtPlugin("com.typesafe" % "play-plugins-dust" % "1.5")
 
 // Use the Play sbt plugin for Play projects
+addSbtPlugin("play" % "sbt-plugin" % "2.1.1")
diff --git a/dust/sample/public/javascripts/dust-core-0.3.0.min.js b/dust/sample/public/javascripts/dust-core-0.3.0.min.js
diff --git a/dust/sample/public/javascripts/dust-core-0.6.0.min.js b/dust/sample/public/javascripts/dust-core-0.6.0.min.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		com.typesafe.plugin.DustPlugin.defaultSettings

		name := "dust-sample"