myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r906241 [3/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/panelnavigation_1.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_1.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_1.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_1.jsp Wed Feb  3 21:04:57 2010
@@ -1,12 +1,11 @@
-
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-<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
@@ -27,65 +26,57 @@
  * under the License.
  */
 //-->
-
 <body>
-<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:div id="subnavigation_outer">
-    <t:div id="subnavigation">
-        <h:form>
-    <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected" openItemClass="selected" >
-		<t:commandNavigation2  value="#{example_messages['panelnav_products']}" action="go_panelnavigation_1" >
-            <t:commandNavigation2 action="#{navigationMenu.getAction1}" actionListener="#{navigationMenu.actionListener}">
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="#{example_messages['panelnav_serach1']}" />
-            </t:commandNavigation2>
-            <t:commandNavigation2 actionListener="#{navigationMenu.actionListener}" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="#{example_messages['panelnav_serach_acc1']}" />
-            </t:commandNavigation2>
-            <t:commandNavigation2 action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="#{example_messages['panelnav_search_adv1']}" />
-            </t:commandNavigation2>
-        </t:commandNavigation2>
-        <t:commandNavigation2 value="#{example_messages['panelnav_shop']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" />
-        <t:commandNavigation2 value="#{example_messages['panelnav_corporate']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
-            <t:commandNavigation2 action="go_panelnavigation_1" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="#{example_messages['panelnav_news1']}" />
-            </t:commandNavigation2>
-            <t:commandNavigation2 action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="#{example_messages['panelnav_investor1']}" />
-            </t:commandNavigation2>
-        </t:commandNavigation2>
-        <t:commandNavigation2 value="#{example_messages['panelnav_contact']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" />
-    </t:panelNavigation2>
-        <f:verbatim><br/></f:verbatim>
-    <t:panelNavigation2 id="nav2" layout="list" styleClass="mypage" >
-        <t:commandNavigation2 value="MyAccount" action="go_panelnavigation_1" >
-            <t:commandNavigation2 action="go_panelnavigation_1" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="Login" />
-            </t:commandNavigation2>
-            <t:commandNavigation2 action="go_panelnavigation_1" >
-                <f:verbatim>&#8250; </f:verbatim>
-                <t:outputText value="Register" />
-            </t:commandNavigation2>
-        </t:commandNavigation2>
-    </t:panelNavigation2>
-        </h:form>
-    </t:div>
+        <t:div id="subnavigation">
+            <h:form>
+        <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected" openItemClass="selected" >
+            <t:commandNavigation2  value="#{example_messages['panelnav_products']}" action="go_panelnavigation_1" >
+                <t:commandNavigation2 action="#{navigationMenu.getAction1}" actionListener="#{navigationMenu.actionListener}">
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="#{example_messages['panelnav_serach1']}" />
+                </t:commandNavigation2>
+                <t:commandNavigation2 actionListener="#{navigationMenu.actionListener}" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="#{example_messages['panelnav_serach_acc1']}" />
+                </t:commandNavigation2>
+                <t:commandNavigation2 action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="#{example_messages['panelnav_search_adv1']}" />
+                </t:commandNavigation2>
+            </t:commandNavigation2>
+            <t:commandNavigation2 value="#{example_messages['panelnav_shop']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" />
+            <t:commandNavigation2 value="#{example_messages['panelnav_corporate']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
+                <t:commandNavigation2 action="go_panelnavigation_1" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="#{example_messages['panelnav_news1']}" />
+                </t:commandNavigation2>
+                <t:commandNavigation2 action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="#{example_messages['panelnav_investor1']}" />
+                </t:commandNavigation2>
+            </t:commandNavigation2>
+            <t:commandNavigation2 value="#{example_messages['panelnav_contact']}" action="go_panelnavigation_1" actionListener="#{navigationMenu.actionListener}" />
+        </t:panelNavigation2>
+            <f:verbatim><br/></f:verbatim>
+        <t:panelNavigation2 id="nav2" layout="list" styleClass="mypage" >
+            <t:commandNavigation2 value="MyAccount" action="go_panelnavigation_1" >
+                <t:commandNavigation2 action="go_panelnavigation_1" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="Login" />
+                </t:commandNavigation2>
+                <t:commandNavigation2 action="go_panelnavigation_1" >
+                    <f:verbatim>&#8250; </f:verbatim>
+                    <t:outputText value="Register" />
+                </t:commandNavigation2>
+            </t:commandNavigation2>
+        </t:panelNavigation2>
+            </h:form>
+        </t:div>
     </t:div>
-
-    <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/panelnavigation_2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_2.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_2.jsp Wed Feb  3 21:04:57 2010
@@ -1,12 +1,11 @@
-
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-<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
@@ -27,29 +26,20 @@
  * under the License.
  */
 //-->
-
 <body>
-<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:div id="subnavigation_outer">
-    <t:div id="subnavigation">
-    <h:form>
-    <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected"
-                         disabledStyle="color:red;padding: 2px 20px 2px 25px">
-        <t:navigationMenuItems id="navitems" value="#{navigationMenu.panelNavigationItems}" />
-    </t:panelNavigation2>
-    </h:form>
+        <t:div id="subnavigation">
+            <h:form>
+                <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected"
+                                     disabledStyle="color:red;padding: 2px 20px 2px 25px">
+                    <t:navigationMenuItems id="navitems" value="#{navigationMenu.panelNavigationItems}" />
+                </t:panelNavigation2>
+            </h:form>
+        </t:div>
     </t:div>
-    </t:div>
-
-    <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/panelnavigation_3.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_3.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_3.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_3.jsp Wed Feb  3 21:04:57 2010
@@ -1,12 +1,11 @@
-
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-<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
@@ -27,29 +26,20 @@
  * under the License.
  */
 //-->
-
 <body>
-<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:outputText value="test" />
     <t:div id="subnavigation_outer">
-    <t:div id="subnavigation">
-    <h:form>
-    <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected" openItemClass="selected" >
-        <t:navigationMenuItems value="#{navigationMenu.panelNavigationItems}" />
-    </t:panelNavigation2>
-    </h:form>
+        <t:div id="subnavigation">
+            <h:form>
+                <t:panelNavigation2 id="nav1" layout="list" itemClass="mypage" activeItemClass="selected" openItemClass="selected" >
+                    <t:navigationMenuItems value="#{navigationMenu.panelNavigationItems}" />
+                </t:panelNavigation2>
+            </h:form>
+        </t:div>
     </t:div>
-    </t:div>
-
-    <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/panelnavigation_4.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_4.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_4.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_4.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
-<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
@@ -26,15 +26,11 @@
  * under the License.
  */
 //-->
-
 <body>
-<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:div id="hNav_outer">
-    <h:form id="form1">    
+    <h:form id="form1">
         <t:panelNavigation2 id="nav1" layout="list" itemClass="off" activeItemClass="on" openItemClass="on"
                             renderAll="true">
             <t:commandNavigation2 value="#{example_messages['panelnav_products']}" style="padding-left: 0px;">
@@ -68,12 +64,7 @@
         </t:panelNavigation2>
     </h:form>
     </t:div>
-
-    <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/panelnavigation_5.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_5.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_5.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_5.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
-<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
@@ -26,12 +26,9 @@
  * under the License.
  */
 //-->
-
 <body>
-<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:div id="subnavigation_outer">
         <t:div id="subnavigation">
             <h:form>
@@ -90,12 +87,7 @@
             </h:form>
         </t:div>
     </t:div>
-
-    <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/picklist.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/picklist.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/picklist.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/picklist.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,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:selectManyPicklist size="5" valueChangeListener="#{picklistBean.selectionChanged}">
            <f:selectItem itemValue="option1" itemLabel="Option 1" />
@@ -38,15 +36,12 @@
            <f:selectItem itemValue="option3" itemLabel="Option 3" />
            <f:selectItems value="#{picklistBean.testList}"/>
         </t:selectManyPicklist>
-        
+
         <h:commandButton value="Submit" action="none"/>
-        
+
         <h:outputText value="#{picklistBean.selectedInfo}"/>
     </h:form>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/popup.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/popup.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/popup.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/popup.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,11 +26,10 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<f:view>
-    <h:outputText value="Mouse over the country name, abbreviation and the text
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+     <h:outputText value="Mouse over the country name, abbreviation and the text
                          'Country ID' to see three different popups."/>
     <t:dataTable id="data"
             styleClass="standardTable"
@@ -172,13 +169,7 @@
             </t:popup>
 
         </h:panelGrid>
-
-    <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/resources/css/basic.css
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css Wed Feb  3 21:04:57 2010
@@ -644,3 +644,27 @@
     }
 
     */
