EXTSCRIPT-157: prepare and improve the site documentation for the 1.0.2 and 1.0.3 small code refactoring
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1303416 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
index a93b26e..f29b228 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
@@ -121,18 +121,7 @@
return WeavingContext.getInstance().getEngine(scriptingEngine).getSourcePaths();
}
- public Collection<String> getAllSourceDirs()
- {
- List<String> result = new LinkedList<String>();
- Collection<ScriptingEngine> engines = WeavingContext.getInstance().getEngines();
- for (ScriptingEngine engine : engines)
- {
- result.addAll(engine.getSourcePaths());
- }
- return result;
- }
-
- /**
+ /**
* returns a set of whitelisted subdirs hosting the source
*
* @param scriptingEngine the scripting engine for which the dirs have to be determined
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ScriptingConst.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ScriptingConst.java
index 73433a9..a8584c1 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ScriptingConst.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ScriptingConst.java
@@ -39,6 +39,8 @@
public static final String INIT_PARAM_CUSTOM_GROOVY_LOADER_PATHS = "org.apache.myfaces.extensions.scripting.groovy.LOADER_PATHS";
public static final String INIT_PARAM_CUSTOM_SCALA_LOADER_PATHS = "org.apache.myfaces.extensions.scripting.scala" +
".LOADER_PATHS";
+ //TODO add this
+
public static final String INIT_PARAM_CUSTOM_JAVA_LOADER_PATHS = "org.apache.myfaces.extensions.scripting.java.LOADER_PATHS";
public static final String INIT_PARAM_INITIAL_COMPILE="org.apache.myfaces.extensions.scripting.INITIAL_COMPILE_AND_SCAN";
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 3c59352..5c31b38 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
@@ -38,6 +38,31 @@
println("[EXT-SCRIPTING] Error in scala compile:" + message)
}
+ /**
+ * fetches a list of jars from a given dir and appends it to the given classpath
+ *
+ * @param libDir the library directory
+ * @param _cp
+ * @param classesDir
+ * @return
+ */
+ def fetchJarPath(libDir: String, _cp: String, classesDir: String): String =
+ {
+ var cp: String = _cp
+ val libs = FileUtils.fetchSourceFiles(new File(libDir), "*.jar")
+ val finalPath = new StringBuilder
+ finalPath.append(cp)
+ finalPath.append(File.pathSeparator)
+ finalPath.append(classesDir)
+ for (singleLib: File <- libs)
+ {
+ finalPath.append(File.pathSeparator)
+ finalPath.append(singleLib.getAbsolutePath)
+ }
+ cp = finalPath.toString()
+ cp
+ }
+
def compile(sourcePath: File, targetPath: File, classLoader: ClassLoader): CompilationResult =
{
val context = WeavingContext.getInstance()
@@ -60,17 +85,11 @@
val classesDir = ClassUtils.getContextClassLoader().getResource("./").getFile();
val libDir = classesDir+".."+File.separator+"lib"
- val libs = FileUtils.fetchSourceFiles(new File(libDir),"*.jar")
- val finalPath = new StringBuilder
- finalPath.append(cp)
- finalPath.append(File.pathSeparator)
- finalPath.append(classesDir)
- for(singleLib:File <- libs){
- finalPath.append(File.pathSeparator)
- finalPath.append(singleLib.getAbsolutePath)
- }
- cp = finalPath.toString()
+ cp = fetchJarPath(libDir, cp, classesDir)
}
+
+
+
settings.classpath.value = cp
val reporter = new CompilationResultReporter(settings)
