myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r906241 [4/4] - in /myfaces/tomahawk/trunk/examples/simple20/src/main: java/org/apache/myfaces/examples/inputtextdisabled/ java/org/apache/myfaces/examples/listexample/ java/org/apache/myfaces/examples/picklist/ java/org/apache/myfaces/exam...
Date Wed, 03 Feb 2010 21:05:00 GMT
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testExceptions.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testExceptions.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testExceptions.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testExceptions.jsp Wed Feb  3
21:04:57 2010
@@ -1,6 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,34 +26,26 @@
  * under the License.
  */
 //-->
-<html>
-
-	<%@include file="inc/head.inc" %>
-
 <body>
-  	<f:view>	
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
   		<h:form>
 	  		<h:panelGrid columns="1">
 				<h:outputText value="Test if the custom error page correctly works" />
-				
+
 				<h:outputText value="Exceptions without text:" />
 		  		<h:commandButton action="#{testException.npe}" value="simple npe"/>
 		  		<h:commandButton action="#{testException.wrappedRuntimeNpe}" value="wrapped npe
in runtime exception"/>
 		  		<h:commandButton action="#{testException.wrappedServletNpe}" value="wrapped npe
in ServletException"/>
-		  		
+
 				<h:outputText value="Exceptions with text:" />
-		  		
+
 		  		<h:commandButton action="#{testException.npeTxt}" value="simple npe"/>
 		  		<h:commandButton action="#{testException.wrappedRuntimeNpeTxt}" value="wrapped npe
in runtime exception"/>
 		  		<h:commandButton action="#{testException.wrappedServletNpeTxt}" value="wrapped npe
in ServletException"/>
 		  	</h:panelGrid>
 		  </h:form>
-
-          <jsp:include page="inc/mbean_source.jsp"/>
-          
-      </f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testlist.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testlist.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testlist.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testlist.jsp Wed Feb  3 21:04:57
2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,24 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<STYLE TYPE="text/css">
-  .test { color: red }
-</STYLE>
-
-<!--
-managed beans used:
-    countryList
--->
-
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
     <t:dataList id="data2"
         styleClass="standardList"
         itemStyleClass="test"
@@ -50,15 +37,9 @@
         layout="unorderedList" forceId="true">
            <h:outputText value="#{country.name}" />
     </t:dataList>
-
-    <jsp:include page="inc/mbean_source.jsp"/>
-    
-
-</f:view>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
 
 
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/toggleLink.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/toggleLink.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/toggleLink.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/toggleLink.jsp Wed Feb  3 21:04:57
2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,16 +26,13 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-	<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 		<h:form>
 			<h:outputText value="Allows toggling between View/Edit modes. Click on the link to
enter a value. An entry less than 5 characters triggers validation error. When the page is
re-displayed after a validation error, the component 'remembers' that it is in Edit mode.
"/>
 
-			<f:verbatim> <br/><br/> </f:verbatim>
+			<br/><br/>
 
 			<t:togglePanel>
 				<t:toggleLink for="code">
@@ -49,8 +50,10 @@
 			</t:togglePanel>
 			<t:messages showDetail="true"/>
 			<h:commandButton value="Update"/>
-			
-			<f:verbatim> <br/><hr/><br/> </f:verbatim>
+
+			<br/>
+            <hr/>
+            <br/>
 
 			<t:togglePanel>
 				<t:toggleGroup>
@@ -67,14 +70,12 @@
 					<h:outputLabel for="lastName" value="Last Name"/>
 					<t:inputText id="lastName"	value="#{toggleBean.lastName}"/>
 
-					<h:commandButton value="Update"/>	
+					<h:commandButton value="Update"/>
 				</t:div>
 			</t:togglePanel>
 
 		</h:form>
-	</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
-
-<%@include file="inc/page_footer.jsp" %>
-
 </html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree.jsp Wed Feb  3 21:04:57
2010
@@ -1,11 +1,11 @@
-<%@ page import="org.apache.myfaces.custom.tree.DefaultMutableTreeNode,
-                 org.apache.myfaces.custom.tree.model.DefaultTreeModel"%>
-<%@ page session="true" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,27 +26,19 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-<f:view>
-
-    <h:form>
-        <t:tree id="tree" value="#{tree1Backer.treeModel}"
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+    <h:form id="treeform">
+        <t:tree id="tree1" value="#{tree1Backer.treeModel}"
             styleClass="tree"
             nodeClass="treenode"
             selectedNodeClass="treenodeSelected"
-            expandRoot="true">
+            expandRoot="true"
+                forceid="true">
         </t:tree>
     </h:form>
-
-    <jsp:include page="inc/mbean_source.jsp"/>        
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2.jsp Wed Feb  3 21:04:57
2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,24 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
-
-    <!-- Expand/Collapse Handled By Client -->
-
-    <%--
-    NOTE: There is no commandLink for the folders because the toggling of expand/collapse
is handled on the client
-    via javascript.  We have a command link for document but that is really application specific.
 In a real application
-    you would likely specify an action method/listener and do something interesting with
the node identifier that is
-    submitted.
-
-    First child in the expand/collapse facet should be image (if any)
-    --%>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
     <span style="font-family:verdana">
         <b>Tree2 w/client-side (default) toggle</b><br/>
     </span>