+table.background td.evenReddish,
+table.background td.unevenReddish,
+table.background td.freeReddish {
+    font-family: Verdana, Arial, Helvetica, Sans-Serif;
+    font-size: 10px;
+    text-align: center;
+}
+
+table.background td.unevenReddish {
+    background-color: rgb(240,220,220);
+    color: rgb(230,220,220);
+}
+
+table.background td.evenReddish {
+    background-color: rgb(255,230,230);
+    color: rgb(240,230,230);
+}
+
+table.background td.freeReddish {
+	background-color: rgb(255,0,0);
+	color: rgb(255,0,0);
+}
+
+.test { color: red }

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample1.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample1.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample1.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample1.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,13 +26,9 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<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:saveState id="save1" value="#{calcForm.number1}" />
@@ -43,34 +37,31 @@
 
         <t:messages id="messageList" styleClass="error" summaryFormat="{0} in {1}" />
 
-        <f:verbatim>
-            <h4>
-        </f:verbatim>
+        <h4>
                 <h:outputText value="#{example_messages['sample1_form']}"/>
-        <f:verbatim>
             </h4>
             <table border="1"><tr><td>
-        </f:verbatim>
 
         <h:form id="form1">
             <h:outputLabel for="form1:number1" value="#{example_messages['sample1_number']} 1" />
