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 2017/09/22 12:48:22 UTC

svn commit: r1809309 - /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java

Author: werpu
Date: Fri Sep 22 12:48:22 2017
New Revision: 1809309

URL: http://svn.apache.org/viewvc?rev=1809309&view=rev
Log:
EXTSCRIPT-188: Fix for MyFaces 2.2.x, test adjustment for the
dropping of the scala engine

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java?rev=1809309&r1=1809308&r2=1809309&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java Fri Sep 22 12:48:22 2017
@@ -56,7 +56,7 @@ public class InitialFullScanTest
             {
                 ScriptingEngine javaEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
                 ScriptingEngine groovyEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_GROOVY);
-                ScriptingEngine scalaEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_SCALA);
+              //  ScriptingEngine scalaEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_SCALA);
                 ScriptingEngine jrubyEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_JRUBY);
 
                 ClassLoader loader = this.getClass().getClassLoader();
@@ -76,14 +76,14 @@ public class InitialFullScanTest
                     currentDirStr = currentDirStr.replaceAll("core/context", "jsf/startup");
                     javaEngine.getSourcePaths().add(currentDirStr);
                     groovyEngine.getSourcePaths().add(currentDirStr);
-                    scalaEngine.getSourcePaths().add(currentDirStr);
+                  //  scalaEngine.getSourcePaths().add(currentDirStr);
                 }
                 //we now scan for the files
                 WeavingContext.getInstance().fullScan();
                 assertTrue("watched resources must have java files", javaEngine.getWatchedResources().size() > 0);
                 javaEngine.getSourcePaths().clear();;
                 groovyEngine.getSourcePaths().clear();
-                scalaEngine.getSourcePaths().clear();
+                //scalaEngine.getSourcePaths().clear();
                 if(jrubyEngine != null) {
                     jrubyEngine.getSourcePaths().clear();
                 }