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/11/09 14:53:21 UTC
svn commit: r1407455 [2/2] - in /myfaces/extensions/scripting/trunk:
extscript-bundles/extscript-myfaces20-bundle/ extscript-core-root/
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/
extscript-core-roo...
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/TaintTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/TaintTest.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/TaintTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/context/TaintTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/TaintTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/EngineFactoryTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/EngineFactoryTest.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/engine/EngineFactoryTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/EngineFactoryTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/EngineFactoryTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationExceptionTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationExceptionTest.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/engine/compiler/CompilationExceptionTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationExceptionTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationExceptionTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.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/engine/compiler/CompilationResultTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.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/engine/compiler/DynamicJavaSourceCodeObject.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompilerTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompilerTest.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/engine/compiler/GroovyCompilerTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompilerTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/GroovyCompilerTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JRubyCompilerTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JRubyCompilerTest.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/engine/compiler/JRubyCompilerTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JRubyCompilerTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JRubyCompilerTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.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/engine/compiler/JavaCompilerTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.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/engine/compiler/ScalaCompilerTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.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/probes/MethodReloadingProbe.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.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/probes/Probe.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.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/probes/Probe2.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.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/support/AbstractGeneratorTestCase.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/AbstractGeneratorTestCase.java Fri Nov 9 13:53:10 2012
@@ -47,7 +47,7 @@ public abstract class AbstractGeneratorT
public void setUp() throws Exception {
// Create the test directory within the directory that the class file of this test case is located in
testDirectory =
- new File(URLDecoder.decode(getClass().getResource(".").toURI().getPath(), Charset.defaultCharset().toString()), "test");
+ new File(URLDecoder.decode(getClass().getResource("src/test/java").toURI().getPath(), Charset.defaultCharset().toString()), "test");
if (!testDirectory.mkdirs() && !testDirectory.exists()) {
throw new IllegalStateException(
"Couldn't setup the test case for the test case '" + getClass().getName()
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.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/support/Consts.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.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/support/ContextUtils.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/ContextUtils.java Fri Nov 9 13:53:10 2012
@@ -21,7 +21,6 @@ package org.apache.myfaces.extensions.sc
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import org.apache.myfaces.extensions.scripting.core.monitor.ResourceMonitor;
-import org.apache.myfaces.extensions.scripting.jsf.adapters.MyFacesSPI;
import java.io.IOException;
@@ -56,8 +55,8 @@ public class ContextUtils
ResourceMonitor.getInstance().performMonitoringTask();
ResourceMonitor.getInstance().start();
-
- WeavingContext.getInstance().setImplementation(MyFacesSPI.getInstance());
+ WeavingContext.getInstance().getImplementation();
+ //WeavingContext.getInstance().setImplementation(WeavingContext.getInstance().getImplementationSPI());
}
catch (IOException e)
{
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/LoggingHandler.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/LoggingHandler.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/support/LoggingHandler.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/LoggingHandler.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/LoggingHandler.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/MockServletContext.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/MockServletContext.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/support/MockServletContext.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/MockServletContext.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/MockServletContext.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/PathUtils.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/PathUtils.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/support/PathUtils.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/support/PathUtils.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/support/PathUtils.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/FileUtilsTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/FileUtilsTest.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/utilstest/FileUtilsTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/FileUtilsTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/FileUtilsTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/ReflectUtilTest.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/ReflectUtilTest.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/utilstest/ReflectUtilTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/ReflectUtilTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/utilstest/ReflectUtilTest.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/brokenwebapp/WEB-INF/web.xml (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/brokenwebapp/WEB-INF/web.xml?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/brokenwebapp/WEB-INF/web.xml&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Groovy.groovy (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1Groovy.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Groovy.groovy?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Groovy.groovy&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1Groovy.groovy&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1JRuby.rb (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1JRuby.rb)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1JRuby.rb?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1JRuby.rb&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1JRuby.rb&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Scala.scala (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1Scala.scala)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Scala.scala?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe1Scala.scala&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe1Scala.scala&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Groovy.groovy (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2Groovy.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Groovy.groovy?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Groovy.groovy&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2Groovy.groovy&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2JRuby.rb (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2JRuby.rb)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2JRuby.rb?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2JRuby.rb&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2JRuby.rb&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Scala.scala (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2Scala.scala)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Scala.scala?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/TestProbe2Scala.scala&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/TestProbe2Scala.scala&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbe.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbe.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbe.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbe.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbe.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeGroovy.groovy (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbeGroovy.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeGroovy.groovy?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeGroovy.groovy&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbeGroovy.groovy&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeRuby.rb (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbeRuby.rb)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeRuby.rb?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/compiler/myPackage/WhiteListedProbeRuby.rb&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/compiler/myPackage/WhiteListedProbeRuby.rb&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/Test1.groovy (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/groovy/Test1.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/Test1.groovy?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/Test1.groovy&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/groovy/Test1.groovy&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/dummy.txt (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/groovy/dummy.txt)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/dummy.txt?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/groovy/dummy.txt&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/groovy/dummy.txt&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/Test2.java (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/java/Test2.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/Test2.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/Test2.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/java/Test2.java&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/dummy.txt (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/java/dummy.txt)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/dummy.txt?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/java/dummy.txt&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/java/dummy.txt&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/web.xml (from r1406136, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/web.xml?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces/src/test/resources/webapp/WEB-INF/web.xml&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/web.xml&r1=1406136&r2=1407455&rev=1407455&view=diff
==============================================================================
(empty)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java?rev=1407455&r1=1407454&r2=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java Fri Nov 9 13:53:10 2012
@@ -19,8 +19,6 @@
package org.apache.myfaces.extensions.scripting.spring.context;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextException;
@@ -29,7 +27,6 @@ import org.springframework.web.context.C
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.ServletContext;
-import java.io.IOException;
/**
* @author Werner Punz (latest modification by $Author$)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoaderListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoaderListener.java?rev=1407455&r1=1407454&r2=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoaderListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoaderListener.java Fri Nov 9 13:53:10 2012
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.scripting.spring.context;
-import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader;
+import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoaderBase;
import org.springframework.web.context.ContextLoader;
import org.springframework.web.context.ContextLoaderListener;
@@ -49,7 +49,7 @@ public class CompilationAwareContextLoad
if (event.getServletContext().getAttribute("StartupInitialized") == null)
{
//probably already started
- StartupServletContextPluginChainLoader.startup(event.getServletContext());
+ StartupServletContextPluginChainLoaderBase.startup(event.getServletContext());
event.getServletContext().setAttribute("StartupInitialized", Boolean.TRUE);
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java?rev=1407455&r1=1407454&r2=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java Fri Nov 9 13:53:10 2012
@@ -23,16 +23,12 @@ import org.apache.commons.io.FileUtils;
import org.apache.myfaces.extension.scripting.weld.core.CDIThrowAwayClassloader;
import org.apache.myfaces.extension.scripting.weld.core.ReloadingListener;
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.bootstrap.api.Bootstrap;
-import org.jboss.weld.servlet.api.ServletListener;
+import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoaderBase;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Field;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -68,7 +64,7 @@ public class WeldBootstrapListener exten
//after the container is kickstarted
if (servletContext.getAttribute(RELOADING_LISTENER) == null)
{
- StartupServletContextPluginChainLoader.startup(servletContext);
+ StartupServletContextPluginChainLoaderBase.startup(servletContext);
servletContext.setAttribute(RELOADING_LISTENER, new ReloadingListener());
WeavingContext.getInstance().addListener((ReloadingListener) servletContext.getAttribute(RELOADING_LISTENER));
File target = WeavingContext.getInstance().getConfiguration().getCompileTarget("/META-INF/beans.xml");
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml?rev=1407455&r1=1407454&r2=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml Fri Nov 9 13:53:10 2012
@@ -44,6 +44,8 @@
<module>extscript-core</module>
<module>extscript-cdi</module>
<module>extscript-spring</module>
+ <module>extscript-myfaces</module>
+
<!--
<module>extscript-weld</module>
-->
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml?rev=1407455&r1=1407454&r2=1407455&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml Fri Nov 9 13:53:10 2012
@@ -26,6 +26,8 @@
<title>Hello World</title>
</h:head>
<h:body>
- <h:outputFormat value="hello world" />
+ <h:outputFormat value="hello world: #{javaHello.helloWorld}" />
+ <br />
+ <h:outputFormat value="hello world: #{groovyHello.helloWorld}" />
</h:body>
</html>