Author: cziegeler
Date: Wed Mar 31 12:20:18 2010
New Revision: 929497
URL: http://svn.apache.org/viewvc?rev=929497&view=rev
Log:
SLING-1468 : Scala scrip engine: rename bindings wrapper from ...Vars to
...Args - apply patch from Michael Dürig
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/POST.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/html.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/search.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/thread.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/POSTVars.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/Test.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/htmlVars.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/searchVars.scala
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/threadVars.scala
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/resources/content/apps/helloworld/html.scala
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/scala/helloworld/htmlVars.scala
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/POST.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/POST.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/POST.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/POST.scala
Wed Mar 31 12:20:18 2010
@@ -16,7 +16,7 @@
*/
package forum {
-class POST(vars: POSTVars) {
+class POST(args: POSTArgs) {
import java.util.Date
import java.io.ByteArrayInputStream
import java.util.Calendar
@@ -24,7 +24,7 @@ class POST(vars: POSTVars) {
import javax.jcr.Node
import org.apache.sling.api.resource.ResourceUtil
import utils.RichJCR._
- import vars._
+ import args._
/**
* Add a child node inclusive all intermediate nodes to a node
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/html.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/html.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/html.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/html.scala
Wed Mar 31 12:20:18 2010
@@ -206,11 +206,11 @@ object ThreadOverview {
}
-class html(vars: htmlVars) {
+class html(args: htmlArgs) {
import java.util.Calendar
import javax.jcr.Node
import utils.RichJCR._
- import vars._
+ import args._
val node: Node = currentNode
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/search.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/search.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/search.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/search.scala
Wed Mar 31 12:20:18 2010
@@ -16,10 +16,10 @@
*/
package forum {
-class search(vars: searchVars) {
+class search(args: searchArgs) {
import javax.jcr.Node
import utils.RichJCR._
- import vars._
+ import args._
def javascript(function: String, args: String*) =
args.mkString("javascript:" + function + "('", "', '", "')")
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/thread.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/thread.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/thread.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/resources/content/apps/forum/thread.scala
Wed Mar 31 12:20:18 2010
@@ -16,13 +16,13 @@
*/
package forum {
-class thread(vars: threadVars) {
+class thread(args: threadArgs) {
import scala.xml.NodeSeq
import scala.xml.NodeSeq.Empty
import javax.jcr.Node
import utils._
import utils.RichJCR._
- import vars._
+ import args._
def javascript(function: String, args: String*) =
args.mkString("javascript:" + function + "('", "', '", "')")
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/POSTVars.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/POSTVars.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/POSTVars.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/POSTVars.scala
Wed Mar 31 12:20:18 2010
@@ -16,4 +16,4 @@
*/
package forum
-class POSTVars extends MockBindings
+class POSTArgs extends MockBindings
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/Test.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/Test.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/Test.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/Test.scala
Wed Mar 31 12:20:18 2010
@@ -17,5 +17,5 @@
package forum
object Test extends Application {
- new forum.html(new htmlVars)
+ new forum.html(new htmlArgs)
}
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/htmlVars.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/htmlVars.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/htmlVars.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/htmlVars.scala
Wed Mar 31 12:20:18 2010
@@ -19,7 +19,7 @@ package forum
import slingscala.jcr.{MockNode, MockItem, MockSlingHttpServletRequest,
MockHttpServletRequest, MockServletRequest}
-class htmlVars extends MockBindings {
+class htmlArgs extends MockBindings {
override def currentNode = new MockNode with MockItem
override def request = new MockSlingHttpServletRequest with
MockHttpServletRequest with MockServletRequest
}
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/searchVars.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/searchVars.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/searchVars.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/searchVars.scala
Wed Mar 31 12:20:18 2010
@@ -16,4 +16,4 @@
*/
package forum
-class searchVars extends MockBindings
\ No newline at end of file
+class searchArgs extends MockBindings
\ No newline at end of file
Modified:
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/threadVars.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/threadVars.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/threadVars.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/forum/src/main/scala/forum/threadVars.scala
Wed Mar 31 12:20:18 2010
@@ -16,4 +16,4 @@
*/
package forum
-class threadVars extends MockBindings
+class threadArgs extends MockBindings
Modified:
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/resources/content/apps/helloworld/html.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/resources/content/apps/helloworld/html.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/resources/content/apps/helloworld/html.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/resources/content/apps/helloworld/html.scala
Wed Mar 31 12:20:18 2010
@@ -16,7 +16,7 @@
*/
package helloworld {
-class html(vars: htmlVars) {
+class html(args: htmlArgs) {
import scala.xml.NodeSeq
import java.util.Calendar
import javax.jcr.Node
@@ -49,7 +49,7 @@ class html(vars: htmlVars) {
}
- import vars._
+ import args._
val node: Node = currentNode
Modified:
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/scala/helloworld/htmlVars.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/scala/helloworld/htmlVars.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/scala/helloworld/htmlVars.scala
(original)
+++
sling/trunk/contrib/scripting/scala/samples/hello-world/src/main/scala/helloworld/htmlVars.scala
Wed Mar 31 12:20:18 2010
@@ -16,7 +16,7 @@
*/
package helloworld
-class htmlVars {
+class htmlArgs {
val currentNode: javax.jcr.Node = null
val resource: org.apache.sling.api.adapter.Adaptable = null
}
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngine.scala
Wed Mar 31 12:20:18 2010
@@ -40,8 +40,8 @@ object ScalaScriptEngine {
*
* <pre>
* package my.cool.script
- * class foo(vars: fooVars) {
- * import vars._ // import the bindings
+ * class foo(args: fooArgs) {
+ * import args._ // import the bindings
*
* println("bar:" + bar)
* }
@@ -50,14 +50,14 @@ object ScalaScriptEngine {
* Here it is assumed that the {...@bindings} passed for script evaluation
contains a
* value for the name <em>bar</em>.
*
- * The parameter <code>vars</code> contains statically typed bindings
generated from the
+ * The parameter <code>args</code> contains statically typed bindings
generated from the
* <code>Bindings</code> passed to the script engine. The individual values in
- * <code>vars</code> appear to be of all visible types. This is achieved using
implicit
+ * <code>args</code> appear to be of all visible types. This is achieved using
implicit
* conversion when necessary: for a value v of type T let S be the smallest
super type of T
* which is accessible (i.e. class loading succeeds). Then v is exposed with
static type
- * S in <code>vars</code>. Let further be J the set of interface implemented
by T which
+ * S in <code>args</code>. Let further be J the set of interface implemented
by T which
* are not implemented by S already. For each interface I in J which has no
super type
- * I' of I in J an implicit conversion from S to I is included in
<code>vars</code>.
+ * I' of I in J an implicit conversion from S to I is included in
<code>args</code>.
*/
class ScalaScriptEngine(factory: ScalaScriptEngineFactory, scriptInfo:
ScriptInfo)
extends AbstractScriptEngine {
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactory.scala
Wed Mar 31 12:20:18 2010
@@ -109,7 +109,7 @@ class ScalaScriptEngineFactory extends S
val className = classOf(qClassName);
"package " + packageName + " {" + NL +
- " class " + className + "(vars: " + className + "Vars) {" + NL +
+ " class " + className + "(args: " + className + "Args) {" + NL +
statements.mkString(NL) +
" }" + NL +
"}" + NL;
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/ScalaInterpreter.scala
Wed Mar 31 12:20:18 2010
@@ -125,7 +125,7 @@ class ScalaInterpreter(settings: Setting
code + NL +
packageDeclaration + " {" + NL +
- " class " + className + "Vars(bindings:
org.apache.sling.scripting.scala.interpreter.Bindings) { " + NL +
+ " class " + className + "Args(bindings:
org.apache.sling.scripting.scala.interpreter.Bindings) { " + NL +
bindings.map(bind).mkString(NL) + NL +
" } " + NL +
" object " + className + "Runner {" + NL +
@@ -134,7 +134,7 @@ class ScalaInterpreter(settings: Setting
" stdOut: java.io.OutputStream) {" + NL +
" Console.withIn(stdIn) {" + NL +
" Console.withOut(stdOut) {" + NL +
- " new " + className + "(new " + className + "Vars(bindings))" +
NL +
+ " new " + className + "(new " + className + "Args(bindings))" +
NL +
" stdOut.flush" + NL +
" }" + NL +
" }" + NL +
Modified:
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/InterpreterWithJcrTest.scala
Wed Mar 31 12:20:18 2010
@@ -66,7 +66,7 @@ class InterpreterWithJcrTest extends Tes
}
def testNodeAccess() {
- val code = "package a { class Testi(vars: TestiVars) { import vars._;
print(n.getPath)}}"
+ val code = "package a { class Testi(args: TestiArgs) { import args._;
print(n.getPath)}}"
val bindings = Bindings()
bindings.putValue("n", workNode)
assertEquals(workNode.getPath, interpreterHelper.eval("a.Testi", code,
bindings))
Modified:
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala?rev=929497&r1=929496&r2=929497&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/interpreter/Tests.scala
Wed Mar 31 12:20:18 2010
@@ -29,7 +29,7 @@ trait Tests {
var interpreterHelper: InterpreterHelper
def testEvalString {
- val code = "package a { class Testi(vars: TestiVars) { print(1 + 2) }}"
+ val code = "package a { class Testi(args: TestiArgs) { print(1 + 2) }}"
assertEquals("3", interpreterHelper.eval("a.Testi", code, Bindings()))
}
@@ -46,7 +46,7 @@ trait Tests {
def testError {
val err = "Some error here";
- val code = "package a { class Testi(vars: TestiVars) { throw new Error(\""
+ err + "\") }}"
+ val code = "package a { class Testi(args: TestiArgs) { throw new Error(\""
+ err + "\") }}"
try {
interpreterHelper.eval("a.Testi", code, Bindings())
fail("Expecting Exception")
@@ -61,7 +61,7 @@ trait Tests {
val time = java.util.Calendar.getInstance.getTime
bindings.putValue("msg", "Hello world")
bindings.putValue("time", time)
- val code = "package a { class Testi(vars: TestiVars) {import vars._;
print(msg + \": \" + time)}}"
+ val code = "package a { class Testi(args: TestiArgs) {import args._;
print(msg + \": \" + time)}}"
val result = interpreterHelper.eval("a.Testi", code, bindings)
assertEquals("Hello world: " + time, result)
}
@@ -75,7 +75,7 @@ trait Tests {
bindings.putValue("msg", "Hello world")
bindings.putValue("time", time)
- val code = "package a { class Testi(vars: TestiVars) {import vars._;
print(msg + \": \" + time)}}"
+ val code = "package a { class Testi(args: TestiArgs) {import args._;
print(msg + \": \" + time)}}"
val src = srcDir.fileNamed("Testi.scala")
val writer = new PrintWriter(src.output)
writer.print(code)
@@ -83,7 +83,9 @@ trait Tests {
val out = new java.io.ByteArrayOutputStream
var result = interpreter.compile("a.Testi", src, bindings)
- assertFalse(result.hasErrors)
+ if (result.hasErrors) {
+ fail(result.toString)
+ }
result = interpreter.execute("a.Testi", bindings, None, Some(out))
assertFalse(result.hasErrors)
