https://issues.apache.org/jira/browse/EXTSCRIPT-130
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@941343 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml b/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
index 407dd80..ea514b2 100644
--- a/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
+++ b/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
@@ -77,6 +77,12 @@
</factory>
+ <application>
+ <resource-handler>
+ org.apache.myfaces.extensions.scripting.jsf2.resources.SourceResourceHandler
+ </resource-handler>
+ </application>
+
<!--
<application>
<system-event-listener>
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 3ca119e..fd13464 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
@@ -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>
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 fd3992e..6e984ee 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,11 +32,12 @@
* @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 from Renderer 2 </h2>";
- private static final String MSG2 = "<h3> hello world second var <h3>";
+ private static final String MSG = "<h2> Hello world ccc from Renderer 2 </h2>";
+ private static final String MSG2 = "<h3> hello world second var xxx<h3>";
@Override
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
index 3833c74..5168f27 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
@@ -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">
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet.xhtml
new file mode 100644
index 0000000..a2904c8
--- /dev/null
+++ b/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet.xhtml
@@ -0,0 +1,20 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+<head>
+ <title>My First Composite Component</title>
+</head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="who"/>
+</composite:interface>
+
+<composite:implementation>
+ <h:outputText value="Hello composite change, #{cc.attrs.who}!"/>
+</composite:implementation>
+
+</body>
+</html>
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet2.xhtml b/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet2.xhtml
new file mode 100644
index 0000000..3663cf0
--- /dev/null
+++ b/extscript-examples/myfaces20-example/src/main/webapp/resources/greet/greet2.xhtml
@@ -0,0 +1,20 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+<head>
+ <title>My First Composite Component</title>
+</head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="who"/>
+</composite:interface>
+
+<composite:implementation>
+ <h:outputText value="Hello composite greet2, #{cc.attrs.who}!"/>
+</composite:implementation>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3b1c59e..ab678cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,12 @@
<artifactId>taglist-maven-plugin</artifactId>
<configuration>
- <tags>TODO, FIXME, XXX, @deprecated</tags>
+ <tags>
+ <tag>TODO</tag>
+ <tag>FIXME</tag>
+ <tag>XXX</tag>
+ <tag>@deprecated</tag>
+ </tags>
</configuration>
</plugin>
