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/01/26 20:13:39 UTC
svn commit: r903370 - in
/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp:
./ WEB-INF/ WEB-INF/facelets/
WEB-INF/groovy/org/apache/myfaces/groovyloader/test/
WEB-INF/java/org/apache/myfaces/javaloader/blog/ WEB-INF/java/or...
Author: werpu
Date: Tue Jan 26 19:13:39 2010
New Revision: 903370
URL: http://svn.apache.org/viewvc?rev=903370&view=rev
Log:
moving the componentOutput into its own taglib definition file
Added:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml
- copied, changed from r901796, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
Removed:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy-taglib.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/tomahawk.taglib.xml
Modified:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
Copied: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml (from r901796, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml?p2=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy&r1=901796&r2=903370&rev=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml Tue Jan 26 19:13:39 2010
@@ -1,4 +1,6 @@
-/*
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
* 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
@@ -15,37 +17,18 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
-package org.apache.myfaces.groovyloader.test
-/**
- * @author Werner Punz
- */
-
-
-class TestBean {
- String helloworld = "hallo ist - die bean"
-
- //note you can add new atrtributes
- //no setter or getter is needed
- //and with a single request you will get the
- //attribute be used in your page
- //give it a try
-
- //String newAttribute = "This is a new attribute"
- //uncomment this and add a control to the page displaying it
-
- public String getHelloworld() {
- return helloworld
- }
-
-
- public String doit() {
- print "doit called"
- return null
- }
-
+-->
- public String getXxx() {
- " Simple text you can change me on the fly"
- }
-}
\ No newline at end of file
+<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
+ version="2.0">
+ <namespace>http://myfaces.apache.org/ext-scripting</namespace>
+ <tag>
+ <tag-name>compilerOutput</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
+ <renderer-type>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-type>
+ </component>
+ </tag>
+</facelet-taglib>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy Tue Jan 26 19:13:39 2010
@@ -21,7 +21,6 @@
* @author Werner Punz
*/
-
class TestBean {
String helloworld = "hallo ist - die bean"
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogEntry.java Tue Jan 26 19:13:39 2010
@@ -21,6 +21,8 @@
/**
* @author werpu2
* @date: 01.09.2009
+ *
+ * This is the domain object we now edit it
*/
public class BlogEntry {
Modified: myfaces/extensions/scripting/trunk/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/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java Tue Jan 26 19:13:39 2010
@@ -101,6 +101,7 @@
/**
* Simple component to be picked up by
*/
+
@FacesComponent("at.irian.JavaTestComponent")
public class JavaTestComponent extends UIInput implements Markable {
@@ -108,7 +109,7 @@
enum PropertyKeys {
- inc, testAttr, testAttr2, testAttr3
+ inc, testAttr, testAttr2, testAttr3, testAttr4
}
public JavaTestComponent() {
@@ -148,11 +149,27 @@
getStateHelper().put(PropertyKeys.testAttr2, testAttr);
}
- public String getTestAttr3() {
+ public String getTestAttr3() {
return (String) getStateHelper().eval(PropertyKeys.testAttr3, "");
}
public void setTestAttr3(String testAttr) {
getStateHelper().put(PropertyKeys.testAttr3, testAttr);
}
+
+ /**
+ * Ok guys, lets add a new attribute to the component
+ * which is displayed in our browser page
+ *
+ * Note we are on jsf 2 level
+ */
+
+ public String getTestAttr4() {
+ return (String) getStateHelper().eval(PropertyKeys.testAttr4, "");
+ }
+
+ public void setTestAttr4(String testAttr) {
+ getStateHelper().put(PropertyKeys.testAttr4, testAttr);
+ }
+
}
Modified: myfaces/extensions/scripting/trunk/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/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java Tue Jan 26 19:13:39 2010
@@ -46,12 +46,15 @@
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
+
private static final String MSG2 = "aaaa Hello world from Renderer 1";
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
JavaTestComponent myComponent = (JavaTestComponent) component;
+
+
ResponseWriter writer = context.getResponseWriter();
test(myComponent, writer);
@@ -63,6 +66,8 @@
writer.write(MSG2);
writer.write(myComponent.getMarker());
writer.write("<h1/>TestAttr: "+myComponent.getTestAttr()+" | "+myComponent.getTestAttr3()+"</h1>");
+ /*lets add the new attribute as extra output*/
+ writer.write("<h2>"+myComponent.getTestAttr4()+"</h2>");
}
public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Tue Jan 26 19:13:39 2010
@@ -33,7 +33,6 @@
</context-param>
- <!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -70,7 +69,6 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- -->
<!--
<context-param>
@@ -108,7 +106,7 @@
</context-param>
<context-param>
<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
- <param-value>/WEB-INF/groovy-taglib.xml</param-value>
+ <param-value>/WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/extscripting.taglib.xml</param-value>
</context-param>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/componentTest.xhtml Tue Jan 26 19:13:39 2010
@@ -9,7 +9,9 @@
<body>
<ui:composition template="/template2.xhtml">
<ui:define name="body">
- <grv:testcomponent2 testAttr="vvv" testAttr3="Attribute 3 set"/>
+ <!-- also we need to add some values here -->
+ <grv:testcomponent2 testAttr="vvv" testAttr3="Attribute 3 set"
+ testAttr4="Attribute 4 set and showing"/>
</ui:define>
</ui:composition>
</body>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml?rev=903370&r1=903369&r2=903370&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml Tue Jan 26 19:13:39 2010
@@ -2,7 +2,7 @@
"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:grv = "http://myfaces.apache.org/groovy"
+ xmlns:exs = "http://myfaces.apache.org/ext-scripting"
xmlns:h="http://java.sun.com/jsf/html">
<head>
@@ -19,7 +19,7 @@
<h3>
<h:outputFormat value="Compiler Output" escape="false"/>
</h3>
- <grv:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
+ <exs:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
</h:panelGroup>
<h1>