-            <h:outputText value="#{validationController.number1ValidationLabel}"/>
-            <f:verbatim>: </f:verbatim>
+            <h:outputText value="#{validationController.number1ValidationLabel}: "/>
             <h:inputText id="number1" value="#{calcForm.number1}" maxlength="10" size="25" required="true" >
                <f:validateLongRange minimum="1" maximum="10" />
             </h:inputText>
-            <h:message id="number1Error" for="form1:number1" styleClass="error" /><f:verbatim><br></f:verbatim>
+            <h:message id="number1Error" for="form1:number1" styleClass="error" />
+            <br/>
 
             <h:outputLabel for="form1:number2" value="#{example_messages['sample1_form']} 2" />
-            <h:outputText value="#{validationController.number2ValidationLabel}"/>
-            <f:verbatim>: </f:verbatim>
+            <h:outputText value="#{validationController.number2ValidationLabel}: "/>
             <h:inputText id="number2" value="#{calcForm.number2}" maxlength="10" size="25" required="true" >
                <f:validateLongRange minimum="20" maximum="50" />
             </h:inputText>
-            <h:message id="number2Error" for="form1:number2" styleClass="error" /><f:verbatim><br></f:verbatim>
+            <h:message id="number2Error" for="form1:number2" styleClass="error" />
+            <br/>
 
-            <h:outputLabel for="form1:result" value="#{example_messages['sample1_result']}" /><f:verbatim>: </f:verbatim>
-            <h:outputText id="result" value="#{calcForm.result}" /><f:verbatim><br></f:verbatim>
+            <h:outputLabel for="form1:result" value="#{example_messages['sample1_result']}: " />
+            <h:outputText id="result" value="#{calcForm.result}" />
+            <br/>
 
             <h:commandButton id="addButton" value="#{example_messages['sample1_add']}" action="none">
                 <f:actionListener type="org.apache.myfaces.examples.example1.CalcActionListener" ></f:actionListener>
@@ -78,77 +69,63 @@
             <h:commandButton id="subtractButton" value="#{example_messages['sample1_sub']}" action="none">
                 <f:actionListener type="org.apache.myfaces.examples.example1.CalcActionListener" ></f:actionListener>
             </h:commandButton>
-            <f:verbatim><br></f:verbatim>
+            <br/>
 
             <h:commandLink id="href1" action="none">
                 <h:outputText value="#{example_messages['sample1_add_link']}"/>
                 <f:actionListener type="org.apache.myfaces.examples.example1.CalcActionListener" ></f:actionListener>
-            </h:commandLink><f:verbatim><br></f:verbatim>
+            </h:commandLink>
+            <br/>
             <h:commandLink id="href2" action="none">
                 <h:outputText value="#{example_messages['sample1_sub_link']}"/>
                 <f:actionListener type="org.apache.myfaces.examples.example1.CalcActionListener" ></f:actionListener>
             </h:commandLink>
         </h:form>
 
-        <f:verbatim>
-            </td></tr></table>
-            <h4>
-        </f:verbatim>
-            <h:outputText value="#{example_messages['sample1_another_form']}"/>
-        <f:verbatim>
-            </h4>
-            <table border="1"><tr><td>
-        </f:verbatim>
+
+        </td></tr></table>
+        <h4>
+        <h:outputText value="#{example_messages['sample1_another_form']}"/>
+        </h4>
+        <table border="1"><tr><td>
 
         <h:form id="form2">
             <h:outputLabel for="form2:text" value="#{example_messages['sample1_text']}" />
-            <h:outputText value="#{validationController.textValidationLabel}"/>
-            <f:verbatim>: </f:verbatim>
+            <h:outputText value="#{validationController.textValidationLabel}: "/>
             <h:inputText id="text" value="#{ucaseForm.text}">
                 <f:validateLength minimum="3" maximum="7"/>
             </h:inputText>
-            <h:message id="textError" for="form2:text" styleClass="error" /><f:verbatim><br></f:verbatim>
+            <h:message id="textError" for="form2:text" styleClass="error" />
+            <br/>
             <h:commandButton id="ucaseButton" value="#{example_messages['sample1_uppercase']}" action="none">
                 <f:actionListener type="org.apache.myfaces.examples.example1.UCaseActionListener" />
             </h:commandButton>
             <h:commandButton id="lcaseButton" value="#{example_messages['sample1_lowercase']}" action="none">
                 <f:actionListener type="org.apache.myfaces.examples.example1.UCaseActionListener" />
             </h:commandButton>
-            <f:verbatim><br></f:verbatim>
+            <br/>
         </h:form>
 
-        <f:verbatim>
-            </td></tr></table>
-            <h4>
-        </f:verbatim>
-            <h:outputText value="#{example_messages['sample1_validation']}"/>
-        <f:verbatim>
-            </h4>
-            <table border="1"><tr><td>
-        </f:verbatim>
+        </td></tr></table>
+        <h4>
+        <h:outputText value="#{example_messages['sample1_validation']}"/>
+        </h4>
+        <table border="1"><tr><td>
 
         <h:form id="form3">
             <h:commandButton id="valDisable" value="#{example_messages['sample1_disable_validation']}" action="#{validationController.disableValidation}" />
             <h:commandButton id="valEnable" value="#{example_messages['sample1_enable_validation']}" action="#{validationController.enableValidation}" />
         </h:form>
 
