Author: cziegeler
Date: Wed Feb 24 08:20:48 2010
New Revision: 915719
URL: http://svn.apache.org/viewvc?rev=915719&view=rev
Log:
SLING-1399 : Not possible to build /contrib since
ScalaScriptEngineFactory.scala in /scripting/scala/script contains an error
Applied patch from Pontus Amberg and Michael Dürig
Modified:
sling/trunk/contrib/scripting/scala/script/pom.xml
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
Modified: sling/trunk/contrib/scripting/scala/script/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=915719&r1=915718&r2=915719&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Wed Feb 24 08:20:48 2010
@@ -145,9 +145,9 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>3.0-beta2</version>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <version>2.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
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=915719&r1=915718&r2=915719&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 Feb 24 08:20:48 2010
@@ -99,15 +99,12 @@
try {
val bindings = context.getBindings(ScriptContext.ENGINE_SCOPE)
val scalaBindings = ScalaBindings()
-
+
import _root_.scala.collection.jcl.Conversions._
- for (val key <- bindings.keySet) key match {
- case name: String => {
- val value = bindings.get(name)
- if (value == null) log.debug("{} has null value. skipping", name)
- else scalaBindings.putValue(makeIdentifier(name), value)
- }
- case x => log.debug("Bindings contain invalid key {}. skipping", x)
+ for (val key <- bindings.keySet) {
+ val value = bindings.get(key)
+ if (value == null) log.debug("{} has null value. skipping", key)
+ else scalaBindings.putValue(makeIdentifier(key), value)
}
val scriptClass = scriptInfo.getScriptClass(script, context)
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=915719&r1=915718&r2=915719&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 Feb 24 08:20:48 2010
@@ -85,13 +85,13 @@
case _ => null
}
- def getMethodCallSyntax(obj: String, method: String, args: Array[String]):
String =
+ def getMethodCallSyntax(obj: String, method: String, args: String*): String =
obj + "." + method + "(" + args.mkString(",") + ")"
def getOutputStatement(toDisplay: String): String =
"println(\""+ toDisplay+ "\")"
- def getProgram(statements: Array[String]): String = {
+ def getProgram(statements: String*): String = {
def packageOf(className: String ) = {
val i = className.lastIndexOf('.')
if (i >= 0) className.substring(0, i)
