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/05/21 09:31:14 UTC
svn commit: r1340912 [2/2] - in /myfaces/extensions/scripting/trunk: ./
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scri...
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReloadingValidatorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReloadingValidatorTagHandlerDelegate.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReloadingValidatorTagHandlerDelegate.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReloadingValidatorTagHandlerDelegate.java Mon May 21 07:31:11 2012
@@ -19,10 +19,9 @@
package org.apache.myfaces.extensions.scripting.jsf.facelet;
-
-import org.apache.myfaces.view.facelets.tag.jsf.ValidatorTagHandlerDelegate;
import org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
+import org.apache.myfaces.view.facelets.tag.jsf.ValidatorTagHandlerDelegate;
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java Mon May 21 07:31:11 2012
@@ -19,13 +19,17 @@
package org.apache.myfaces.extensions.scripting.jsf.facelet;
-
+import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import org.apache.myfaces.view.facelets.tag.jsf.BehaviorTagHandlerDelegate;
import org.apache.myfaces.view.facelets.tag.jsf.ConverterTagHandlerDelegate;
import org.apache.myfaces.view.facelets.tag.jsf.ValidatorTagHandlerDelegate;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import javax.faces.view.facelets.*;
+import javax.faces.view.facelets.BehaviorHandler;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.ConverterHandler;
+import javax.faces.view.facelets.TagHandlerDelegate;
+import javax.faces.view.facelets.TagHandlerDelegateFactory;
+import javax.faces.view.facelets.ValidatorHandler;
/**
* Tag handler delegate factory which injects reloading
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/ComponentRule.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/ComponentRule.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/ComponentRule.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/ComponentRule.java Mon May 21 07:31:11 2012
@@ -19,7 +19,11 @@
package org.apache.myfaces.extensions.scripting.jsf.facelet.support;
import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.*;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingBeanPropertyTagRule.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingBeanPropertyTagRule.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingBeanPropertyTagRule.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingBeanPropertyTagRule.java Mon May 21 07:31:11 2012
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.scripting.jsf.facelet.support;
-import org.apache.myfaces.view.facelets.tag.BeanPropertyTagRule;
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
+import org.apache.myfaces.view.facelets.tag.BeanPropertyTagRule;
import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.Metadata;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingMetarulesetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingMetarulesetImpl.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingMetarulesetImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/support/SwitchingMetarulesetImpl.java Mon May 21 07:31:11 2012
@@ -23,9 +23,20 @@ import org.apache.myfaces.view.facelets.
import org.apache.myfaces.view.facelets.tag.MetadataTargetImpl;
import org.apache.myfaces.view.facelets.util.ParameterCheck;
-import javax.faces.view.facelets.*;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.Tag;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagException;
import java.beans.IntrospectionException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java Mon May 21 07:31:11 2012
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.scripting.jsf.resources;
-import org.apache.myfaces.renderkit.ErrorPageWriter;
import org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
+import org.apache.myfaces.renderkit.ErrorPageWriter;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceImpl.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceImpl.java Mon May 21 07:31:11 2012
@@ -31,7 +31,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/startup/RefreshPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/startup/RefreshPhaseListener.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/startup/RefreshPhaseListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/startup/RefreshPhaseListener.java Mon May 21 07:31:11 2012
@@ -26,7 +26,6 @@ import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
-import javax.servlet.ServletRequest;
import java.util.Map;
/**
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultReporter.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/CompilationResultReporter.scala?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultReporter.scala (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultReporter.scala Mon May 21 07:31:11 2012
@@ -23,9 +23,8 @@ import scala.tools.nsc.Settings
import scala.tools.nsc.util._
import tools.nsc.reporters.AbstractReporter
-import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult
-import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult.CompilationMessage
import java.io.{ BufferedReader, IOException, PrintWriter }
+import org.apache.myfaces.extensions.scripting.core.engine.api.{CompilationMessage, CompilationResult}
/**
*
Modified: 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-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/CompilationResultTest.java Mon May 21 07:31:11 2012
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.scripting.core.engine.compiler;
+import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationMessage;
import org.junit.Before;
import org.junit.Test;
import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
@@ -48,25 +49,25 @@ public class CompilationResultTest {
@Test
public void testHasErrors() throws Exception {
assertFalse(result.hasErrors());
- result.getErrors().add(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.getErrors().add(new CompilationMessage(1, BOOGA));
assertTrue(result.hasErrors());
}
@Test
public void testRegisterError() throws Exception {
assertFalse(result.hasErrors());
- result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerError(new CompilationMessage(1, BOOGA));
assertTrue(result.hasErrors());
}
@Test
public void testGetErrors() throws Exception {
assertTrue(result.getErrors().isEmpty());
- result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerError(new CompilationMessage(1, BOOGA));
result.registerError(null);
assertFalse(result.getErrors().isEmpty());
assertTrue(result.getErrors().size() == 1);
- result.registerError(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerError(new CompilationMessage(1, BOOGA));
result.registerError(null);
assertTrue(result.getErrors().size() == 2);
@@ -75,11 +76,11 @@ public class CompilationResultTest {
@Test
public void testRegisterWarning() throws Exception {
assertTrue(result.getWarnings().isEmpty());
- result.registerWarning(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerWarning(new CompilationMessage(1, BOOGA));
result.registerWarning(null);
assertFalse(result.getWarnings().isEmpty());
assertTrue(result.getWarnings().size() == 1);
- result.registerWarning(new CompilationResult.CompilationMessage(1, BOOGA));
+ result.registerWarning(new CompilationMessage(1, BOOGA));
assertFalse(result.getWarnings().isEmpty());
assertTrue(result.getWarnings().size() == 2);
Added: 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-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java?rev=1340912&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/DynamicJavaSourceCodeObject.java Mon May 21 07:31:11 2012
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.extensions.scripting.core.engine.compiler;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+import javax.tools.SimpleJavaFileObject;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Creates a dynamic source code file object
+ *
+ * This is an example of how we can prepare a dynamic java source code for compilation.
+ * This class reads the java code from a string and prepares a JavaFileObject
+ *
+ */
+class DynamicJavaSourceCodeObject extends SimpleJavaFileObject
+{
+ private String qualifiedName ;
+ private String sourceCode ;
+
+ /**
+ * Converts the name to an URI, as that is the format expected by JavaFileObject
+ *
+ *
+ * @param fully qualified name given to the class file
+ * @param code the source code string
+ */
+ protected DynamicJavaSourceCodeObject(String name, String code) {
+ super(URI.create("string:///" + name.replaceAll("\\.", "/") + Kind.SOURCE.extension), Kind.SOURCE);
+ this.qualifiedName = name ;
+ this.sourceCode = code ;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors)
+ throws IOException
+ {
+ return sourceCode ;
+ }
+
+ public String getQualifiedName() {
+ return qualifiedName;
+ }
+
+ public void setQualifiedName(String qualifiedName) {
+ this.qualifiedName = qualifiedName;
+ }
+
+ public String getSourceCode() {
+ return sourceCode;
+ }
+
+ public void setSourceCode(String sourceCode) {
+ this.sourceCode = sourceCode;
+ }
+}
Modified: 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-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/JavaCompilerTest.java Mon May 21 07:31:11 2012
@@ -29,8 +29,17 @@ import org.apache.myfaces.extensions.scr
import org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Locale;
import static org.junit.Assert.assertTrue;
@@ -38,7 +47,6 @@ import static org.junit.Assert.assertTru
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
public class JavaCompilerTest
{
private static final String PROBE1 = "../../src/test/resources/compiler/TestProbe1.java";
@@ -90,6 +98,56 @@ public class JavaCompilerTest
}
@Test
+ public void testInMemoryCompile() {
+ String sourceCode =
+ "class DynamicCompilationHelloWorld{" +
+ "public static void main (String args[]){" +
+ "System.out.println (\"Hello, dynamic compilation world!\");" +
+ "}" +
+ "}";
+ /*Creating dynamic java source code file object*/
+ SimpleJavaFileObject fileObject = new DynamicJavaSourceCodeObject("DynamicCompilationHelloWorld", sourceCode);
+ JavaFileObject javaFileObjects[] = new JavaFileObject[]{fileObject};
+
+ /* Prepare a list of compilation units (java source code file objects) to input to compilation task*/
+ Iterable<? extends JavaFileObject> compilationUnits = Arrays.asList(javaFileObjects);
+
+ /*Prepare any compilation options to be used during compilation*/
+ //In this example, we are asking the compiler to place the output files under bin folder.
+
+ String[] compileOptions = new String[]{"-d", FileUtils.getTempDir().getAbsolutePath()};
+ Iterable<String> compilationOptions = Arrays.asList(compileOptions);
+
+ /*Instantiating the java compiler*/
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+
+ /**
+ * Retrieving the standard file manager from compiler object, which is used to provide
+ * basic building block for customizing how a compiler reads and writes to files.
+ *
+ * The same file manager can be reopened for another compiler task.
+ * Thus we reduce the overhead of scanning through file system and jar files each time
+ */
+ StandardJavaFileManager stdFileManager = compiler.getStandardFileManager(null, Locale.getDefault(), null);
+ /*Create a diagnostic controller, which holds the compilation problems*/
+ DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<JavaFileObject>();
+ /*Create a compilation task from compiler by passing in the required input objects prepared above*/
+ JavaCompiler.CompilationTask compilerTask = compiler.getTask(null, stdFileManager, diagnostics, compilationOptions, null, compilationUnits);
+
+ //Perform the compilation by calling the call method on compilerTask object.
+ boolean status = compilerTask.call();
+
+ if (!status)
+ {//If compilation error occurs
+ /*Iterate through each compilation problem and print it*/
+ for (Diagnostic diagnostic : diagnostics.getDiagnostics())
+ {
+ System.out.format("Error on line %d in %s", diagnostic.getLineNumber(), diagnostic);
+ }
+ }
+ }
+
+ @Test
public void testFullCompileWhitelist()
{
JSR199Compiler compiler = new JSR199Compiler();
Modified: 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-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompilerTest.java Mon May 21 07:31:11 2012
@@ -27,6 +27,7 @@ import org.apache.myfaces.extensions.scr
import org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import org.apache.myfaces.extensions.scripting.core.engine.compiler.ScalaCompiler;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
@@ -38,9 +39,9 @@ import static org.junit.Assert.assertTru
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
public class ScalaCompilerTest
-{ private static final String PROBE1 = "../../src/test/resources/compiler/TestProbe1Scala.scala";
+{
+ private static final String PROBE1 = "../../src/test/resources/compiler/TestProbe1Scala.scala";
private static final String PROBE2 = "../../src/test/resources/compiler/TestProbe2Scala.scala";
private static final String RESOURCES = "../../src/test/resources/";
Modified: 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-core/src/test/resources/webapp/WEB-INF/web.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/webapp/WEB-INF/web.xml Mon May 21 07:31:11 2012
@@ -66,7 +66,7 @@
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
<!--
Modified: myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/web.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/web.xml Mon May 21 07:31:11 2012
@@ -75,7 +75,7 @@
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
-->
<!--
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml Mon May 21 07:31:11 2012
@@ -67,7 +67,7 @@
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
<!--
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml Mon May 21 07:31:11 2012
@@ -75,7 +75,7 @@
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
-->
<!--
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Mon May 21 07:31:11 2012
@@ -104,7 +104,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
@@ -189,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/configentries.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/configentries.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/configentries.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/configentries.xml Mon May 21 07:31:11 2012
@@ -91,7 +91,7 @@
<tr>
<td>facelets.RESOURCE_RESOLVER</td>
<td>NO</td>
- <td>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</td>
+ <td>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</td>
<td>Enables the loading of xhtml facelet pages from your source directory, if
org.apache.myfaces.extensions.scripting.resource.LOADER_PATHS is set properly
</td>
Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/exampleconfig.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/exampleconfig.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/exampleconfig.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/exampleconfig.xml Mon May 21 07:31:11 2012
@@ -152,7 +152,7 @@
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
<!-- ======================================================================================
Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/installation.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/installation.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/installation.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/installation.xml Mon May 21 07:31:11 2012
@@ -328,7 +328,7 @@
This parameter points to the root of your dynamic resources, usually the same dir
as the root of your web application.
</li>
- <li><b>facelets.RESOURCE_RESOLVER</b> also needs to be set to <b>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</b> if
+ <li><b>facelets.RESOURCE_RESOLVER</b> also needs to be set to <b>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</b> if
you want dynamic Facelet reloading enabled</li>
</ul>
@@ -352,7 +352,7 @@
and resources from our source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
]]></source>
</p>
Modified: myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml?rev=1340912&r1=1340911&r2=1340912&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml (original)
+++ myfaces/extensions/scripting/trunk/src/site/xdoc/using_advanced.xml Mon May 21 07:31:11 2012
@@ -271,7 +271,7 @@
The second parameter <b>facelets.RESOURCE_RESOLVER</b> is responsible for enabling the resouce loading
of Facelet templates and pages, since Facelets does not have an auto plugging mechanism this has
to be
- set to a standard value which is <b>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</b>
+ set to a standard value which is <b>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</b>
</p>
<p>
For further reference please also visit out <a href="./configentries.html">Appendix: Configuration Entries Overview</a>