myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r906241 [1/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
Author: lu4242
Date: Wed Feb  3 21:04:57 2010
New Revision: 906241

URL: http://svn.apache.org/viewvc?rev=906241&view=rev
Log:
TOMAHAWK-1488 Convert example pages from JSP to Facelets

Added:
    myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/
    myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/InputTextDisabledBean.java
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/pageLayout.xhtml
Removed:
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/error.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/features.html
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/head.inc
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/mbean_source.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/navigation.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/page_footer.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inc/page_header.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems_f.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tab2.jsp
Modified:
    myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/listexample/OpenDataList.java
    myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/picklist/PicklistBean.java
    myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/webapp/SourceCodeServlet.java
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/examples-config.xml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/web.xml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/buffer.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/calendar.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/captcha.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/collapsiblePanel.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/colspan.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/contact.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/copyright.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryForm.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryTableForm.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/crossDataTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/css.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataList.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataScroller.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/date.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/displayValueOnly.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/div.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/features.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/fileupload.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/filteredStylesheet.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/forceId.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/htmlTag.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml-multiple.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextDisabled.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextHelp.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jscookmenu.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jslistener.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/masterDetail.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/newspaperTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/openDataTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/optDataTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/options.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/pagedSortTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelGroup.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_1.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_2.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_3.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_4.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelnavigation_5.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/picklist.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/popup.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample1.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sample2.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_addentry.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule_editsettings.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectItems.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneCountry.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneLanguage.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectOneRow.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/selectbox.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/simpleGroupBy.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortAutoTable2.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/sortTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/subForm.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/swapimage.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tabbedPane.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testExceptions.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/testlist.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/toggleLink.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2ExpandAll.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2HideRoot.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NiceWrap.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/tree2NoNav.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/treeTable.jsp
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/validate.jsp

Added: myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/InputTextDisabledBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/InputTextDisabledBean.java?rev=906241&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/InputTextDisabledBean.java (added)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/inputtextdisabled/InputTextDisabledBean.java Wed Feb  3 21:04:57 2010
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.examples.inputtextdisabled;
+
+/**
+ * @author Ingo Hofmann
+ */
+public class InputTextDisabledBean
+{
+
+    private String firstName;
+    private String lastName;
+    private String fullName;
+
+    public String getFirstName()
+    {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName)
+    {
+        this.firstName = firstName;
+    }
+
+    public String getLastName()
+    {
+        return lastName;
+    }
+
+    public void setLastName(String lastName)
+    {
+        this.lastName = lastName;
+    }
+
+    public String getFullName()
+    {
+        return fullName;
+    }
+
+    public void setFullName(String fullName)
+    {
+        this.fullName = fullName;
+    }
+}

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/listexample/OpenDataList.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/listexample/OpenDataList.java?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/listexample/OpenDataList.java (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/listexample/OpenDataList.java Wed Feb  3 21:04:57 2010
@@ -18,14 +18,13 @@
  */
 package org.apache.myfaces.examples.listexample;
 
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import javax.faces.model.DataModel;
-import javax.faces.model.ListDataModel;
-
 public class OpenDataList extends SortableList
 {
     private DataModel data;
@@ -45,6 +44,9 @@
         headerList.add(new ColumnHeader("Model","300",true));
         columnHeaders = new ListDataModel(headerList);
 
+        // set default sort column
+        setSort(((ColumnHeader)headerList.get(0)).getLabel());
+
         // create list of lists (data)
         List rowList = new ArrayList();
         for (int i = 100; i <= 999; i++)
@@ -173,6 +175,7 @@
         List headers = (List) columnHeaders.getWrappedData();
         for (int i=0;i<headers.size() && columnIndex==-1;i++)
         {
+
             ColumnHeader header = (ColumnHeader) headers.get(i);
             if (header.getLabel().equals(columnName))
             {

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/picklist/PicklistBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/picklist/PicklistBean.java?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/picklist/PicklistBean.java (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/picklist/PicklistBean.java Wed Feb  3 21:04:57 2010
@@ -18,10 +18,9 @@
  */
 package org.apache.myfaces.examples.picklist;
 
-import java.util.ArrayList;
-
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.model.SelectItem;
+import java.util.ArrayList;
 
 public class PicklistBean
 {
@@ -38,7 +37,7 @@
 
     public void selectionChanged(ValueChangeEvent evt)
     {
-        String[] selectedValues = (String[]) evt.getNewValue();
+        Object[] selectedValues = (Object[]) evt.getNewValue();
 
         if (selectedValues.length == 0)
         {
@@ -53,7 +52,7 @@
             {
                 if (i > 0)
                     sb.append(", ");
-                sb.append(selectedValues[i]);
+                sb.append((String) selectedValues[i]);
             }
 
             selectedInfo = sb.toString();

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/webapp/SourceCodeServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/webapp/SourceCodeServlet.java?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/webapp/SourceCodeServlet.java (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/java/org/apache/myfaces/examples/webapp/SourceCodeServlet.java Wed Feb  3 21:04:57 2010
@@ -1,20 +1,20 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- * 
- *  http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.myfaces.examples.webapp;
 

Added: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/pageLayout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/pageLayout.xhtml?rev=906241&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/pageLayout.xhtml (added)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/pageLayout.xhtml Wed Feb  3 21:04:57 2010
@@ -0,0 +1,167 @@
+<?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">
+<h:head>
+     <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8" />
+     <title>MyFaces - the free JSF Implementation</title>
+     <h:outputStylesheet name="css/basic.css"/>
+     <ui:insert name="head"/>
+</h:head>
+<h:body>
+
+    <t:panelLayout id="page" layout="#{globalOptions.pageLayout}"
+            styleClass="pageLayout"
+            headerClass="pageHeader"
+            navigationClass="pageNavigation"
+            bodyClass="pageBody"
+            footerClass="pageFooter" >
+
+        <f:facet name="header">
+            <f:subview id="header">
+<h:panelGrid id="header_group1" columns="2" styleClass="pageHeader1"  >
+    <t:graphicImage id="header_logo" url="images/logo_mini.jpg" alt="#{example_messages['alt_logo']}" />
+    <f:verbatim>
+        &nbsp;&nbsp;
+        <font size="+1" color="#FFFFFF">MyFaces - The free JavaServer&#8482; Faces Implementation</font>
+        <font size="-1" color="#FFFFFF">(Version 1.1.1)</font>
+    </f:verbatim>
+</h:panelGrid>
+
+<h:panelGrid id="header_group2" columns="1" styleClass="pageHeader2" columnClasses="pageHeader2col1"  >
+   <h:form id="cookMenuForm">
+    <t:jscookMenu layout="hbr" theme="ThemeOffice" >
+        <t:navigationMenuItem id="nav_1" itemLabel="#{example_messages['nav_Home']}" action="go_home" />
+        <t:navigationMenuItem id="nav_2" itemLabel="#{example_messages['nav_Examples']}" >
+            <t:navigationMenuItem id="nav_2_1" itemLabel="#{example_messages['nav_Sample_1']}" action="go_sample1" icon="images/myfaces.gif" />
+            <t:navigationMenuItem id="nav_2_2" itemLabel="#{example_messages['nav_Sample_2']}" action="go_sample2" icon="images/myfaces.gif" />
+            <t:navigationMenuItem id="nav_2_3" itemLabel="#{example_messages['nav_Validate']}" action="go_validate" icon="images/myfaces.gif" />
+            <t:navigationMenuItem id="nav_2_4" itemLabel="#{example_messages['nav_Components']}" icon="images/component.gif" split="true" >
+	            <t:navigationMenuItem id="nav_2_4_1" itemLabel="#{example_messages['nav_aliasBean']}" action="go_aliasBean" icon="images/myfaces.gif" />
+  	            <t:navigationMenuItem id="nav_2_4_1_2" itemLabel="#{example_messages['nav_buffer']}" action="go_buffer" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_2" itemLabel="#{example_messages['nav_dataTable']}" action="go_dataTable" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_3" itemLabel="#{example_messages['nav_sortTable']}" action="go_sortTable" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_4" itemLabel="#{example_messages['nav_Selectbox']}" action="go_selectbox" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_5" itemLabel="#{example_messages['nav_FileUpload']}" action="go_fileupload" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_6" itemLabel="#{example_messages['nav_TabbedPane']}" action="go_tabbedPane" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_7" itemLabel="#{example_messages['nav_Calendar']}" action="go_calendar" icon="images/myfaces.gif" split="true" />
+                <t:navigationMenuItem id="nav_2_4_71" itemLabel="#{example_messages['nav_Popup']}" action="go_popup" icon="images/myfaces.gif" split="true" />
+                <t:navigationMenuItem id="nav_2_4_72" itemLabel="#{example_messages['nav_JsListener']}" action="go_jslistener" icon="images/myfaces.gif" split="true" />
+            	<t:navigationMenuItem id="nav_2_4_8" itemLabel="#{example_messages['nav_Date']}" action="go_date" icon="images/myfaces.gif" />
+	            <t:navigationMenuItem id="nav_2_4_81" itemLabel="#{example_messages['nav_InputHtml']}" action="go_inputHtml" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_9" itemLabel="#{example_messages['nav_dataList']}" action="go_dataList" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_10" itemLabel="#{example_messages['nav_tree']}" action="go_tree" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_100" itemLabel="#{example_messages['nav_tree2']}" action="go_tree2" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_11" itemLabel="#{example_messages['nav_treeTable']}" action="go_treeTable" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_13" itemLabel="#{example_messages['nav_dataScroller']}" action="go_datascroller" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_14" itemLabel="#{example_messages['nav_panelstack']}" action="go_panelstack" icon="images/myfaces.gif" />
+	            <t:navigationMenuItem id="nav_2_4_15" itemLabel="#{example_messages['nav_css']}" action="go_css" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_16" itemLabel="#{example_messages['nav_newspaperTable']}" action="go_newspaperTable" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_17" itemLabel="#{example_messages['nav_swapimage']}" action="go_swapimage" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_18" itemLabel="#{example_messages['nav_forceId']}" action="go_forceId" icon="images/myfaces.gif" />
+                <t:navigationMenuItem id="nav_2_4_19" itemLabel="#{example_messages['nav_selectOneCountry']}" action="go_selectOneCountry" icon="images/myfaces.gif" />
+            </t:navigationMenuItem>
+        </t:navigationMenuItem>
+        <t:navigationMenuItem id="nav_3" itemLabel="#{example_messages['nav_Documentation']}" >
+            <t:navigationMenuItem id="nav_3_1" itemLabel="#{example_messages['nav_Features']}" action="go_features" icon="images/myfaces.gif" />
+        </t:navigationMenuItem>
+        <t:navigationMenuItem id="nav_4" itemLabel="#{example_messages['nav_Options']}" action="go_options" />
+        <t:navigationMenuItems id="nav_5" value="#{navigationMenu.infoItems}" />
+
+    </t:jscookMenu>
+    </h:form>
+</h:panelGrid>
+            </f:subview>
+        </f:facet>
+
+        <f:facet name="navigation">
+            <f:subview id="menu" >
+    <h:form id="panelNavigationForm">
+    <t:panelNavigation id="nav"
+              styleClass="navigation"
+              separatorClass="navseparator"
+              itemClass="navitem"
+              activeItemClass="navitem_active"
+              openItemClass="navitem_open"   >
+    <t:commandNavigation id="nav_1" value="#{example_messages['nav_Home']}" action="go_home">
+        <f:param name="param" value="value"/>
+    </t:commandNavigation>
+    <t:commandNavigation id="nav_2" value="#{example_messages['nav_Examples']}" >
+        <t:commandNavigation id="nav_2_1" value="#{example_messages['nav_Sample_1']}" action="go_sample1" />
+        <t:commandNavigation id="nav_2_2" value="#{example_messages['nav_Sample_2']}" action="go_sample2" />
+        <t:commandNavigation id="nav_2_3" value="#{example_messages['nav_Validate']}" action="go_validate" />
+        <t:commandNavigation id="nav_2_4" value="#{example_messages['nav_Components']}" >
+            <t:commandNavigation id="nav_2_4_1" value="#{example_messages['nav_aliasBean']}" action="go_aliasBean" />
+            <t:commandNavigation id="nav_2_4_1_2" value="#{example_messages['nav_buffer']}" action="go_buffer" />
+            <t:commandNavigation id="nav_2_4_2" value="#{example_messages['nav_dataTable']}" action="go_dataTable" />
+            <t:commandNavigation id="nav_2_4_3" value="#{example_messages['nav_sortTable']}" action="go_sortTable" />
+            <t:commandNavigation id="nav_2_4_4" value="#{example_messages['nav_Selectbox']}" action="go_selectbox" />
+            <t:commandNavigation id="nav_2_4_5" value="#{example_messages['nav_FileUpload']}" action="go_fileupload" />
+            <t:commandNavigation id="nav_2_4_6" value="#{example_messages['nav_TabbedPane']}" action="go_tabbedPane" />
+            <t:commandNavigation id="nav_2_4_7" value="#{example_messages['nav_Calendar']}" action="go_calendar" />
+            <t:commandNavigation id="nav_2_4_71" value="#{example_messages['nav_Popup']}" action="go_popup" />
+            <t:commandNavigation id="nav_2_4_72" value="#{example_messages['nav_JsListener']}" action="go_jslistener" />
+            <t:commandNavigation id="nav_2_4_73" value="#{example_messages['nav_panelnavigation']}" action="go_panelnavigation" />
+            <t:commandNavigation id="nav_2_4_8" value="#{example_messages['nav_Date']}" action="go_date" />
+            <t:commandNavigation id="nav_2_4_81" value="#{example_messages['nav_InputHtml']}" action="go_inputHtml" />
+            <t:commandNavigation id="nav_2_4_9" value="#{example_messages['nav_dataList']}" action="go_dataList" />
+            <t:commandNavigation id="nav_2_4_10" value="#{example_messages['nav_tree']}" action="go_tree" />
+            <t:commandNavigation id="nav_2_4_100" value="#{example_messages['nav_tree2']}" action="go_tree2" />
+            <t:commandNavigation id="nav_2_4_11" value="#{example_messages['nav_treeTable']}" action="go_treeTable"/>
+            <t:commandNavigation id="nav_2_4_13" value="#{example_messages['nav_dataScroller']}" action="go_datascroller" />
+            <t:commandNavigation id="nav_2_4_14" value="#{example_messages['nav_panelstack']}" action="go_panelstack" />
+            <t:commandNavigation id="nav_2_4_15" value="#{example_messages['nav_css']}" action="go_css" />
+            <t:commandNavigation id="nav_2_4_16" value="#{example_messages['nav_newspaperTable']}" action="go_newspaperTable" />
+            <t:commandNavigation id="nav_2_4_17" value="#{example_messages['nav_swapimage']}" action="go_swapimage" />
+            <t:commandNavigation id="nav_2_4_18" value="#{example_messages['nav_forceId']}" action="go_forceId" />
+            <t:commandNavigation id="nav_2_4_19" value="#{example_messages['nav_selectOneCountry']}" action="go_selectOneCountry" />
+        </t:commandNavigation>
+    </t:commandNavigation>
+    <t:commandNavigation id="nav_3" value="#{example_messages['nav_Documentation']}" >
+        <t:commandNavigation id="nav_3_1" value="#{example_messages['nav_Features']}" action="go_features"/>
+    </t:commandNavigation>
+    <t:commandNavigation id="nav_4" value="#{example_messages['nav_Options']}" action="go_options" />
+    <f:verbatim>&nbsp;</f:verbatim>
+    <t:commandNavigation id="nav_5" value="#{example_messages['nav_Info']}" >
+        <t:commandNavigation id="nav_5_1" value="#{example_messages['nav_Contact']}" action="go_contact" />
+        <t:commandNavigation id="nav_5_2" value="#{example_messages['nav_Copyright']}" action="go_copyright" />
+    </t:commandNavigation>
+</t:panelNavigation>
+    </h:form>
+            </f:subview>
+        </f:facet>
+
+        <f:facet name="body">
+            <h:panelGroup id="body">
+                <ui:insert name="body"/>
+            </h:panelGroup>
+        </f:facet>
+
+    </t:panelLayout>
+
+<ui:insert name="mbean_source">
+  <br/>
+  <br/>
+
+  <t:dataList value="#{accessedBeans.beanList}" var="accessedBean" layout="unorderedList">
+      <h:outputLink value="#{accessedBean.clazz}.java.source">
+          <h:outputText value="Show source of bean with name : "/>
+          <h:outputText value="#{accessedBean.name}"/>
+          <h:outputText value=" and class : "/>
+          <h:outputText value="#{accessedBean.clazz}"/>
+      </h:outputLink>
+  </t:dataList>
+</ui:insert>
+<ui:insert name="footer">
+  <br/>
+  <br/>
+  <a href="home.jsf">[HOME]</a>
+  &nbsp;
+  <a href="#{request.requestURI}.source">[SOURCE]</a>
+  </ui:insert>
+</h:body>
+</html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml Wed Feb  3 21:04:57 2010
@@ -19,12 +19,10 @@
   <br/>
   
   <t:dataList value="#{accessedBeans.beanList}" var="accessedBean" layout="unorderedList">
-      <h:outputLink value="#{accessedBean.clazz}.java.source">
-          <h:outputText value="Show source of bean with name : "/>
+          <h:outputText value="Usage of bean with name : "/>
           <h:outputText value="#{accessedBean.name}"/>
           <h:outputText value=" and class : "/>
           <h:outputText value="#{accessedBean.clazz}"/>
-      </h:outputLink>
   </t:dataList>
 </ui:insert>
 <ui:insert name="footer">

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/examples-config.xml?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/examples-config.xml Wed Feb  3 21:04:57 2010
@@ -22,7 +22,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for sample1.jsp -->
+    <!-- Managed Beans for sample1.xhtml -->
 
     <managed-bean>
         <managed-bean-name>calcForm</managed-bean-name>
@@ -58,7 +58,7 @@
     </managed-bean>
 
 
-    <!-- Managed Beans for sample2.jsp -->
+    <!-- Managed Beans for sample2.xhtml -->
 
     <managed-bean>
         <managed-bean-name>q_form</managed-bean-name>
@@ -104,7 +104,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for collapsiblePanel.jsp -->
+    <!-- Managed Beans for collapsiblePanel.xhtml -->
     <managed-bean>
         <managed-bean-name>firstCollapsiblePanelBean</managed-bean-name>
         <managed-bean-class>org.apache.myfaces.examples.collapsiblepanel.CollapsiblePanelBean</managed-bean-class>
@@ -124,7 +124,7 @@
     </managed-bean>
 
 
-    <!-- Managed Beans for selectbox.jsp -->
+    <!-- Managed Beans for selectbox.xhtml -->
 
     <managed-bean>
         <managed-bean-name>carconf</managed-bean-name>
@@ -132,7 +132,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for selectOneLanguage.jsp -->
+    <!-- Managed Beans for selectOneLanguage.xhtml -->
 
     <managed-bean>
         <managed-bean-name>language</managed-bean-name>
@@ -148,7 +148,7 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for simpleGroupBy.jsp -->
+    <!-- Managed Beans for simpleGroupBy.xhtml -->
 
     <managed-bean>
         <managed-bean-name>simpleGroupBy</managed-bean-name>
@@ -164,7 +164,7 @@
     </managed-bean>
 
 
-    <!-- Managed Beans for tree.jsp -->
+    <!-- Managed Beans for tree.xhtml -->
 
     <managed-bean>
         <managed-bean-name>treeTable</managed-bean-name>
@@ -178,14 +178,14 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for tree2.jsp -->
+    <!-- Managed Beans for tree2.xhtml -->
     <managed-bean>
         <managed-bean-name>treeBacker</managed-bean-name>
         <managed-bean-class>org.apache.myfaces.examples.tree.TreeBacker</managed-bean-class>
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for forceId.jsp -->
+    <!-- Managed Beans for forceId.xhtml -->
 
     <managed-bean>
         <managed-bean-name>forceIdBean</managed-bean-name>
@@ -210,7 +210,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for calendar.jsp -->
+    <!-- Managed Beans for calendar.xhtml -->
 
     <managed-bean>
         <managed-bean-name>calendarBean</managed-bean-name>
@@ -218,7 +218,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for countryForm.jsp -->
+    <!-- Managed Beans for countryForm.xhtml -->
 
     <managed-bean>
         <managed-bean-name>countryForm</managed-bean-name>
@@ -232,7 +232,7 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
     
-    <!-- Managed Beans for toggleLink.jsp -->
+    <!-- Managed Beans for toggleLink.xhtml -->
     
     <managed-bean>
         <managed-bean-name>toggleBean</managed-bean-name>
@@ -240,7 +240,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for date.jsp -->
+    <!-- Managed Beans for date.xhtml -->
 
     <managed-bean>
         <managed-bean-name>date1</managed-bean-name>
@@ -260,7 +260,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for date.jsp -->
+    <!-- Managed Beans for date.xhtml -->
 
     <managed-bean>
         <managed-bean-name>dvoFace</managed-bean-name>
@@ -268,7 +268,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for inputHtml.jsp -->
+    <!-- Managed Beans for inputHtml.xhtml -->
 
     <managed-bean>
         <managed-bean-name>editor</managed-bean-name>
@@ -288,7 +288,7 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for fileupload.jsp -->
+    <!-- Managed Beans for fileupload.xhtml -->
 
     <managed-bean>
         <managed-bean-name>fileUploadForm</managed-bean-name>
@@ -297,7 +297,7 @@
     </managed-bean>
 
 
-    <!-- Managed Beans for options.jsp -->
+    <!-- Managed Beans for options.xhtml -->
 
     <managed-bean>
         <managed-bean-name>globalOptions</managed-bean-name>
@@ -321,7 +321,7 @@
         <managed-bean-scope>application</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for dataScroller.jsp -->
+    <!-- Managed Beans for dataScroller.xhtml -->
 
     <managed-bean>
         <managed-bean-name>scrollerList</managed-bean-name>
@@ -371,7 +371,7 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for pagedSortTable.jsp -->
+    <!-- Managed Beans for pagedSortTable.xhtml -->
 
     <managed-bean>
         <managed-bean-name>pagedSort</managed-bean-name>
@@ -379,7 +379,7 @@
         <managed-bean-scope>session</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for openDataTable.jsp -->
+    <!-- Managed Beans for openDataTable.xhtml -->
 
     <managed-bean>
         <managed-bean-name>openDataList</managed-bean-name>
@@ -572,7 +572,7 @@
     	<managed-bean-scope>application</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for calendar.jsp -->
+    <!-- Managed Beans for calendar.xhtml -->
 
     <managed-bean>
         <managed-bean-name>autoScrollBean</managed-bean-name>
@@ -580,7 +580,7 @@
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
-    <!-- Managed Beans for colspan.jsp -->
+    <!-- Managed Beans for colspan.xhtml -->
 
     <managed-bean>
         <managed-bean-name>testColspanBean</managed-bean-name>
@@ -616,7 +616,13 @@
         <managed-bean-name>selectOneRowList</managed-bean-name>
         <managed-bean-class>org.apache.myfaces.examples.selectOneRow.SelectOneRowList</managed-bean-class>
         <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>	
+    </managed-bean>
+
+    <managed-bean>
+        <managed-bean-name>inputTextDisabled</managed-bean-name>
+        <managed-bean-class>org.apache.myfaces.examples.inputtextdisabled.InputTextDisabledBean</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
      
 
     <!-- NAVIGATION RULES -->
@@ -624,7 +630,7 @@
     <navigation-rule>
         <navigation-case>
             <from-outcome>go_home</from-outcome>
-            <to-view-id>/home.jsp</to-view-id>
+            <to-view-id>/home.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
@@ -637,117 +643,117 @@
 
         <navigation-case>
             <from-outcome>go_sample1</from-outcome>
-            <to-view-id>/sample1.jsp</to-view-id>
+            <to-view-id>/sample1.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_sample2</from-outcome>
-            <to-view-id>/sample2.jsp</to-view-id>
+            <to-view-id>/sample2.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_aliasBean</from-outcome>
-            <to-view-id>/aliasBean.jsp</to-view-id>
+            <to-view-id>/aliasBean.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_buffer</from-outcome>
-            <to-view-id>/buffer.jsp</to-view-id>
+            <to-view-id>/buffer.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_dataTable</from-outcome>
-            <to-view-id>/dataTable.jsp</to-view-id>
+            <to-view-id>/dataTable.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_sortTable</from-outcome>
-            <to-view-id>/sortTable.jsp</to-view-id>
+            <to-view-id>/sortTable.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_selectbox</from-outcome>
-            <to-view-id>/selectbox.jsp</to-view-id>
+            <to-view-id>/selectbox.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_fileupload</from-outcome>
-            <to-view-id>/fileupload.jsp</to-view-id>
+            <to-view-id>/fileupload.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_tabbedPane</from-outcome>
-            <to-view-id>/tabbedPane.jsp</to-view-id>
+            <to-view-id>/tabbedPane.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_calendar</from-outcome>
-            <to-view-id>/calendar.jsp</to-view-id>
+            <to-view-id>/calendar.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_popup</from-outcome>
-            <to-view-id>/popup.jsp</to-view-id>
+            <to-view-id>/popup.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_jslistener</from-outcome>
-            <to-view-id>/jslistener.jsp</to-view-id>
+            <to-view-id>/jslistener.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_date</from-outcome>
-            <to-view-id>/date.jsp</to-view-id>
+            <to-view-id>/date.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_dataList</from-outcome>
-            <to-view-id>/dataList.jsp</to-view-id>
+            <to-view-id>/dataList.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_tree</from-outcome>
-            <to-view-id>/tree.jsp</to-view-id>
+            <to-view-id>/tree.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_tree2</from-outcome>
-            <to-view-id>/tree2.jsp</to-view-id>
+            <to-view-id>/tree2.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_treeTable</from-outcome>
-            <to-view-id>/treeTable.jsp</to-view-id>
+            <to-view-id>/treeTable.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_features</from-outcome>
-            <to-view-id>/features.jsp</to-view-id>
+            <to-view-id>/features.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_options</from-outcome>
-            <to-view-id>/options.jsp</to-view-id>
+            <to-view-id>/options.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_contact</from-outcome>
-            <to-view-id>/contact.jsp</to-view-id>
+            <to-view-id>/contact.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_copyright</from-outcome>
-            <to-view-id>/copyright.jsp</to-view-id>
+            <to-view-id>/copyright.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_validate</from-outcome>
-            <to-view-id>/validate.jsp</to-view-id>
+            <to-view-id>/validate.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_datascroller</from-outcome>
-            <to-view-id>/dataScroller.jsp</to-view-id>
+            <to-view-id>/dataScroller.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
@@ -757,42 +763,42 @@
 
         <navigation-case>
             <from-outcome>go_css</from-outcome>
-            <to-view-id>/css.jsp</to-view-id>
+            <to-view-id>/css.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_newspaperTable</from-outcome>
-            <to-view-id>/newspaperTable.jsp</to-view-id>
+            <to-view-id>/newspaperTable.xhtml</to-view-id>
         </navigation-case>
 
 		<navigation-case>
             <from-outcome>go_forceId</from-outcome>
-            <to-view-id>/forceId.jsp</to-view-id>
+            <to-view-id>/forceId.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_swapimage</from-outcome>
-            <to-view-id>/swapimage.jsp</to-view-id>
+            <to-view-id>/swapimage.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_selectOneCountry</from-outcome>
-            <to-view-id>/selectOneCountry.jsp</to-view-id>
+            <to-view-id>/selectOneCountry.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_panelnavigation_1</from-outcome>
-            <to-view-id>/panelnavigation_1.jsp</to-view-id>
+            <to-view-id>/panelnavigation_1.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_panelnavigation_2</from-outcome>
-            <to-view-id>/panelnavigation_2.jsp</to-view-id>
+            <to-view-id>/panelnavigation_2.xhtml</to-view-id>
         </navigation-case>
 
         <navigation-case>
             <from-outcome>go_panelnavigation_3</from-outcome>
-            <to-view-id>/panelnavigation_3.jsp</to-view-id>
+            <to-view-id>/panelnavigation_3.xhtml</to-view-id>
         </navigation-case>
 
 
@@ -800,111 +806,117 @@
     </navigation-rule>
 
     <navigation-rule>
-        <from-view-id>/sample1.jsp</from-view-id>
+        <from-view-id>/sample1.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>jump_home</from-outcome>
-            <to-view-id>/home.jsp</to-view-id>
+            <to-view-id>/home.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
      <navigation-rule>
-        <from-view-id>/validate.jsp</from-view-id>
+        <from-view-id>/validate.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>valid</from-outcome>
-            <to-view-id>/home.jsp</to-view-id>
+            <to-view-id>/home.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
     <navigation-rule>
         <navigation-case>
             <from-outcome>go_country</from-outcome>
-            <to-view-id>/countryForm.jsp</to-view-id>
+            <to-view-id>/countryForm.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
     <navigation-rule>
-        <!-- from-view-id>/dataTable.jsp</from-view-id -->
+        <!-- from-view-id>/dataTable.xhtml</from-view-id -->
         <navigation-case>
             <from-outcome>go_edit_table</from-outcome>
-            <to-view-id>/countryTableForm.jsp</to-view-id>
+            <to-view-id>/countryTableForm.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
     <navigation-rule>
-        <from-view-id>/countryTableForm.jsp</from-view-id>
+        <from-view-id>/countryTableForm.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>go_back</from-outcome>
-            <to-view-id>/masterDetail.jsp</to-view-id>
+            <to-view-id>/masterDetail.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
     <navigation-rule>
-        <from-view-id>/countryForm.jsp</from-view-id>
+        <from-view-id>/countryForm.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>cancel</from-outcome>
-            <to-view-id>/masterDetail.jsp</to-view-id>
+            <to-view-id>/masterDetail.xhtml</to-view-id>
         </navigation-case>
         <navigation-case>
             <from-outcome>ok_next</from-outcome>
-            <to-view-id>/masterDetail.jsp</to-view-id>
+            <to-view-id>/masterDetail.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
 
     <!-- navigational rules for the schedule examples -->
 	<navigation-rule>
-		<from-view-id>/schedule2.jsp</from-view-id>
+		<from-view-id>/schedule2.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>add_entry</from-outcome>
-			<to-view-id>/schedule_addentry.jsp</to-view-id>
+			<to-view-id>/schedule_addentry.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 	</navigation-rule>
 
 	<navigation-rule>
-		<from-view-id>/schedule_addentry.jsp</from-view-id>
+		<from-view-id>/schedule_addentry.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>success</from-outcome>
-			<to-view-id>/schedule2.jsp</to-view-id>
+			<to-view-id>/schedule2.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>cancel</from-outcome>
-			<to-view-id>/schedule2.jsp</to-view-id>
+			<to-view-id>/schedule2.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>failure</from-outcome>
-			<to-view-id>/schedule_addentry.jsp</to-view-id>
+			<to-view-id>/schedule_addentry.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 	</navigation-rule>
 
 	<navigation-rule>
-		<from-view-id>/schedule3.jsp</from-view-id>
+		<from-view-id>/schedule3.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>edit_settings</from-outcome>
-			<to-view-id>/schedule_editsettings.jsp</to-view-id>
+			<to-view-id>/schedule_editsettings.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 	</navigation-rule>
 
 	<navigation-rule>
-		<from-view-id>/schedule_editsettings.jsp</from-view-id>
+		<from-view-id>/schedule_editsettings.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>success</from-outcome>
-			<to-view-id>/schedule3.jsp</to-view-id>
+			<to-view-id>/schedule3.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>cancel</from-outcome>
-			<to-view-id>/schedule3.jsp</to-view-id>
+			<to-view-id>/schedule3.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>failure</from-outcome>
-			<to-view-id>/schedule_editsettings.jsp</to-view-id>
+			<to-view-id>/schedule_editsettings.xhtml</to-view-id>
 			<redirect />
 		</navigation-case>
 	</navigation-rule>
 
+ <application>
+  <resource-bundle>
+   <base-name>org.apache.myfaces.examples.resource.example_messages</base-name>
+   <var>example_messages</var>
+  </resource-bundle>
+ </application>
 </faces-config>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/web.xml?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/WEB-INF/web.xml Wed Feb  3 21:04:57 2010
@@ -192,10 +192,4 @@
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
   </welcome-file-list>
-  <!-- 
-	<error-page>
-		<error-code>500</error-code>
-		<location>/error.jsp</location>
-	</error-page>
-   -->
 </web-app>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/buffer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/buffer.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/buffer.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/buffer.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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
@@ -26,14 +26,10 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<f:view>
-<h:form>
-
-    <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>
     <p>
         This component allows you to render a part of the page to a buffer, and then use the buffer later.
     </p>
@@ -158,11 +154,8 @@
     <h:outputText value="#{tableScroller}" escape="false"/>
 
 </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/calendar.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/calendar.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/calendar.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/calendar.jsp Wed Feb  3 21:04:57 2010
@@ -1,8 +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"%>
-
+<?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
@@ -23,14 +26,9 @@
  * under the License.
  */
 //-->
-<html>
-
-<%@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="#{calendarBean}"/>
 
@@ -67,7 +65,8 @@
                 currentDayCellClass="currentDayCell" value="#{calendarBean.thirdDate}" renderAsPopup="true"
                 popupTodayString="#{example_messages['popup_today_string']}"
                 popupDateFormat="MM/dd/yyyy" popupWeekString="#{example_messages['popup_week_string']}"
-                helpText="MM/DD/YYYY"/>
+                helpText="MM/DD/YYYY"
+                    forceId="false"/>
 
             <h:inputText value="#{calendarBean.text}"/>
             <h:commandButton value="#{example_messages['js_submit']}" action="#{calendarBean.submitMethod}" />
@@ -75,66 +74,8 @@
 
 
     </h:panelGroup>
-    <%--h:panelGroup id="body">
-
-
-        <f:verbatim><br/></f:verbatim>
-
-        <h:outputText value="#{calendarBean.firstDate}" />
-
-        <f:verbatim><br/><br/><br/></f:verbatim>
-
-        <h:outputText value="#{example_messages['js_popup']}"/>
-
-        <h:form id="calendarForm2">
-
-            <t:outputLabel for="secondOne" value="Second calendar input"/>
-            <t:inputCalendar id="secondOne" monthYearRowClass="yearMonthHeader" weekRowClass="weekHeader" popupButtonStyleClass="standard_bold"
-                currentDayCellClass="currentDayCell" value="#{calendarBean.secondDate}" renderAsPopup="true"
-                popupTodayString="#{example_messages['popup_today_string']}" popupWeekString="#{example_messages['popup_week_string']}" helpText="MM/DD/YYYY"/>
-            <h:inputText value="#{calendarBean.text}"/>
-            <h:commandButton value="#{example_messages['js_submit']}" action="#{calendarBean.submitMethod}" />
-        </h:form>
-        
-        <h:outputText value="#{calendarBean.secondDate}" />
-        
-        <f:verbatim><br/><br/></f:verbatim>
-        
-        <h:form id="calendarForm3">
-            <t:inputCalendar monthYearRowClass="yearMonthHeader" weekRowClass="weekHeader"
-                currentDayCellClass="currentDayCell" value="#{calendarBean.secondDate}" renderAsPopup="true"
-                popupTodayString="#{example_messages['popup_today_string']}" popupWeekString="#{example_messages['popup_week_string']}"
-                renderPopupButtonAsImage="true"
-                popupButtonImageUrl="/images/help.gif"/>
-        </h:form>
-
-        <h:form id="calendarForm4">
-
-            <t:dataTable id="data"
-                    styleClass="standardTable"
-                    headerClass="standardTable_Header"
-                    rowClasses="standardTable_Row1,standardTable_Row2"
-                    columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
-                    var="dateHolder"
-                    value="#{calendarBean.dates}"
-                    preserveDataModel="true">
-                <h:column>
-                    <t:inputCalendar monthYearRowClass="yearMonthHeader" weekRowClass="weekHeader"
-                        currentDayCellClass="currentDayCell" value="#{dateHolder.date}" renderAsPopup="true"
-                        popupTodayString="#{example_messages['popup_today_string']}" popupWeekString="#{example_messages['popup_week_string']}" />
-                </h:column>
-            </t:dataTable>
-
-            <h:commandButton value="#{example_messages['js_submit']}"/>
-
-        </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/captcha.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/captcha.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/captcha.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/captcha.jsp Wed Feb  3 21:04:57 2010
@@ -1,8 +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"%>
-<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
@@ -23,32 +26,22 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc"%>
-
 <body>
-
-<f:view>
-	   
-	<h:form id="form1">
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+ 	<h:form id="form1">
 		<h:panelGrid columns="2">
 			<h:outputText value="Type the code shown "/>
 			<h:inputText value="#{captchaBean.value}"/>
-			
-			<h:commandLink value="Try a different image" />		
+
+			<h:commandLink value="Try a different image" />
 			<t:captcha captchaSessionKeyName="#{captchaBean.sessionKeyName}" />
-			
+
 			<h:commandButton value="Submit" action="#{captchaBean.check}"/>
 			<h:outputText value="#{captchaBean.status}"/>
 		</h:panelGrid>
-	</h:form>		
-	    
-
-	<%@include file="inc/page_footer.jsp"%>
-
-</f:view>
-
+	</h:form>
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
-

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/collapsiblePanel.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/collapsiblePanel.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/collapsiblePanel.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/collapsiblePanel.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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
@@ -26,11 +26,9 @@
  * under the License.
  */
 //-->
-
 <body>
-
-<f:view>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
     <t:saveState value="#{firstCollapsiblePanelBean}"/>
     <t:saveState value="#{secondCollapsiblePanelBean}"/>
     <t:saveState value="#{thirdCollapsiblePanelBean}"/>
@@ -76,7 +74,7 @@
 
         <t:collapsiblePanel id="test3" value="#{thirdCollapsiblePanelBean.collapsed}" title="testTitle"
                             var="test2collapsed">
-            <f:valueChangeListener type="org.apache.myfaces.examples.collapsiblepanel.CollapsiblePanelValueChangeListener" />                            
+            <f:valueChangeListener type="org.apache.myfaces.examples.collapsiblepanel.CollapsiblePanelValueChangeListener" />
             <f:facet name="header">
                 <t:div style="width:500px;background-color:#CCCCCC;">
                     <h:outputText value="Person"/>
@@ -121,11 +119,7 @@
             </h:column>
         </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/colspan.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/colspan.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/colspan.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/colspan.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +1,12 @@
-<%@ 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
  * or more contributor license agreements.  See the NOTICE file
@@ -25,188 +26,183 @@
  * under the License.
  */
 //-->
-
-	<body>
-
-		<f:view>
-			<h:form id="test">
-				<h:panelGrid columns="1">
-
-					<h:outputText value="Implementation using t:panelGrid" />
-
-					<t:panelGrid id="grid1" columns="4" border="1" styleClass="standardTable standardTable_Row1 standardTable_Column" >
-						<t:panelGroup>
-							<f:verbatim escape="false">1-1</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">1-2</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup colspan="2">
-							<f:verbatim escape="false">1-3</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup colspan="3">
-							<f:verbatim escape="false">2-1</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">2-4</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">3-1</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">3-2</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">3-3</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">3-4</f:verbatim>
-						</t:panelGroup>
-					</t:panelGrid>
-
-					<f:verbatim>&nbsp;</f:verbatim>
-
-					<t:panelGrid id="grid2" columns="4" border="1" styleClass="standardTable standardTable_Row1 standardTable_Column" >
-						<t:panelGroup>
-							<f:verbatim escape="false">1-1</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">1-2</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">1-3</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">1-4</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">2-1</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup colspan="2">
-							<f:verbatim escape="false">2-2</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup>
-							<f:verbatim escape="false">2-4</f:verbatim>
-						</t:panelGroup>
-						<t:panelGroup colspan="4">
-							<f:verbatim escape="false">3-1</f:verbatim>
-						</t:panelGroup>
-					</t:panelGrid>
-
-					<f:verbatim>&nbsp;</f:verbatim>
-					<h:outputText value="Implementation using t:dataTable" />
-
-					<t:dataTable id="table1" value="#{testColspanBean.lines}" var="line"
-						rowClasses="standardTable_Row1,standardTable_Row2"
-	            	columnClasses="standardTable_Column,standardTable_ColumnCentered"
-	            	styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header">
-						<t:column colspan="2">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 1</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 1</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col1}" />
-						</t:column>
-						<t:column headercolspan="3">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 2</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 2</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col2}" />
-						</t:column>
-						<t:column>
-							<f:facet name="header">
-								<f:verbatim escape="false">head 3</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 3</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col3}" />
-						</t:column>
-						<t:column footercolspan="2">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 4</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 4</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col4}" />
-						</t:column>
-						<t:column>
-							<f:facet name="header">
-								<f:verbatim escape="false">head 5</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 5</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col5}" />
-						</t:column>
-					</t:dataTable>
-
-					<f:verbatim>&nbsp;</f:verbatim>
-
-					<t:dataTable id="table2" value="#{testColspanBean.lines}" var="line"
-						rowClasses="standardTable_Row1,standardTable_Row2"
-	            	columnClasses="standardTable_Column,standardTable_ColumnCentered"
-	            	styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header">
-						<t:column headercolspan="2">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 1</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 1</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col1}" />
-						</t:column>
-						<t:column>
-							<f:facet name="header">
-								<f:verbatim escape="false">head 2</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 2</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col2}" />
-						</t:column>
-						<t:column colspan="3">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 3</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 3</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col3}" />
-						</t:column>
-						<t:column headercolspan="2">
-							<f:facet name="header">
-								<f:verbatim escape="false">head 4</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 4</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col4}" />
-						</t:column>
-						<t:column>
-							<f:facet name="header">
-								<f:verbatim escape="false">head 5</f:verbatim>
-							</f:facet>
-							<f:facet name="footer">
-								<f:verbatim escape="false">foot 5</f:verbatim>
-							</f:facet>
-							<h:outputText value="#{line.col5}" />
-						</t:column>
-					</t:dataTable>
-
-				</h:panelGrid>
-			</h:form>
-            <jsp:include page="inc/mbean_source.jsp"/>
-        </f:view>
-
-		<%@include file="inc/page_footer.jsp" %>
-
-	</body>
-
+<body>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="body">
+    <h:form id="test">
+        <h:panelGrid columns="1">
+
+            <h:outputText value="Implementation using t:panelGrid" />
+
+            <t:panelGrid id="grid1" columns="4" border="1" styleClass="standardTable standardTable_Row1 standardTable_Column" >
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-1</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-2</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup colspan="2">
+                    <f:verbatim escape="false">1-3</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup colspan="3">
+                    <f:verbatim escape="false">2-1</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">2-4</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">3-1</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">3-2</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">3-3</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">3-4</f:verbatim>
+                </t:panelGroup>
+            </t:panelGrid>
+
+            <f:verbatim>&nbsp;</f:verbatim>
+
+            <t:panelGrid id="grid2" columns="4" border="1" styleClass="standardTable standardTable_Row1 standardTable_Column" >
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-1</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-2</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-3</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">1-4</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">2-1</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup colspan="2">
+                    <f:verbatim escape="false">2-2</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup>
+                    <f:verbatim escape="false">2-4</f:verbatim>
+                </t:panelGroup>
+                <t:panelGroup colspan="4">
+                    <f:verbatim escape="false">3-1</f:verbatim>
+                </t:panelGroup>
+            </t:panelGrid>
+
+            <f:verbatim>&nbsp;</f:verbatim>
+            <h:outputText value="Implementation using t:dataTable" />
+
+            <t:dataTable id="table1" value="#{testColspanBean.lines}" var="line"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+            columnClasses="standardTable_Column,standardTable_ColumnCentered"
+            styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header">
+                <t:column colspan="2">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 1</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 1</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col1}" />
+                </t:column>
+                <t:column headercolspan="3">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 2</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 2</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col2}" />
+                </t:column>
+                <t:column>
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 3</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 3</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col3}" />
+                </t:column>
+                <t:column footercolspan="2">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 4</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 4</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col4}" />
+                </t:column>
+                <t:column>
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 5</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 5</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col5}" />
+                </t:column>
+            </t:dataTable>
+
+            <f:verbatim>&nbsp;</f:verbatim>
+
+            <t:dataTable id="table2" value="#{testColspanBean.lines}" var="line"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+            columnClasses="standardTable_Column,standardTable_ColumnCentered"
+            styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header">
+                <t:column headercolspan="2">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 1</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 1</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col1}" />
+                </t:column>
+                <t:column>
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 2</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 2</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col2}" />
+                </t:column>
+                <t:column colspan="3">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 3</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 3</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col3}" />
+                </t:column>
+                <t:column headercolspan="2">
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 4</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 4</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col4}" />
+                </t:column>
+                <t:column>
+                    <f:facet name="header">
+                        <f:verbatim escape="false">head 5</f:verbatim>
+                    </f:facet>
+                    <f:facet name="footer">
+                        <f:verbatim escape="false">foot 5</f:verbatim>
+                    </f:facet>
+                    <h:outputText value="#{line.col5}" />
+                </t:column>
+            </t:dataTable>
+
+        </h:panelGrid>
+    </h:form>
+  </ui:define>
+ </ui:composition>
+</body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/contact.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/contact.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/contact.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/contact.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,52 +26,18 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
+ <ui:composition template="/META-INF/templates/pageLayout.xhtml">
+  <ui:define name="body">
 
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
-    <t:panelLayout id="page" layout="#{globalOptions.pageLayout}"
-            styleClass="pageLayout"
-            headerClass="pageHeader"
-            navigationClass="pageNavigation"
-            bodyClass="pageBody"
-            footerClass="pageFooter" >
-
-        <f:facet name="header">
-            <f:subview id="header">
-                <jsp:include page="inc/page_header.jsp" />
-            </f:subview>
-        </f:facet>
+    <h3>Webpages</h3>
+     <a href="http://myfaces.apache.org/" target="_blank">Project Homepage</a><br/>
+     <a href="http://www.apache.org" target="_blank">Apache Software Foundation</a><br/>
+    <h3>Project Members</h3>
+     <a href="http://myfaces.apache.org/team-list.html">MyFaces Team Members</a><br/>
 
