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 2010/05/05 17:29:11 UTC
svn commit: r941345 - in
/myfaces/extensions/scripting/branches/1_0_final_prepare:
extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/
extscript-examples/myfaces20-example/src/main/webapp/
extscript-examples/myfaces20-example...
Author: werpu
Date: Wed May 5 15:29:11 2010
New Revision: 941345
URL: http://svn.apache.org/viewvc?rev=941345&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-130
Modified:
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml Wed May 5 15:29:11 2010
@@ -77,6 +77,12 @@
</factory>
+ <application>
+ <resource-handler>
+ org.apache.myfaces.extensions.scripting.jsf2.resources.SourceResourceHandler
+ </resource-handler>
+ </application>
+
<!--
<application>
<system-event-listener>
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml Wed May 5 15:29:11 2010
@@ -60,9 +60,7 @@
<navigation-handler>
org.apache.myfaces.groovyloader.test.TestNavigationHandler
</navigation-handler>
- <resource-handler>
- org.apache.myfaces.extensions.scripting.jsf2.resources.SourceResourceHandler
- </resource-handler>
+
</application>
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java Wed May 5 15:29:11 2010
@@ -40,6 +40,7 @@ public class JavaTestComponent extends U
}
public JavaTestComponent() {
+
setRendererType("at.irian.JavaTestRenderer");
}
@@ -90,6 +91,7 @@ public class JavaTestComponent extends U
* Note we are on jsf 2 level
*/
+
public String getTestAttr4() {
return (String) getStateHelper().eval(PropertyKeys.testAttr4, "");
}
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java Wed May 5 15:29:11 2010
@@ -41,8 +41,6 @@ import java.util.logging.Logger;
* class to the other
*/
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
-
public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Logger log = Logger.getLogger(JavaTestRenderer1.class.getName());
@@ -60,17 +58,16 @@ public class JavaTestRenderer1 extends H
writer.flush();
}
-
-
+
//uncomment for demo 1
-
- private void test(JavaTestComponent myComponent, ResponseWriter writer) throws IOException {
+
+ private void test(JavaTestComponent myComponent, ResponseWriter writer) throws IOException {
writer.write(MSG2);
writer.write(myComponent.getMarker());
writer.write("<h4 style='color: red;'>TestAttr: " + myComponent.getTestAttr() + " | " + myComponent.getTestAttr3() + "</h4>");
writer.write("<h4>" + myComponent.getTestAttr4() + "</h4>");
}
-
+
public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
log.info("JavaTestRenderer1.encodeEnd");
}
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java Wed May 5 15:29:11 2010
@@ -33,10 +33,12 @@ import org.apache.myfaces.shared_impl.re
* @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 from Renderer 2 </h2>";
- private static final String MSG2 = "<h3> hello world second var <h3>";
+ private static final String MSG2 = "<h3> hello world second var<h3>";
@Override
Modified: myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml?rev=941345&r1=941344&r2=941345&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/branches/1_0_final_prepare/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml Wed May 5 15:29:11 2010
@@ -2,7 +2,10 @@
"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:grv="http://myfaces.apache.org/groovy"
+ xmlns:g="http://java.sun.com/jsf/composite/greet"
+
+ >
<head>
<title>Hello World</title>
</head>
@@ -18,6 +21,9 @@
<h:panelGroup styleClass="stdBox">
<h:messages/>
<h3>Validator Test 1</h3>
+
+ <g:greet2 who="hello world from composite" />
+
<h:outputText id="output1" value="Please enter your name"/>
<h:outputText value="#{javatestbean4.hello}"/>
<h:inputText id="input1" value="#{helloWorld.name}" required="true">