@@ -98,7 +87,7 @@
         <b>Tree2 w/server-side toggle</b><br/>
     </span>
     <br/>
-    
+
     <!-- Expand/Collapse Handled By Server -->
     <t:tree2 id="serverTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t"
clientSideToggle="false">
         <f:facet name="person">
@@ -135,14 +124,7 @@
         </f:facet>
     </t:tree2>
 </h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>    
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2ExpandAll.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2ExpandAll.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2ExpandAll.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2ExpandAll.jsp Wed Feb  3
21:04:57 2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,14 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 	<h:form>
     <span style="font-family:verdana">
         <b>Tree2 w/expand all</b><br/>
@@ -90,14 +89,7 @@
         </h:panelGrid>
 
     </h:form>
-
-    <jsp:include page="inc/mbean_source.jsp"/>        
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2HideRoot.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2HideRoot.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2HideRoot.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2HideRoot.jsp Wed Feb  3
21:04:57 2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,13 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 <h:form>
 
     <span style="font-family:verdana">
@@ -84,14 +84,7 @@
     </t:tree2>
 
 </h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>    
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NiceWrap.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NiceWrap.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NiceWrap.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NiceWrap.jsp Wed Feb  3
21:04:57 2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,13 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 <h:form>
 
     <span style="font-family:verdana">
@@ -76,16 +76,9 @@
             </f:facet>
         </t:tree2>
     </h:panelGrid>
-    
-</h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>    
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
 
+</h:form>
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NoNav.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NoNav.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NoNav.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NoNav.jsp Wed Feb  3 21:04:57
2010
@@ -1,7 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,13 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 <h:form>
 
     <t:tree2 id="serverTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t"
clientSideToggle="false" showNav="false">
@@ -38,7 +38,7 @@
                     <t:graphicImage value="/images/yellow-folder-open.png" rendered="#{t.nodeExpanded}"
border="0"/>
                     <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded}"
border="0"/>
                 </h:commandLink>
-                <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded
&& node.leaf}" border="0"/>                
+                <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded
&amp;&amp; node.leaf}" border="0"/>
                 <h:outputText value="#{node.description}" styleClass="nodeFolder"/>
             </h:panelGroup>
         </f:facet>
@@ -48,18 +48,18 @@
                     <t:graphicImage value="/images/yellow-folder-open.png" rendered="#{t.nodeExpanded}"
border="0"/>
                     <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded}"
border="0"/>
                 </h:commandLink>
-                <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded
&& node.leaf}" border="0"/>
+                <t:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded
&amp;&amp; node.leaf}" border="0"/>
                 <h:outputText value="#{node.description}" styleClass="nodeFolder"/>
                 <h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty
node.children}"/>
             </h:panelGroup>
         </f:facet>
         <f:facet name="bar-folder">
             <h:panelGroup>
-                <h:commandLink immediate="true" action="#{t.toggleExpanded}" rendered="#{!node.leaf}">
               
+                <h:commandLink immediate="true" action="#{t.toggleExpanded}" rendered="#{!node.leaf}">
                     <t:graphicImage value="/images/blue-folder-open.gif" rendered="#{t.nodeExpanded}"
border="0"/>
                     <t:graphicImage value="/images/blue-folder-closed.png" rendered="#{!t.nodeExpanded}"
border="0"/>
-                </h:commandLink>                    
-                <t:graphicImage value="/images/blue-folder-closed.png" rendered="#{!t.nodeExpanded
&& node.leaf}" border="0"/>
+                </h:commandLink>
+                <t:graphicImage value="/images/blue-folder-closed.png" rendered="#{!t.nodeExpanded
&amp;&amp; node.leaf}" border="0"/>
                 <h:outputText value="#{node.description}" styleClass="nodeFolder"/>
                 <h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty
node.children}"/>
             </h:panelGroup>
@@ -76,14 +76,7 @@
     </t:tree2>
 
 </h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>
-    
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/treeTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/treeTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/treeTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/treeTable.jsp Wed Feb  3 21:04:57
2010
@@ -1,9 +1,11 @@
-<%@ page session="true" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,13 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 <h:form>
         <t:tree id="tree" value="#{treeTable.treeModel}"
                     var="treeItem"
@@ -65,13 +63,7 @@
         </f:facet>
     </t:tree>
 </h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>    
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/validate.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/validate.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/validate.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/validate.jsp Wed Feb  3 21:04:57
2010
@@ -1,13 +1,11 @@
-<%@ page import="java.math.BigDecimal,
-                 java.util.Date" %>
-<%@ page session="false" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<html>
-
-<%@ include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!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:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,18 +26,9 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<!--
-managed beans used:
-    validateForm
--->
-
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
     <h:panelGroup id="body">
 
         <t:messages showDetail="true" showSummary="false"/>
@@ -92,13 +81,7 @@
         </h:form>
 
     </h:panelGroup>
-
-    <jsp:include page="inc/mbean_source.jsp"/>        
-
-</f:view>
-
-<%@ include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>



Mime
View raw message