-        <f:facet name="navigation">
-            <f:subview id="menu" >
-                <jsp:include page="inc/navigation.jsp" />
-            </f:subview>
-        </f:facet>
-
-        <f:facet name="body">
-            <h:panelGroup id="body">
-                <f:verbatim>
-                    <h3>Webpages</h3>
-                     <a href="http://myfaces.apache.org/" target="_blank">Project Homepage</a><br>
-                     <a href="http://www.apache.org" target="_blank">Apache Software Foundation</a><br>
-                    <h3>Project Members</h3>
-                     <a href="http://myfaces.apache.org/community/whoweare.html">MyFaces Team Members</a><br>
-                </f:verbatim>
-            </h:panelGroup>
-        </f:facet>
-
-        <%@include file="inc/page_footer.jsp" %>
-
-    </t:panelLayout>
-
-</f:view>
 
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/copyright.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/copyright.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/copyright.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/copyright.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,64 +26,27 @@
  * under the License.
  */
 //-->
-
-<%@include file="inc/head.inc" %>
-
 <body>
+ <ui:composition template="/META-INF/templates/pageLayout.xhtml">
+  <ui:define name="body">
 
-<f:view>
-
-    <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
-    <t:panelLayout  id="page" layout="#{globalOptions.pageLayout}"
-            styleClass="pageLayout"
-            headerClass="pageHeader"
-            navigationClass="pageNavigation"
-            bodyClass="pageBody"
-            footerClass="pageFooter" >
-
-        <f:facet name="header">
-            <f:subview id="header">
-                <jsp:include page="inc/page_header.jsp" />
-            </f:subview>
-        </f:facet>
-
-        <f:facet name="navigation">
-            <f:subview id="menu" >
-                <jsp:include page="inc/navigation.jsp" />
-            </f:subview>
-        </f:facet>
-
-        <f:facet name="body">
-            <h:panelGroup id="body">
-                <f:verbatim>
-<p>
 <h4>Copyright 2004 The Apache Software Foundation.</h4>
