https://issues.apache.org/jira/browse/EXTSCRIPT-144
reverting back to snapshot for the myfaces reference, finishing the demos for 1.0
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@997739 13f79535-47bb-0310-9956-ffa450edef68
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 8cedff2..a75200e 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
@@ -22,7 +22,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
-
<!-- managed beans of the simple hello world app -->
<managed-bean>
@@ -38,11 +37,11 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
- <managed-bean>
- <managed-bean-name>javatestbean</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.javaloader.test.TestBean2</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
+ <managed-bean>
+ <managed-bean-name>javatestbean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.javaloader.test.TestBean2</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
<managed-bean>
@@ -64,8 +63,6 @@
</application>
-
-
<lifecycle>
<phase-listener>
org.apache.myfaces.groovyloader.test.TestPhaseListener
@@ -114,15 +111,19 @@
<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-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>
+ <system-event-listener-class>org.apache.myfaces.javaloader.eventTest.TestListener
+ </system-event-listener-class>
<system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class>
</system-event-listener>
<resource-handler>org.apache.myfaces.javaloader.test.TestResourceHandler</resource-handler>
-
+
+
</application>
</faces-config>
\ No newline at end of file
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
index 4c78fd9..b7ea47f 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
@@ -32,12 +32,11 @@
@DependencyTestAnnotation
public class Blog {
+
String title = "<h3>Hello to the MyFaces Dynamic Blogging Example</h3>";
String title1 = "You can alter the code for this small blogging application on the fly, " +
"you even can add new classes on the fly and Java will pick it up";
-
-
String firstName = "";
String lastName = "";
String topic = "";
@@ -84,6 +83,7 @@
//include for presentation 3
//entry.setTopic(debuggingTest());
+
service.addEntry(entry);
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
index 833c384..8c3c54a 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
@@ -40,7 +40,7 @@
*/
@DependencyTestAnnotation
public void addEntry(BlogEntry entry) {
- if (entry != null) {
+ if (entry != null) {
blogEntries.add(entry);
}
}
@@ -53,5 +53,6 @@
this.blogEntries = blogEntries;
}
+
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogServiceInterface.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogServiceInterface.java
index 2c21b5a..22dbe81 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogServiceInterface.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogServiceInterface.java
@@ -22,9 +22,7 @@
* Test for indirect dependency over interfaces
*/
public interface BlogServiceInterface extends BaseInterface {
-
+
public void addEntry(BlogEntry entry);
-
-
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
index 49bed03..0198789 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
@@ -41,7 +41,6 @@
* class to the other
*/
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
public class JavaTestRenderer1 extends HtmlTextRendererBase {
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 5896cf3..23af7ae 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
@@ -32,13 +32,14 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-
+@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
private static final String MSG = "<h2> Hello world ccc from Renderer 2 </h2>";
private static final String MSG2 = "<h3> hello world second var <h3>";
+
@Override
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
index 7d40498..c101a8e 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
@@ -32,7 +32,7 @@
public class MyBean {
String test;
UIComponent bindingMyTest;
- String hello = "hello world from mybean";
+ String hello = "hello world from mybean xxx";
@ManagedProperty(value = "#{secondaryBean}")
Object secondaryBean;
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
index 3124a0b..b2d93b7 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
@@ -40,6 +40,6 @@
}
public void setMyBean(Object myBean) {
- this.myBean = myBean;
+ this.myBean = (MyBean ) myBean;
}
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/BaseResourceHandler.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/BaseResourceHandler.java
index 4419572..d8910cd 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/BaseResourceHandler.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/other/BaseResourceHandler.java
@@ -31,6 +31,9 @@
ResourceHandler _delegate;
+ public BaseResourceHandler() {
+ }
+
public BaseResourceHandler(ResourceHandler delegate) {
_delegate = delegate;
}
@@ -62,4 +65,12 @@
public boolean libraryExists(String libraryName) {
return _delegate.libraryExists(libraryName);
}
+
+ public Object getDelegate() {
+ return _delegate;
+ }
+
+ public void setDelegate(Object _delegate) {
+ this._delegate = (ResourceHandler) _delegate;
+ }
}
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 3001fa1..673e2cd 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,6 +18,8 @@
*/
package org.apache.myfaces.javaloader.other;
+import org.apache.myfaces.extensions.scripting.api.Decorated;
+
import javax.faces.application.ResourceHandler;
import javax.faces.application.Resource;
@@ -25,11 +27,14 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ResourceHandler1 extends BaseResourceHandler {
+public class ResourceHandler1 extends BaseResourceHandler implements Decorated {
public ResourceHandler1(ResourceHandler delegate) {
super(delegate);
}
+ public ResourceHandler1() {
+ }
+
@Override
public Resource createResource(String resourceName) {
if (resourceName.equals("testResource")) {
@@ -38,4 +43,11 @@
}
return super.createResource(resourceName);
}
+
+
+ @Override
+ public Object getDelegate() {
+ return super.getDelegate();
+
+ }
}
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
index 5168f27..5209d2a 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
@@ -11,9 +11,11 @@
</head>
<body>
<ui:composition template="/template.xhtml">
+
<ui:define name="body">
<h1>
- <ui:insert name="title">Ext-Scripting General Example</ui:insert>
+ <ui:insert name="title">Ext-Scripting General Example
+ </ui:insert>
</h1>
<h:form id="form">
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml
index 6c0e784..889c58e 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld2.xhtml
@@ -10,7 +10,8 @@
<ui:composition template="/template.xhtml">
<ui:define name="body">
<h1 style="color: yellow;">
- <h:outputText value="#{helloBean.hello}"/>
+
+ <h:outputText value="instant bean result #{helloBean.hello}"/>
</h1>
</ui:define>
</ui:composition>
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/index.jsp b/extscript-examples/myfaces20-example/src/main/webapp/index.jsp
index 330de79..84dd18a 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/index.jsp
+++ b/extscript-examples/myfaces20-example/src/main/webapp/index.jsp
@@ -1,4 +1,4 @@
<%@ page session="false" %>
<%
- response.sendRedirect("helloWorld.jsf");
+ response.sendRedirect("mainpage.jsf");
%>
\ No newline at end of file
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml
new file mode 100644
index 0000000..97759b2
--- /dev/null
+++ b/extscript-examples/myfaces20-example/src/main/webapp/mainpage.xhtml
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:grv="http://myfaces.apache.org/groovy"
+ xmlns:g="http://java.sun.com/jsf/composite/greet"
+
+ >
+<head>
+ <title>Hello World</title>
+</head>
+<body>
+<ui:composition template="/template.xhtml">
+
+ <ui:define name="body">
+ <h1>Hello from Apache MyFaces Extension Scripting</h1>
+ <h:panelGrid columns="2" columnClasses="celltop, celltop">
+
+
+ <h:panelGroup styleClass="stdBox" id="demoMenu">
+ <h2>Documentation</h2>
+
+ <h:outputLink target="_new"
+ value="http://people.apache.org/~werpu/ext-script-site/">Extension Scripting Documentation</h:outputLink>
+
+
+ <h2>Demo and Testing Links</h2>
+ <h:panelGrid columns="1">
+ <h:outputLink value="helloWorld.jsf">Hello World Artifacting Testing Case</h:outputLink>
+ <h:outputLink value="componentTest.jsf">Component Testing Case</h:outputLink>
+ <h:outputLink value="complexBean.jsf">Complex Bean Testing Case</h:outputLink>
+ <h:outputLink value="javablog.jsf">Java Blog Example</h:outputLink>
+ <h:outputLink value="blog.jsf">Groovy Blog Example</h:outputLink>
+ </h:panelGrid>
+ </h:panelGroup>
+
+ <h:panelGroup
+ styleClass="stdBox"><h3>Apache Apache MyFaces Extension Scripting - short Ext-Scripting is a dynamic script
+ extension for the Apache MyFaces JSF Implementation.
+ With it you can edit JSF artifacts on the fly in both Groovy and Java.
+ </h3>
+ </h:panelGroup>
+
+ </h:panelGrid>
+
+ <h:panelGroup styleClass="stdBoxBig">
+ <object width="800" height="600">
+ <param name="movie"
+ value="http://www.youtube.com/v/g2YvzOloNyI&hl=de_DE&fs=1&border=1"></param>
+ <param name="allowFullScreen" value="true"></param>
+ <param name="allowscriptaccess" value="always"></param>
+ <embed src="http://www.youtube.com/v/g2YvzOloNyI&hl=de_DE&fs=1&border=1"
+ type="application/x-shockwave-flash" allowscriptaccess="always"
+ allowfullscreen="true" width="800" height="550"></embed>
+ </object>
+ </h:panelGroup>
+
+
+ </ui:define>
+
+
+</ui:composition>
+</body>
+</html>
\ No newline at end of file
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css b/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css
index 8b5a605..c7109cc 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css
+++ b/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css
@@ -260,4 +260,9 @@
input.btn {
width: 100px;
margin-left: 263px;
+}
+
+
+.celltop {
+ vertical-align:top;
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ecd371a..b3ee872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<properties>
<myfaces12.version>1.2.8</myfaces12.version>
- <myfaces2.version>2.0.1</myfaces2.version>
+ <myfaces2.version>2.0.2-SNAPSHOT</myfaces2.version>
<groovy.version>1.7.1</groovy.version>
<extval.version>2.0.4-SNAPSHOT</extval.version>
</properties>