-        <f:verbatim>
-            </td></tr></table>
-        </f:verbatim>
+        </td></tr></table>
 
-        <f:verbatim><br></f:verbatim>
+        <br/>
         <h:form>
-	        <h:commandLink id="jump_home" action="#{ucaseForm.jumpHome}" ><f:verbatim>Go Home</f:verbatim></h:commandLink>
+	        <h:commandLink id="jump_home" action="#{ucaseForm.jumpHome}" >Go Home</h:commandLink>
         </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>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample2.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample2.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,20 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<!--
-managed beans used:
-    q_form
--->
-
-<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">
 
         <h:messages id="messageList" />
@@ -46,10 +37,11 @@
             <h:inputTextarea id="text"
                               rows="5"
                               value="#{q_form.text}" required="true" />
-            <f:verbatim><br><br></f:verbatim>
+            <br/>
+            <br/>
             <h:selectOneMenu id="oneoption" value="#{q_form.quoteChar}" >
                 <f:selectItem itemValue="" itemLabel="#{example_messages['sample2_select_quote']}" />
-                <f:selectItem itemValue="\"" itemLabel="Double" />
+                <f:selectItem itemValue="&quot;" itemLabel="Double" />
                 <f:selectItem itemValue="'" itemLabel="Single" />
                 <f:selectItems value="#{q_form.selectOneItems}" />
             </h:selectOneMenu>
@@ -57,25 +49,21 @@
                 <f:actionListener type="org.apache.myfaces.examples.example2.QuotationController" ></f:actionListener>
             </h:commandButton>
 
-            <f:verbatim><br><br></f:verbatim>
+            <br/>
+            <br/>
             <h:selectManyListbox id="manyoptions" value="#{q_form.selectManyValues}" >
                 <f:selectItem itemValue="" itemLabel="#{example_messages['sample2_select_unquote']}" />
                 <f:selectItems value="#{q_form.selectManyItems}" />
             </h:selectManyListbox>
-            <h:commandButton id="button2" value="#{example_messages['sample2_remove_quote']}" action="none"><f:verbatim><br></f:verbatim>
+            <h:commandButton id="button2" value="#{example_messages['sample2_remove_quote']}" action="none">
+                <br/>
                 <f:actionListener type="org.apache.myfaces.examples.example2.QuotationController" ></f:actionListener>
             </h:commandButton>
 
         </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>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.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,11 +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>
 		<!--  The schedule itself -->
 		<t:div style="position: absolute; left: 220px; top: 5px; right: 5px;">
@@ -47,13 +49,9 @@
 					actionListener="#{scheduleHandler1.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
-    <%@include file="/inc/page_footer.jsp" %>
-    <jsp:include page="inc/mbean_source.jsp"/>
 		</t:div>
 	</h:form>
-
-    
-
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.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,12 +26,10 @@
  * under the License.
  */
 //-->
-
-<html>
-<%@include file="/inc/head.inc"%>
 <body>
-<f:view>
-	<h:form>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+ 	<h:form>
 		<!--  The schedule itself -->
 		<t:div style="position: absolute; left: 220px; top: 5px; right: 5px;">
 			<t:schedule value="#{scheduleHandler1.model}" id="schedule1"
@@ -48,10 +50,9 @@
 					value="delete selected entry"
 					rendered="#{scheduleHandler1.model.entrySelected}"/>
 			</h:panelGrid>
-		    <%@include file="/inc/page_footer.jsp" %>
-		    <jsp:include page="inc/mbean_source.jsp"/>
 		</t:div>
 	</h:form>
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.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,11 +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>
 		<!--  The schedule itself -->
 		<t:div style="position: absolute; left: 220px; top: 5px; right: 5px;">
@@ -60,11 +62,9 @@
 					action="edit_settings"
 					value="Schedule properties..." />
 			</h:panelGrid>
-			<%@include file="/inc/page_footer.jsp"%>
-		    <jsp:include page="inc/mbean_source.jsp"/>
 		</t:div>
 	</h:form>
-
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.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,39 +26,9 @@
  * under the License.
  */
 //-->
-
-<html>
-<head>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8" />
-<title>MyFaces - the free JSF Implementation</title>
-<link rel="stylesheet" type="text/css" href="css/basic.css" />
-<style>
-table.background td.evenReddish,
-table.background td.unevenReddish,
-table.background td.freeReddish {
-    font-family: Verdana, Arial, Helvetica, Sans-Serif;
-    font-size: 10px;
-    text-align: center;
-}
-
-table.background td.unevenReddish {
-    background-color: rgb(240,220,220);
-    color: rgb(230,220,220);
-}
-
-table.background td.evenReddish {
-    background-color: rgb(255,230,230);
-    color: rgb(240,230,230);
-}
-
-table.background td.freeReddish {
-	background-color: rgb(255,0,0);
-	color: rgb(255,0,0);
-}
-  </style>
-</head>
 <body>
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
 	<h:form>
 		<!--  The schedule itself -->
 		<t:div style="position: absolute; left: 220px; top: 5px; right: 5px;">
