Author: mduerig
Date: Tue Nov 30 23:08:33 2010
New Revision: 1040820
URL: http://svn.apache.org/viewvc?rev=1040820&view=rev
Log:
SLING-1881: Scala Scripting: Upgrade to Scala 2.8.1
Modified:
sling/trunk/contrib/launchpad/testing/src/main/bundles/list.xml
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
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala
Modified: sling/trunk/contrib/launchpad/testing/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/main/bundles/list.xml?rev=1040820&r1=1040819&r2=1040820&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/src/main/bundles/list.xml (original)
+++ sling/trunk/contrib/launchpad/testing/src/main/bundles/list.xml Tue Nov 30
23:08:33 2010
@@ -42,12 +42,12 @@
<bundle>
<groupId>com.weiglewilczek.scala-lang-osgi</groupId>
<artifactId>scala-library</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</bundle>
<bundle>
<groupId>com.weiglewilczek.scala-lang-osgi</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
Modified: sling/trunk/contrib/scripting/scala/script/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=1040820&r1=1040819&r2=1040820&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Tue Nov 30 23:08:33 2010
@@ -52,7 +52,7 @@
</execution>
</executions>
<configuration>
- <scalaVersion>2.8.0</scalaVersion>
+ <scalaVersion>2.8.1</scalaVersion>
</configuration>
</plugin>
@@ -128,13 +128,13 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
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=1040820&r1=1040819&r2=1040820&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
Tue Nov 30 23:08:33 2010
@@ -95,7 +95,7 @@ class ScalaScriptEngine(factory: ScalaSc
val bindings = context.getBindings(ScriptContext.ENGINE_SCOPE)
val scalaBindings = ScalaBindings()
- import scala.collection.JavaConversions.asSet
+ import scala.collection.JavaConversions._
for (val key <- bindings.keySet) {
val value = bindings.get(key)
if (value == null) log.debug("{} has null value. skipping", key)
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=1040820&r1=1040819&r2=1040820&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
Tue Nov 30 23:08:33 2010
@@ -34,7 +34,7 @@ object ScalaScriptEngineFactory {
val SCALA_CLASSPATH_X = "scala.classpath.x"
val ENGINE_NAME = "Scala Scripting Engine"
- val LANGUAGE_VERSION = "2.8.0"
+ val LANGUAGE_VERSION = "2.8.1"
val ENGINE_VERSION = "0.9/scala " + LANGUAGE_VERSION
val EXTENSIONS = Collections.singletonList("scala")
val LANGUAGE_NAME = "Scala"
Modified:
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala?rev=1040820&r1=1040819&r2=1040820&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/interpreter/Bindings.scala
Tue Nov 30 23:08:33 2010
@@ -110,7 +110,7 @@ private class BindingsWrapper(map: mutab
}
object Bindings {
- import scala.collection.JavaConversions.asMap
+ import scala.collection.JavaConversions._
def apply(): Bindings = new BindingsWrapper(new mutable.HashMap)
def apply(map: mutable.Map[String, AnyRef]): Bindings = new
BindingsWrapper(map)
Modified:
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala?rev=1040820&r1=1040819&r2=1040820&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala
(original)
+++
sling/trunk/contrib/scripting/scala/script/src/test/scala/org/apache/sling/scripting/scala/ScalaScriptEngineFactoryTest.scala
Tue Nov 30 23:08:33 2010
@@ -43,7 +43,7 @@ class ScalaScriptEngineFactoryTest exten
def testScriptEngineFactoryLanguageVersion() {
val version = (new ScalaScriptEngineFactory).getLanguageVersion()
- assertEquals("2.8.0", version)
+ assertEquals("2.8.1", version)
}
}
\ No newline at end of file
