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/21 18:26:09 UTC
svn commit: r901784 - in
/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp:
helloWorld.xhtml javablog.xhtml template.xhtml
Author: werpu
Date: Thu Jan 21 17:26:09 2010
New Revision: 901784
URL: http://svn.apache.org/viewvc?rev=901784&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-50
adding compiler output component to the template
Modified:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml?rev=901784&r1=901783&r2=901784&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml Thu Jan 21 17:26:09 2010
@@ -1,41 +1,44 @@
<!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">
+<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">
<head>
-<title>Hello World</title>
+ <title>Hello World</title>
</head>
<body>
-<ui:composition template = "/template.xhtml">
+<ui:composition template="/template.xhtml">
- <ui:define name = "body">
- <h:form id = "form">
- <h:panelGrid id = "grid" columns = "2">
- <h:outputText id = "output1" value = "Please enter your name" />
- <h:inputText id = "input1" value = "#{helloWorld.name}" required = "true">
- <grv:groovyvalidator />
+
+ <ui:define name="body">
+ <h:form id="form">
+ <h:panelGrid id="grid" columns="2">
+ <h:outputText id="output1" value="Please enter your name"/>
+ <h:inputText id="input1" value="#{helloWorld.name}" required="true">
+ <grv:groovyvalidator/>
</h:inputText>
- <h:commandButton id = "button1" value = "press me" action = "#{helloWorld.send}" />
- <grv:testcomponent />
- <h:message id = "message1" for = "input1" />
- <h:outputFormat value = "#{testbean.xxx}" />
- <h:outputFormat value = "#{javatestbean.sayHello}" />
+ <h:commandButton id="button1" value="press me" action="#{helloWorld.send}"/>
+ <grv:testcomponent/>
+ <h:message id="message1" for="input1"/>
+ <h:outputFormat value="#{testbean.xxx}"/>
+ <h:outputFormat value="#{javatestbean.sayHello}"/>
converter:
<h:inputText>
- <grv:testConverter1 />
- <grv:testValidator1 />
+ <grv:testConverter1/>
+ <grv:testValidator1/>
</h:inputText>
- <h:commandButton value = "Press me dynamic" action = "#{testbean.doit}" />
- <grv:testcomponent2 />
+ <h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
+ <grv:testcomponent2 testAttr="vvv" testAttr2="zzz"/>
Resource Handler Test:
- <h:outputFormat value="#{javatestbean.resource}" />
+ <h:outputFormat value="#{javatestbean.resource}"/>
</h:panelGrid>
- </h:form>
- </ui:define>
+
+
+ </h:form>
+ </ui:define>
</ui:composition>
</body>
</html>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml?rev=901784&r1=901783&r2=901784&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml Thu Jan 21 17:26:09 2010
@@ -10,7 +10,6 @@
<ui:composition template = "/template.xhtml">
<ui:define name = "body">
- xxxx
<h:form id = "form">
<h:panelGrid id = "grid" columns = "1">
<h:outputText id = "title1" styleClass = "title" value = "#{javaBlogView.title}" />
@@ -37,7 +36,6 @@
<h:panelGrid columns = "1">
<h:outputText value = "Blog Entries" />
<ui:repeat value = "#{javaBlogService.blogEntries}" var = "item">
- xxx
<h:outputText value = "#{item.topic}" />
<h:outputText value = "#{item.content}" /><br />
</ui:repeat>
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=901784&r1=901783&r2=901784&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 Thu Jan 21 17:26:09 2010
@@ -1,20 +1,33 @@
<!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">
+<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:h="http://java.sun.com/jsf/html">
<head>
-<meta http-equiv = "Content-Type" content = "text/html; charset=iso-8859-1" />
-<title>Myfaces Example Facelets</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+ <title>Myfaces Example Facelets</title>
- <link type="text/css" rel="stylesheet" href="#{resource['styles:main.css']}" />
+ <link type="text/css" rel="stylesheet" href="#{resource['styles:main.css']}"/>
</head>
<body>
-<h1><ui:insert name = "title">Myfaces Example Facelets</ui:insert></h1>
-<p><ui:insert name = "body">Hello World Example!</ui:insert></p>
+<h:panelGroup>
+ <h3>
+ <h:outputFormat value="Compiler Output" escape="false"/>
+ </h3>
+ <grv:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
+</h:panelGroup>
+
+<h1>
+ <ui:insert name="title">Myfaces Example Facelets</ui:insert>
+</h1>
+<p>
+ <ui:insert name="body">Hello World Example!</ui:insert>
+</p>
</body>
</html>