@@ -77,11 +51,9 @@
 					actionListener="#{scheduleHandler1.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
-			<%@include file="/inc/page_footer.jsp"%>
-		    <jsp:include page="inc/mbean_source.jsp"/>
 		</t:div>
 	</h:form>
-
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.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,11 +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>
 		<!--  The schedule itself -->
 		<t:div style="position: absolute; left: 220px; top: 5px; right: 5px;">
@@ -61,10 +63,9 @@
 					actionListener="#{bindingScheduleHandler.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
-		    <%@include file="/inc/page_footer.jsp" %>
-		    <jsp:include page="inc/mbean_source.jsp"/>
 		</t:div>
 	</h:form>
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_addentry.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_addentry.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_addentry.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_addentry.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,11 +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:htmlTag value="h3">Add entry</t:htmlTag>
 		<h:messages tooltip="true" layout="table" globalOnly="true" />
@@ -54,9 +56,7 @@
 			<h:commandButton action="cancel" value="cancel" immediate="true"/>
 		</h:panelGrid>
 	</h:form>
-<%@include file="/inc/page_footer.jsp"%>
-<jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_editsettings.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_editsettings.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_editsettings.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_editsettings.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,11 +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:htmlTag value="h3">Edit settings</t:htmlTag>
 		<h:messages tooltip="true" layout="table" globalOnly="false" />
@@ -115,10 +117,7 @@
 			<h:commandButton action="#{scheduleSettings2.save}" value="save" />
 		</h:panelGrid>
 	</h:form>
-	<%@include file="/inc/page_footer.jsp"%>
-
-    <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
+  </ui:define>
+ </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems.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,42 +26,38 @@
  * 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>
-    
+
         <h:outputText value ="List" />
 
         <h:panelGrid columns="1">
           <h:selectOneMenu id="menu1" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carList}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneMenu>
-          
+
           <h:selectOneRadio id="radio1" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carList}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneRadio>
-          
+
           <h:selectOneListbox id="list1" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carList}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneListbox>
         </h:panelGrid>
-        
+
         <h:outputText value ="Map" />
-        
+
         <h:panelGrid columns="1">
           <h:selectOneMenu id="menu2" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carMap}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneMenu>
-          
+
           <h:selectOneRadio id="radio2" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carMap}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneRadio>
-          
+
           <h:selectOneListbox id="list2" value="#{selectItemsBean.selectedCarColor}">
               <t:selectItems value="#{selectItemsBean.carMap}" var="Car" itemLabel="#{Car.type}" itemValue="#{Car.color}" />
           </h:selectOneListbox>
@@ -67,10 +65,7 @@
 
         <h:commandButton value="GO!" action="doSomething"/>
     </h:form>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneCountry.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneCountry.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneCountry.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneCountry.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,30 +26,18 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<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:form>
         <t:selectOneCountry value="#{countryForm.isoCode}" maxLength="25" onchange="this.form.submit();"/>
         <f:verbatim><br/></f:verbatim>
         <h:outputLabel for="countryCode" value="Code : "/>
         <h:outputText id="countryCode" value="#{countryForm.isoCode}"/>
-        <f:verbatim><br/><br/></f:verbatim>
+        <br/><br/>
         <h:commandButton value="Update"/>
     </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/selectOneLanguage.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneLanguage.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneLanguage.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneLanguage.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,31 +26,18 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
-    <h:form>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+     <h:form>
         <t:selectOneLanguage value="#{language.code}" maxLength="25" onchange="this.form.submit();"/>
         <f:verbatim><br/></f:verbatim>
         <h:outputLabel for="languageCode" value="Code : "/>
         <h:outputText id="languageCode" value="#{language.code}"/>
-        <f:verbatim><br/><br/></f:verbatim>
+        <br/><br/>
         <h:commandButton value="Update"/>
     </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/selectOneRow.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneRow.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneRow.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneRow.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,17 +26,11 @@
  * 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>
 
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
     <h:panelGroup id="body">
 
         <t:dataTable id="data"
@@ -135,10 +131,7 @@
 
     </h:panelGroup>
     </h:form>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectbox.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectbox.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectbox.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectbox.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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>
-
+<?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,15 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<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:saveState value="#{carconf}"/>
 
     <t:messages id="messageList" styleClass="error" showDetail="true" summaryFormat="{0} "/>
@@ -76,15 +70,15 @@
                 </h:selectOneRadio>
             </h:panelGroup>
 
-            <h:panelGroup ></h:panelGroup>
-            <h:panelGroup ></h:panelGroup>
+            <h:panelGroup />
+            <h:panelGroup />
 
             <f:verbatim>&nbsp;</f:verbatim>
             <h:panelGrid columns="1"  >
-                <%/* t:selectOneRadio is an extension of h:selectOneRadio
+                <!-- t:selectOneRadio is an extension of h:selectOneRadio
                        if layout="spread" selectitems wont get rendered
                        instead t:radio components are getting rendered
-                */%>
+                -->
                 <t:selectOneRadio id="discount2" value="#{carconf.discount2}" layout="spread" styleClass="selectOneRadio">
                     <f:selectItem itemValue="0" itemLabel="#{example_messages['discount_2_0']}" />
                     <f:selectItem itemValue="1" itemLabel="#{example_messages['discount_2_1']}" />
