EXTSCRIPT-159: Add scala language support if possible: adding the classpath to avoid a scala compiler error, thanks to the scala mailinglist this was fast to fix
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1302905 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala b/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
index 42b9aef..e254736 100644
--- a/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
+++ b/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
@@ -30,11 +30,12 @@
for (sourceFile:File <- sourceFiles) {
sourceFileNames = sourceFileNames ::: List(sourceFile.getAbsolutePath())
}
-
val settings = new Settings(error)
settings.outdir.value = configuration.getCompileTarget.getAbsolutePath
settings.deprecation.value = true // enable detailed deprecation warnings
settings.unchecked.value = true // enable detailed unchecked warnings
+ val cp:String = System.getProperty("java.class.path")
+ settings.classpath.value = cp
val reporter = new CompilationResultReporter(settings)
diff --git a/pom.xml b/pom.xml
index 17dca98..e40bbb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,20 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala-library.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala-library.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
