fixing smaller issues in the compiler, testing round
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300527 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
index 6983387..d8219fd 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
@@ -69,7 +69,10 @@
res = compiler.compile(new File(sourceRoot), targetDir,
ClassUtils.getContextClassLoader());
if(res.hasErrors()) {
- log.severe(res.getCompilerOutput());
+ for(CompilationResult.CompilationMessage msg :res.getErrors()) {
+ log.severe(msg.getMessage());
+ }
+ // log.severe(res.getCompilerOutput());
}
}
return res;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
index efe0039..2a6e425 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/JSR199Compiler.java
@@ -70,13 +70,12 @@
*
* @param sourceRoot the root for all java sources to be compiled
* @param loader the classpath holder for the compilation
- * @throws org.apache.myfaces.extensions.scripting.api.CompilationException
- * in case of a compilation error
+ * @return the collected compilation results as bundle
*/
public CompilationResult compile(File sourceRoot, File destination, ClassLoader loader) {
WeavingContext context = WeavingContext.getInstance();
Configuration configuration = context.getConfiguration();
-
+ destination.mkdirs();
fileManager = new ContainerFileManager(javaCompiler.getStandardFileManager(new DiagnosticCollector<JavaFileObject>(), null, null));
DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<JavaFileObject>();
diff --git a/extscript-core-root/extscript-core/src/main/resources/META-INF/faces-config.xml b/extscript-core-root/extscript-core/src/main/resources/META-INF/faces-config.xml
index 2884f4d..6b2d2da 100644
--- a/extscript-core-root/extscript-core/src/main/resources/META-INF/faces-config.xml
+++ b/extscript-core-root/extscript-core/src/main/resources/META-INF/faces-config.xml
@@ -5,8 +5,6 @@
version="2.0">
-
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,36 +23,6 @@
* specific language governing permissions and limitations
* under the License.
-->
- <!--
- <lifecycle>
- <phase-listener>org.apache.myfaces.extensions.scripting.jsf.RefreshPhaseListener</phase-listener>
-
- </lifecycle>
-
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-class>
- </component>
-
-
- <render-kit>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-class>
- </renderer>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-class>
- </renderer>
- </render-kit>
- -->
<factory>
@@ -80,14 +48,15 @@
rewrite.org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingRenderkitFactory
</render-kit-factory>
- <!--
- <tag-handler-delegate-factory>
- org.apache.myfaces.extensions.scripting.facelet.TagHandlerDelegateFactoryImpl
- </tag-handler-delegate-factory>
- -->
+ <!--
+ <tag-handler-delegate-factory>
+ org.apache.myfaces.extensions.scripting.facelet.TagHandlerDelegateFactoryImpl
+ </tag-handler-delegate-factory>
+ -->
</factory>
<lifecycle>
- <phase-listener>rewrite.org.apache.myfaces.extensions.scripting.jsf.startup.AnnotationScanPhaseListener</phase-listener>
+ <phase-listener>rewrite.org.apache.myfaces.extensions.scripting.jsf.startup.AnnotationScanPhaseListener
+ </phase-listener>
</lifecycle>
<!--
@@ -109,13 +78,26 @@
<component>
<component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-class>
+ <component-class>rewrite.org.apache.myfaces.extensions.scripting.jsf.components.CompilerComponent
+ </component-class>
</component>
<component>
<component-type>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-class>
+ <component-class>rewrite.org.apache.myfaces.extensions.scripting.jsf.components.TaintHistory</component-class>
</component>
-
+ <render-kit>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-type>
+ <renderer-class>rewrite.org.apache.myfaces.extensions.scripting.jsf.components.CompilerComponentRenderer
+ </renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-type>
+ <renderer-class>rewrite.org.apache.myfaces.extensions.scripting.jsf.components.TaintHistoryRenderer</renderer-class>
+ </renderer>
+ </render-kit>
</faces-config>
\ No newline at end of file
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
index a75200e..7d438f4 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
@@ -110,12 +110,16 @@
</render-kit>
<application>
<!-- disable an Ext-Val warning which is triggered falsely by the latest version -->
+ <!--
<system-event-listener>
+
<system-event-listener-class>
org.apache.myfaces.extensions.scripting.startup.SuppressExtValWarningStartupListener
</system-event-listener-class>
+
<system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>
</system-event-listener>
+ -->
<system-event-listener>
<system-event-listener-class>org.apache.myfaces.javaloader.eventTest.TestListener
</system-event-listener-class>
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
index 7c713d7..2149a58 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
@@ -18,15 +18,13 @@
*/
package org.apache.myfaces.javaloader.componentTest;
-import java.io.IOException;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.render.FacesRenderer;
-
-import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
-import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
+import java.io.IOException;
/**
* @author Werner Punz (latest modification by $Author$)
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/ResourceHandler1.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/ResourceHandler1.java
index a189532..f1d6e5d 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/ResourceHandler1.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/ResourceHandler1.java
@@ -18,7 +18,8 @@
*/
package org.apache.myfaces.javaloader.other;
-import org.apache.myfaces.extensions.scripting.api.Decorated;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.Decorated;
import javax.faces.application.ResourceHandler;
import javax.faces.application.Resource;
@@ -27,7 +28,8 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ResourceHandler1 extends BaseResourceHandler implements Decorated {
+public class ResourceHandler1 extends BaseResourceHandler implements Decorated
+{
public ResourceHandler1(ResourceHandler delegate) {
super(delegate);
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
index a8287e0..aea5b07 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
@@ -53,7 +53,7 @@
public String getSayHello() {
-
+ //return "hello from bean2";
return bean4.getHello();
//return "replacement";
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean4.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean4.java
index dad27cb..905c040 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean4.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean4.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.javaloader.test;
import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
import javax.faces.bean.SessionScoped;
@ManagedBean(name = "javatestbean4")
@SessionScoped
-
public class TestBean4 {
private String hello = "Hello world from test Bean 4";
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml
index 0039c4c..010ff04 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml
@@ -32,7 +32,7 @@
<ui:composition template="/template.xhtml">
<ui:define name="body">
- <h1>Hello from Apache MyFaces Extension Scripting</h1>
+ <h1>Hello from Apache MyFaces Extension Scripting #{javatestbean.sayHello}</h1>
<h:panelGrid columns="2" columnClasses="celltop, celltop">