@@ -94,9 +88,9 @@
                     <t:radio for="discount2" index="2" /><f:verbatim>&nbsp;</f:verbatim>
                     <h:inputText value="#{carconf.bandName}" />
                 </h:panelGroup>
-                <%/* t:radio is a myfaces extension. renders the selectItem at the
+                <!-- t:radio is a myfaces extension. renders the selectItem at the
                      given index (starting with 0). the for attribute must be the id
-                     of the corresponding t:selectOneRadio */%>
+                     of the corresponding t:selectOneRadio -->
                 <t:radio for="discount2" index="0" />
                 <t:radio for="discount2" index="1" />
 
@@ -130,13 +124,7 @@
             <h:outputText value="#{example_messages[interiorColor.color]}"/>
         </h:column>
     </h:dataTable>
-
-    <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/simpleGroupBy.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/simpleGroupBy.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/simpleGroupBy.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/simpleGroupBy.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,15 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<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:dataTable id="data"
                 style="border-collapse:collapse;"
                 styleClass="standardTable"
@@ -60,13 +56,7 @@
 
 
         </t:dataTable>
-
-        <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/sortAutoTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable.jsp Wed Feb  3 21:04:57 2010
@@ -1,10 +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
@@ -25,59 +26,47 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
-    <h:form>    
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+    <h:form>
         <t:dataTable id="data"
-                styleClass="standardTable"            
+                styleClass="standardTable"
                 headerClass="standardTable_SortHeader"
                 footerClass="standardTable_Footer"
                 rowClasses="standardTable_Row1,standardTable_Row2"
-                var="car"                      
-                sortable="true"                       
-                value="#{autosortlist.cars}"                 
-                sortColumn="#{autosortlist.sortColumn}" 
+                var="car"
+                sortable="true"
+                value="#{autosortlist.cars}"
+                sortColumn="#{autosortlist.sortColumn}"
                 sortAscending="#{autosortlist.sortAscending}"
                 preserveDataModel="true"
                 preserveSort="true">
 
             <t:column defaultSorted="true">
-                <f:facet name="header">  
-                    <h:outputText value="ID" />                
+                <f:facet name="header">
+                    <h:outputText value="ID" />
                 </f:facet>
-                <h:outputText value="#{car.id}" />            
+                <h:outputText value="#{car.id}" />
             </t:column>
 
             <t:column>
-                <f:facet name="header">  
-                    <h:outputText value="#{example_messages['sort_cartype']}" />                
+                <f:facet name="header">
+                    <h:outputText value="#{example_messages['sort_cartype']}" />
                 </f:facet>
-                <h:outputText value="#{car.type}" />            
+                <h:outputText value="#{car.type}" />
             </t:column>
 
             <t:column>
                 <f:facet name="header">
-                    <h:outputText value="#{example_messages['sort_carcolor']}" />                
+                    <h:outputText value="#{example_messages['sort_carcolor']}" />
                 </f:facet>
-                <h:outputText value="#{car.color}" />            
+                <h:outputText value="#{car.color}" />
             </t:column>
 
-        </t:dataTable>           
-    </h:form>     
-
-    <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+        </t:dataTable>
+    </h:form>
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable2.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable2.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,58 +26,46 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<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:form>
         <t:dataTable id="data"
-                styleClass="standardTable"            
+                styleClass="standardTable"
                 headerClass="standardTable_SortHeader"
                 footerClass="standardTable_Footer"
                 rowClasses="standardTable_Row1,standardTable_Row2"
-                var="car"                                                        
-                value="#{autosortlist.cars}"                 
-                sortColumn="#{autosortlist.sortColumn}" 
+                var="car"
+                value="#{autosortlist.cars}"
+                sortColumn="#{autosortlist.sortColumn}"
                 sortAscending="#{autosortlist.sortAscending}"
                 preserveDataModel="true"
                 preserveSort="true">
 
             <t:column sortable="true" defaultSorted="true">
-                <f:facet name="header">  
-                    <h:outputText value="ID" />                
+                <f:facet name="header">
+                    <h:outputText value="ID" />
                 </f:facet>
-                <h:outputText value="#{car.id}" />            
+                <h:outputText value="#{car.id}" />
             </t:column>
 
             <t:column>
-                <f:facet name="header">  
-                    <h:outputText value="#{example_messages['sort_cartype']}" />                                
+                <f:facet name="header">
+                    <h:outputText value="#{example_messages['sort_cartype']}" />
                 </f:facet>
-                <h:outputText value="#{car.type}" />            
+                <h:outputText value="#{car.type}" />
             </t:column>
 
             <t:column sortable="true">
                 <f:facet name="header">
-                    <h:outputText value="#{example_messages['sort_carcolor']}" />                
+                    <h:outputText value="#{example_messages['sort_carcolor']}" />
                 </f:facet>
-                <h:outputText value="#{car.color}" />            
+                <h:outputText value="#{car.color}" />
             </t:column>
 