-<p>
+<p/>
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-<p>
+<p/>
 You may obtain a copy of the License at
-<p>
+<p/>
 <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
-<p>
+<p/>
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-<p>
-
-                </f:verbatim>
-            </h:panelGroup>
-        </f:facet>
-
-        <%@include file="inc/page_footer.jsp" %>
-
-    </t:panelLayout>
-
-</f:view>
+<p/>
 
+  </ui:define>
+ </ui:composition>
 </body>
-
 </html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryForm.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryForm.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryForm.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryForm.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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
@@ -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">
     <h:panelGroup>
         <h:form id="countryForm">
             <t:saveState value="#{countryForm.id}" />
@@ -77,11 +71,7 @@
             </h:panelGrid>
         </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/countryTableForm.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryTableForm.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryTableForm.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/countryTableForm.jsp Wed Feb  3 21:04:57 2010
@@ -1,11 +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
@@ -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">
     <h:panelGroup id="body">
 
         <h:form id="form" style="display:inline" >
@@ -80,7 +74,7 @@
                         styleClass="standardTable_Column"
                         var="city"
                         value="#{country.cities}"
-                        preserveDataModel="false" 
+                        preserveDataModel="false"
                 		>
                    <h:column>
                    	   <f:facet name="header">
@@ -125,11 +119,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