You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/03/20 15:08:07 UTC
svn commit: r1302905 - in /myfaces/extensions/scripting/trunk:
extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
pom.xml
Author: werpu
Date: Tue Mar 20 14:08:06 2012
New Revision: 1302905
URL: http://svn.apache.org/viewvc?rev=1302905&view=rev
Log:
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
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala?rev=1302905&r1=1302904&r2=1302905&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala Tue Mar 20 14:08:06 2012
@@ -30,11 +30,12 @@ class ScalaCompiler extends org.apache.m
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)
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=1302905&r1=1302904&r2=1302905&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Tue Mar 20 14:08:06 2012
@@ -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>