-        </t:dataTable>      
+        </t:dataTable>
     </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/sortTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortTable.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,15 +26,9 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
-
-<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:form>
         <t:dataTable styleClass="standardTable"
                 headerClass="standardTable_SortHeader"
@@ -78,13 +74,7 @@
 
         </t:dataTable>
     </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/subForm.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/subForm.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/subForm.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/subForm.jsp Wed Feb  3 21:04:57 2010
@@ -1,12 +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>
-
-<%@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
@@ -27,10 +26,9 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
     <h:form>
         <h:panelGrid>
             <t:messages showDetail="true" showSummary="false"/>
@@ -43,12 +41,12 @@
                     <h:outputLabel for="lastName" value="Last name:"/>
                     <h:inputText id="lastName" value="#{subFormBean.lastName}" required="true"/>
                     <h:outputText value="Partial condition"/>
-                    <h:selectBooleanCheckbox value="false"                                              
-                                             onchange="personForm_submit();"/>                   
+                    <h:selectBooleanCheckbox value="false"
+                                             onchange="personForm_submit();"/>
                 </h:panelGrid>
                 <h:commandButton value="Show current values of Person"/>
             </t:subform>
-            
+
             <t:subform id="vehicleForm">
                 <h:outputText value="Vehicle" style="font-weight:bold;"/>
                 <h:panelGrid columns="2">
@@ -57,12 +55,12 @@
                     <h:outputLabel for="lastName" value="Make:"/>
                     <h:inputText id="lastName" value="#{subFormBean.make}" required="true"/>
                     <h:outputText value="Partial condition"/>
-                    <h:selectBooleanCheckbox value="false"                                              
-                                             onchange="vehicleForm_submit();"/>  
+                    <h:selectBooleanCheckbox value="false"
+                                             onchange="vehicleForm_submit();"/>
                 </h:panelGrid>
                 <h:commandButton value="Show current values of Vehicle"/>
             </t:subform>
-                       
+
             <t:commandButton value="Show current values of Person" actionFor="personForm"/>
             <t:commandButton value="Show current values of Vehicle" actionFor="vehicleForm"/>
             <t:commandButton value="Show current values of Person and Vehicle (actionFor for both forms set)" actionFor="personForm,vehicleForm"/>
@@ -82,10 +80,7 @@
         </h:panelGrid>
 
     </h:form>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/swapimage.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/swapimage.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/swapimage.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/swapimage.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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>
-
+<?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,21 +26,14 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<f:view>
-
-    <h:messages id="messageList" />
-    <t:swapImage url="images/myfaces_powered.gif" swapImageUrl="images/myfaces_powered_over.gif" border="none" />
-    <t:swapImage url="/images/myfaces_powered.gif" swapImageUrl="/images/myfaces_powered_over.gif" border="none" />
-
-    <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+      <h:messages id="messageList" />
+      <t:swapImage url="images/myfaces_powered.gif" swapImageUrl="images/myfaces_powered_over.gif" border="none" />
+      <t:swapImage url="/images/myfaces_powered.gif" swapImageUrl="/images/myfaces_powered_over.gif" border="none" />
+ 
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tabbedPane.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tabbedPane.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tabbedPane.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tabbedPane.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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>
-
+<?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,49 +26,47 @@
  * 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:saveState id="ss1" value="#{tabbedPaneBean}" />
 
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
     <t:messages id="messageList" showSummary="true" showDetail="true" summaryFormat="{0}:" />
 
 	<f:subview id="panelTabbedPane1">
 	    <h:outputText value="client-side tab switching"/>
-	    
+
 	    <t:panelTabbedPane bgcolor="#FFFFCC" serverSideTabSwitch="false">
-	
-	        <f:verbatim><p></f:verbatim>
+
+	        <p>
 	            <h:outputText value="#{example_messages['tabbed_common']}"/>
-	        <f:verbatim></p></f:verbatim>
-	
-	
+	        </p>
+
+
 	        <t:panelTab id="tab1" label="#{example_messages['tabbed_tab1']}" rendered="#{tabbedPaneBean.tab1Visible}">
 	                <h:selectBooleanCheckbox id="testCheckBox" value="#{testCheckBox.checked}"/><h:outputLabel for="testCheckBox" value="A checkbox"/>
-	                <f:verbatim><br/><br/></f:verbatim>
-	            <h:inputText id="inp1"/><f:verbatim><br></f:verbatim>
+	                <br/><br/>
+	            <h:inputText id="inp1"/><br/>
 	            <h:inputText id="inp2" required="true" /><h:message for="inp2" showSummary="false" showDetail="true" />
 	        </t:panelTab>
-	
+
 	        <f:subview id="tab2" >
-	            <jsp:include page="tab2.jsp"/>
+	            <t:panelTab label="#{example_messages['tabbed_tab2']}" rendered="#{tabbedPaneBean.tab2Visible}">
+                    <h:inputTextarea ></h:inputTextarea>
+                </t:panelTab>
 	        </f:subview>
-	
+
 	        <t:panelTab id="tab3" label="#{example_messages['tabbed_tab3']}" rendered="#{tabbedPaneBean.tab3Visible}">
-	
+
 	            <t:selectOneRadio value="#{testRadioButton.choice}">
 	                    <f:selectItem itemValue="0" itemLabel="First Choice" />
 	                    <f:selectItem itemValue="1" itemLabel="Second Choice" />
 	            </t:selectOneRadio>
-	
-	            <f:verbatim><br/><br/></f:verbatim>
-	
+
+	            <br/><br/>
+
 	            <t:dataTable id="xxx" value="#{testCheckList.testCheckBoxes}"
 	                        var="checkBox"
 	                        preserveDataModel="true"
@@ -87,58 +85,61 @@
 	                    <h:inputText value="#{checkBox.text}"/>
 	                </h:column>
 	            </t:dataTable>
-	
-	                                    <f:verbatim><br/><br/></f:verbatim>
-	
-	            <h:inputText id="inp3"/><f:verbatim><br/></f:verbatim>
+
+	            <br/><br/>
+
+	            <h:inputText id="inp3"/>
+                <br/>
 	        </t:panelTab>
-	
-	        <f:verbatim><br/><hr/><br/></f:verbatim>
-	
+
+	        <br/><hr/><br/>
+
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab1Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible1']}"/>
-	        <f:verbatim><br></f:verbatim>
+	        <br/>
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab2Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible2']}" />
-	        <f:verbatim><br></f:verbatim>
+	        <br/>
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab3Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible3']}" />
-	        <f:verbatim><br></f:verbatim>
-	
+	        <br/>
+
 	        <h:commandButton value="#{example_messages['tabbed_submit']}" />
-	
+
 	    </t:panelTabbedPane>
 	</f:subview>
 	<f:subview id="panelTabbedPane2">
 	    <h:outputText value="server-side tab switching"/>
-	    
+
 	    <t:panelTabbedPane bgcolor="#CCFFFF" serverSideTabSwitch="true">
-	
-	        <f:verbatim><p></f:verbatim>
+
+	        <p>
 	            <h:outputText value="#{example_messages['tabbed_common']}"/>
-	        <f:verbatim></p></f:verbatim>
-	
-	
+	        </p>
+
+
 	        <t:panelTab id="tab1" label="#{example_messages['tabbed_tab1']}" rendered="#{tabbedPaneBean.tab1Visible}">
 	                <h:selectBooleanCheckbox id="testCheckBox" value="#{testCheckBox.checked}"/><h:outputLabel for="testCheckBox" value="A checkbox"/>
-	                <f:verbatim><br/><br/></f:verbatim>
-	            <h:inputText id="inp1"/><f:verbatim><br></f:verbatim>
+	                <br/><br/>
+	            <h:inputText id="inp1"/><br/>
 	            <h:inputText id="inp2" required="true" /><h:message for="inp2" showSummary="false" showDetail="true" />
 	        </t:panelTab>
-	
+
 	        <f:subview id="tab2" >
-	            <jsp:include page="tab2.jsp"/>
+                <t:panelTab label="#{example_messages['tabbed_tab2']}" rendered="#{tabbedPaneBean.tab2Visible}">
+                    <h:inputTextarea ></h:inputTextarea>
+                </t:panelTab>
 	        </f:subview>
-	
+
 	        <t:panelTab id="tab3" label="#{example_messages['tabbed_tab3']}" rendered="#{tabbedPaneBean.tab3Visible}">
-	
+
 	            <t:selectOneRadio value="#{testRadioButton.choice}">
 	                    <f:selectItem itemValue="0" itemLabel="First Choice" />
 	                    <f:selectItem itemValue="1" itemLabel="Second Choice" />
 	            </t:selectOneRadio>
-	
-	            <f:verbatim><br/><br/></f:verbatim>
-	
+
+	            <br/><br/>
+
 	            <t:dataTable id="xxx" value="#{testCheckList.testCheckBoxes}"
 	                        var="checkBox"
 	                        preserveDataModel="true"
@@ -157,37 +158,31 @@
 	                    <h:inputText value="#{checkBox.text}"/>
 	                </h:column>
 	            </t:dataTable>
-	
-	                                    <f:verbatim><br/><br/></f:verbatim>
-	
+
+	           <br/><br/>
+
 	            <h:inputText id="inp3"/><f:verbatim><br/></f:verbatim>
 	        </t:panelTab>
-	
-	        <f:verbatim><br/><hr/><br/></f:verbatim>
-	
+
+	        <br/><hr/><br/>
+
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab1Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible1']}"/>
-	        <f:verbatim><br></f:verbatim>
+	        <br/>
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab2Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible2']}" />
-	        <f:verbatim><br></f:verbatim>
+	        <br/>
 	        <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab3Visible}"/>
 	        <h:outputText value="#{example_messages['tabbed_visible3']}" />
-	        <f:verbatim><br></f:verbatim>
-	
+	        <br/>
+
 	        <h:commandButton value="#{example_messages['tabbed_submit']}" />
-	
+
 	    </t:panelTabbedPane>
 	</f:subview>
 
 </h:form>
-
-<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