You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/28 00:05:45 UTC

svn commit: r426332 [10/12] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad: trinidad-api/ trinidad-api/src/site/xdoc/tagdoc/ trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ trinidad-demo/src/main/java/or...

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx Thu Jul 27 17:05:32 2006
@@ -17,40 +17,40 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" 
   xmlns:f="http://java.sun.com/jsf/core" 
   xmlns:h="http://java.sun.com/jsf/html" 
-  xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-  xmlns:af="http://myfaces.apache.org/adf/faces" >
+  xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+  xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
-    <af:document title="Welcome to AddRow and TotalRow demos">
-      <af:form >
-        <af:panelPage>
+    <tr:document title="Welcome to AddRow and TotalRow demos">
+      <tr:form >
+        <tr:panelPage>
           <f:facet name="navigationGlobal">
-          <af:menuButtons>
-            <af:commandNavigationItem text="Return to Feature Demos page"
+          <tr:menuButtons>
+            <tr:commandNavigationItem text="Return to Feature Demos page"
                                 immediate="true"
                                 action="demos"/>
-           </af:menuButtons>
+           </tr:menuButtons>
           </f:facet>
-          <af:outputFormatted styleUsage="instruction" 
+          <tr:outputFormatted styleUsage="instruction" 
             value="These demos show how you can play around with table data"/>
-          <af:panelGroup layout="vertical">
-            <af:panelHeader text="Add Row Demo">
-              <af:outputFormatted styleUsage="instruction" 
+          <tr:panelGroup layout="vertical">
+            <tr:panelHeader text="Add Row Demo">
+              <tr:outputFormatted styleUsage="instruction" 
                 value="This demo shows you how to add a row to your model 
                       based on user input"/>
-              <af:commandButton id="AddRowButton" 
+              <tr:commandButton id="AddRowButton" 
                 text="go to AddRow Demo" action="addRow"/>
-            </af:panelHeader>
-            <af:panelHeader text="Total Row Demo">
-              <af:outputFormatted styleUsage="instruction" 
+            </tr:panelHeader>
+            <tr:panelHeader text="Total Row Demo">
+              <tr:outputFormatted styleUsage="instruction" 
                 value="This demo shows you how to calculate totals for
                 a particular column in your table."/>
-              <af:commandButton id="TotalRowButton" text="go to TotalRow Demo" 
+              <tr:commandButton id="TotalRowButton" text="go to TotalRow Demo" 
                 action="totalRow"/>
-            </af:panelHeader>
-          </af:panelGroup>
-        </af:panelPage>
-      </af:form>
-    </af:document>
+            </tr:panelHeader>
+          </tr:panelGroup>
+        </tr:panelPage>
+      </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/addRow.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/addRow.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/addRow.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/addRow.jspx Thu Jul 27 17:05:32 2006
@@ -17,35 +17,35 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" 
           xmlns:f="http://java.sun.com/jsf/core" 
           xmlns:h="http://java.sun.com/jsf/html" 
-          xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-           xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
-    <af:document title="Add Row Demo">
-      <af:form >
-        <af:panelPage>
-          <af:commandLink text ="Return to Demo Start Page" 
+    <tr:document title="Add Row Demo">
+      <tr:form >
+        <tr:panelPage>
+          <tr:commandLink text ="Return to Demo Start Page" 
             action="demos.tableDemos"/>
-          <af:table var="row" value="#{Backer.list}" >
-            <af:column>
+          <tr:table var="row" value="#{Backer.list}" >
+            <tr:column>
               <f:facet name="header">
-                <af:outputText value="Element1"/>
+                <tr:outputText value="Element1"/>
               </f:facet>
-              <af:inputText value="#{row.data1}" columns="4" readOnly ="#{row.readOnly}" />
-            </af:column>
-            <af:column>
+              <tr:inputText value="#{row.data1}" columns="4" readOnly ="#{row.readOnly}" />
+            </tr:column>
+            <tr:column>
               <f:facet name="header">
-                <af:outputText value="Element2"/>
+                <tr:outputText value="Element2"/>
               </f:facet>
-              <af:inputText value="#{row.data2}" columns="4" readOnly ="#{row.readOnly}" />
-            </af:column>
+              <tr:inputText value="#{row.data2}" columns="4" readOnly ="#{row.readOnly}" />
+            </tr:column>
             <f:facet name="footer">
-              <af:commandButton text="Add Row" 
+              <tr:commandButton text="Add Row" 
                 actionListener="#{Backer.addRow}"/>
             </f:facet>
-          </af:table>
-        </af:panelPage>
-      </af:form>
-    </af:document>
+          </tr:table>
+        </tr:panelPage>
+      </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/totalRow.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/totalRow.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/totalRow.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/totalRow.jspx Thu Jul 27 17:05:32 2006
@@ -17,47 +17,47 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" 
   xmlns:f="http://java.sun.com/jsf/core" 
   xmlns:h="http://java.sun.com/jsf/html" 
-  xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-  xmlns:af="http://myfaces.apache.org/adf/faces" >
+  xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+  xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
-    <af:document title="Total Row Demo">
-      <af:form >
-        <af:panelPage>
-          <af:commandLink text ="Return to Demo Start Page" 
+    <tr:document title="Total Row Demo">
+      <tr:form >
+        <tr:panelPage>
+          <tr:commandLink text ="Return to Demo Start Page" 
             action="demos.tableDemos"/>
-          <af:table var="row" value="#{TotalBacker.list}" width="80%">
-            <af:column width="20%">
+          <tr:table var="row" value="#{TotalBacker.list}" width="80%">
+            <tr:column width="20%">
               <f:facet name="header">
-                <af:outputText value="Element1" />
+                <tr:outputText value="Element1" />
               </f:facet>
-              <af:outputText value="#{row.data1}"/>
-            </af:column>
-            <af:column width = "20%">
+              <tr:outputText value="#{row.data1}"/>
+            </tr:column>
+            <tr:column width = "20%">
               <f:facet name="header">
-                <af:outputText value="Element2" />
+                <tr:outputText value="Element2" />
               </f:facet>
-              <af:outputText value="#{row.data2}"/>
+              <tr:outputText value="#{row.data2}"/>
               <f:facet name="footer">
-                <af:commandButton text="Recalculate" 
+                <tr:commandButton text="Recalculate" 
                   actionListener="#{TotalBacker.totalRow}"/>
               </f:facet>
-            </af:column>
-            <af:column width = "20%">
+            </tr:column>
+            <tr:column width = "20%">
               <f:facet name="header">
-                <af:outputText value="Totals" />
+                <tr:outputText value="Totals" />
               </f:facet>
-              <af:outputText value="#{row.data2}"/>
+              <tr:outputText value="#{row.data2}"/>
               <f:facet name="footer">
-                <af:outputText value="#{TotalBacker.total}" />
+                <tr:outputText value="#{TotalBacker.total}" />
               </f:facet>
-            </af:column>
+            </tr:column>
             <f:facet name="footer">
-              <af:outputText value="Total"/>
+              <tr:outputText value="Total"/>
             </f:facet>
-          </af:table>
-        </af:panelPage>
-      </af:form>
-    </af:document>
+          </tr:table>
+        </tr:panelPage>
+      </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core" 
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -28,56 +28,56 @@
   <f:loadBundle var="nls"
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   <f:view>
-    <af:document title="Message Sent">
-       <af:form>
-        <af:panelPage>
+    <tr:document title="Message Sent">
+       <tr:form>
+        <tr:panelPage>
           
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index"
                     immediate="true"
                     action="home"/>
-                <af:commandNavigationItem text="Logout" 
+                <tr:commandNavigationItem text="Logout" 
                                   action="#{email.logout}"/>
-                <af:commandNavigationItem text="Preferences"
+                <tr:commandNavigationItem text="Preferences"
                                   action="preferences"/>
-                <af:commandNavigationItem text="Help"
+                <tr:commandNavigationItem text="Help"
                                   action="action.none"/>
-              </af:menuButtons>
+              </tr:menuButtons>
             </f:facet>
             
             <f:facet name="infoUser">
-              <af:outputFormatted value="Logged in as #{email.username}"
+              <tr:outputFormatted value="Logged in as #{email.username}"
                              styleUsage="pageStamp"/>
             </f:facet>
         
-          <af:panelHeader messageType="confirmation" text="Message Sent">
-            <af:outputFormatted value="#{nls.MESSAGE_SENT}"/>
-          </af:panelHeader>
+          <tr:panelHeader messageType="confirmation" text="Message Sent">
+            <tr:outputFormatted value="#{nls.MESSAGE_SENT}"/>
+          </tr:panelHeader>
 
           <!--
           <f:facet name="infoReturn">
-            <af:commandLink text="Return to #{email.currentFolder.name}"
+            <tr:commandLink text="Return to #{email.currentFolder.name}"
                             action="messages" immediate="true"/>
           </f:facet>
           -->
-          <af:panelButtonBar>
-            <af:commandButton textAndAccessKey="Back to &amp;Messages" immediate="true"
+          <tr:panelButtonBar>
+            <tr:commandButton textAndAccessKey="Back to &amp;Messages" immediate="true"
                               action="messages"/>                                
-          </af:panelButtonBar>
-        </af:panelPage>
-       </af:form>
-    </af:document>
+          </tr:panelButtonBar>
+        </tr:panelPage>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/login.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/login.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/login.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces">
+          xmlns:tr="http://myfaces.apache.org/trinidad">
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -28,61 +28,61 @@
   <f:loadBundle var="nls"
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   <f:view>
-    <af:document title="Email Log In">
-        <af:form>
-          <af:panelPage>
-            <af:messages/>
+    <tr:document title="Email Log In">
+        <tr:form>
+          <tr:panelPage>
+            <tr:messages/>
             <f:facet name="branding">
-              <af:panelGroup layout="vertical">
-                <af:panelGroup>
-                  <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}"
+              <tr:panelGroup layout="vertical">
+                <tr:panelGroup>
+                  <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}"
                                       styleClass="AFHeaderLevelOne"/>
-                  <af:objectImage source="/email/images/pbs.gif"
+                  <tr:objectImage source="/email/images/pbs.gif"
                                   shortDesc="Email demo"/>
-                </af:panelGroup>
-                <af:outputFormatted value="Customer &lt;b>Foo - Anywhere, U.S.A. &lt;/b>"
+                </tr:panelGroup>
+                <tr:outputFormatted value="Customer &lt;b>Foo - Anywhere, U.S.A. &lt;/b>"
                                     styleUsage="inContextBranding"/>
-              </af:panelGroup>
+              </tr:panelGroup>
             </f:facet>
             <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index" immediate="true"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index" immediate="true"
                                     action="home"/>
-                <af:commandNavigationItem text="Help" action="action.none"/>
-              </af:menuButtons>
+                <tr:commandNavigationItem text="Help" action="action.none"/>
+              </tr:menuButtons>
             </f:facet>
             <f:facet name="infoStatus">
-              <af:outputText styleClass="AFErrorText"
+              <tr:outputText styleClass="AFErrorText"
                              value="Note: The Trinidad Email Demo application is not                  configured to use a secure communication channel between                  the browser and the application server - or between the                  application server and the IMAP server.                   This means that your data (including your user name/password                  and email contents) are transmitted in a non-secure manner.                   Thus, this sample application should only be used in environments                 that are known to be secure."/>
             </f:facet>
-           <af:panelHeader text="Email Log In">
-            <af:panelForm>
-              <af:inputText required="true" labelAndAccessKey="&amp;Username"
+           <tr:panelHeader text="Email Log In">
+            <tr:panelForm>
+              <tr:inputText required="true" labelAndAccessKey="&amp;Username"
                             value="#{email.username}">
                 <f:facet name="help">
-                  <af:outputFormatted value="The part that comes &lt;b>before&lt;/b> the @ in your email address"/>
+                  <tr:outputFormatted value="The part that comes &lt;b>before&lt;/b> the @ in your email address"/>
                 </f:facet>
-              </af:inputText>
-              <af:inputText labelAndAccessKey="&amp;Password"
+              </tr:inputText>
+              <tr:inputText labelAndAccessKey="&amp;Password"
                             value="#{email.password}" secret="true"/>
-              <af:inputText required="true" label="Domain"
+              <tr:inputText required="true" label="Domain"
                             value="#{email.domain}">
                 <f:facet name="help">
-                  <af:outputFormatted value="The part that comes &lt;b>after&lt;/b> the @ in your email address"/>
+                  <tr:outputFormatted value="The part that comes &lt;b>after&lt;/b> the @ in your email address"/>
                 </f:facet>
-                </af:inputText>
-              <af:inputText required="true" label="IMAP Server"
+                </tr:inputText>
+              <tr:inputText required="true" label="IMAP Server"
                             value="#{email.server}"/>
-              <af:inputText required="true" label="SMTP Server"
+              <tr:inputText required="true" label="SMTP Server"
                             value="#{email.smtpServer}"/>
-            </af:panelForm>
-           </af:panelHeader>
-            <af:panelButtonBar>
-              <af:commandButton textAndAccessKey="&amp;Log In"
+            </tr:panelForm>
+           </tr:panelHeader>
+            <tr:panelButtonBar>
+              <tr:commandButton textAndAccessKey="&amp;Log In"
                                 action="#{email.login}"/>
-            </af:panelButtonBar>
-          </af:panelPage>
-        </af:form>
-    </af:document>
+            </tr:panelButtonBar>
+          </tr:panelPage>
+        </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -29,57 +29,57 @@
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   
   <f:view>
-    <af:document title="Message List">
-       <af:form>
+    <tr:document title="Message List">
+       <tr:form>
        
-        <af:panelPage>
-          <af:messages/>
+        <tr:panelPage>
+          <tr:messages/>
           
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index"
                     immediate="true"
                     action="home"/>
-                <af:commandNavigationItem text="Logout" 
+                <tr:commandNavigationItem text="Logout" 
                                   action="#{email.logout}"/>
-                <af:commandNavigationItem text="Preferences"
+                <tr:commandNavigationItem text="Preferences"
                                   action="preferences"/>
-                <af:commandNavigationItem text="Help"
+                <tr:commandNavigationItem text="Help"
                                   action="action.none"/>
-              </af:menuButtons>
+              </tr:menuButtons>
             </f:facet>
             
             <f:facet name="infoUser">
-              <af:outputFormatted value="Logged in as #{email.username}"
+              <tr:outputFormatted value="Logged in as #{email.username}"
                                   styleUsage="pageStamp"/>
             </f:facet>
              <f:facet name="navigation3">
-                <af:tree var="currentFolder" value="#{email.folderModel}">
+                <tr:tree var="currentFolder" value="#{email.folderModel}">
                   <f:facet name="nodeStamp">
-                    <af:commandLink 
+                    <tr:commandLink 
                            disabled="#{!currentFolder.holdsMessages}"
                            action="#{currentFolder.viewMessages}">
-                      <af:outputText value="#{currentFolder.name}"/>
-                      <af:outputText
+                      <tr:outputText value="#{currentFolder.name}"/>
+                      <tr:outputText
                          rendered="#{currentFolder.unreadMessageCount &gt; 0}"
                          value=" (#{currentFolder.unreadMessageCount})"/>
-                    </af:commandLink>
+                    </tr:commandLink>
                   </f:facet>
-                </af:tree>
+                </tr:tree>
             </f:facet>
-           <af:panelHeader text="View Messages for Folder #{email.currentFolder.name}">
-            <af:table rows="#{email.preferences.rowsShown}"
+           <tr:panelHeader text="View Messages for Folder #{email.currentFolder.name}">
+            <tr:table rows="#{email.preferences.rowsShown}"
                       var="currentMessage"
                       value="#{email.currentFolder.messageListModel}"
                       binding="#{messagesBacking.messagesTable}"
@@ -91,67 +91,67 @@
                       rowSelection="multiple"
                       rowBandingInterval = "1">
               <f:facet name="footer">
-                <af:commandButton text="Delete"
+                <tr:commandButton text="Delete"
                         actionListener="#{messagesBacking.performDelete}"/>
               </f:facet>
-              <af:column  noWrap="true">
+              <tr:column  noWrap="true">
                 <f:facet name="header">
-                  <af:outputText value="Subject"/>
+                  <tr:outputText value="Subject"/>
                 </f:facet>
-                <af:panelGroup>
-                  <af:objectImage rendered="#{currentMessage.deleted}"
+                <tr:panelGroup>
+                  <tr:objectImage rendered="#{currentMessage.deleted}"
                                   source="/email/images/deleted.gif"/>
-                  <af:commandLink action="showMessage">
-                    <af:outputText
+                  <tr:commandLink action="showMessage">
+                    <tr:outputText
                        styleClass="#{currentMessage.read ? null : 'AFDataText'}"
                        truncateAt="25" value="#{currentMessage.subject}"
                        shortDesc="#{currentMessage.subject}"/>
-                    <af:setActionListener from="#{currentMessage}"
+                    <tr:setActionListener from="#{currentMessage}"
                                           to="#{pageFlowScope.message}"/>
-                  </af:commandLink>
-                </af:panelGroup>
-              </af:column>
-              <af:column rendered="#{email.preferences.displaySenderColumn}">
+                  </tr:commandLink>
+                </tr:panelGroup>
+              </tr:column>
+              <tr:column rendered="#{email.preferences.displaySenderColumn}">
                 <f:facet name="header">
-                  <af:outputText value="Sender"/>
+                  <tr:outputText value="Sender"/>
                 </f:facet>
-                <af:outputText value="#{currentMessage.sender}">
+                <tr:outputText value="#{currentMessage.sender}">
                   <f:converter converterId="org.apache.myfaces.adfdemo.email.EmailDisplay"/>
-                </af:outputText>
-              </af:column>
-              <af:column noWrap="true"
+                </tr:outputText>
+              </tr:column>
+              <tr:column noWrap="true"
                          rendered="#{email.preferences.displayDateColumn}">
                 <f:facet name="header">
-                  <af:outputText value="Sent"/>
+                  <tr:outputText value="Sent"/>
                 </f:facet>
-                <af:outputText value="#{currentMessage.sentDate}">
+                <tr:outputText value="#{currentMessage.sentDate}">
                   <f:converter converterId="org.apache.myfaces.adfdemo.email.RelativeDate"/>
-                </af:outputText>
-              </af:column>
-              <af:column rendered="#{email.preferences.displaySizeColumn}">
+                </tr:outputText>
+              </tr:column>
+              <tr:column rendered="#{email.preferences.displaySizeColumn}">
                 <f:facet name="header">
-                  <af:outputText value="Size"/>
+                  <tr:outputText value="Size"/>
                 </f:facet>
-                <af:outputText value="#{currentMessage.size} kB"/>
-              </af:column>
-            </af:table>
-           </af:panelHeader>
-          <af:panelButtonBar>
-            <af:commandButton text="First"
+                <tr:outputText value="#{currentMessage.size} kB"/>
+              </tr:column>
+            </tr:table>
+           </tr:panelHeader>
+          <tr:panelButtonBar>
+            <tr:commandButton text="First"
                               disabled="#{!messagesBacking.firstEnabled}"
                               action="#{messagesBacking.first}"/>
-            <af:commandButton text="Last"
+            <tr:commandButton text="Last"
                               disabled="#{!messagesBacking.lastEnabled}"
                               action="#{messagesBacking.last}"/>
-            <af:commandButton text="New Message" action="newMessage"/>
-            <af:commandButton text="Refresh"
+            <tr:commandButton text="New Message" action="newMessage"/>
+            <tr:commandButton text="Refresh"
                               action="#{messagesBacking.refresh}"/>
-            <af:commandButton text="Compact"
+            <tr:commandButton text="Compact"
                               action="#{messagesBacking.compact}"/>
-          </af:panelButtonBar>
-        </af:panelPage>
+          </tr:panelButtonBar>
+        </tr:panelPage>
     
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -29,84 +29,84 @@
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   
   <f:view>
-    <af:document title="New Message">
-       <af:form usesUpload="true">
-        <af:panelPage>
-          <af:messages/>
+    <tr:document title="New Message">
+       <tr:form usesUpload="true">
+        <tr:panelPage>
+          <tr:messages/>
 
           <f:facet name="infoStatus">
-            <af:objectLegend name="required" />
+            <tr:objectLegend name="required" />
           </f:facet>
           
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index"
                     immediate="true"
                     action="home"/>
-                <af:commandNavigationItem text="Logout" 
+                <tr:commandNavigationItem text="Logout" 
                                   action="#{email.logout}"/>
-                <af:commandNavigationItem text="Preferences"
+                <tr:commandNavigationItem text="Preferences"
                                   action="preferences"/>
-                <af:commandNavigationItem text="Help"
+                <tr:commandNavigationItem text="Help"
                                   action="action.none"/>
-              </af:menuButtons>
+              </tr:menuButtons>
             </f:facet>
             
             <f:facet name="infoUser">
-              <af:outputFormatted value="Logged in as #{email.username}"
+              <tr:outputFormatted value="Logged in as #{email.username}"
                              styleUsage="pageStamp"/>
             </f:facet>
 
-         <af:panelHeader text="New Message">
-          <af:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
-            <af:inputText label="Subject:" 
+         <tr:panelHeader text="New Message">
+          <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+            <tr:inputText label="Subject:" 
                           required="true"
                           value="#{newMessageBacking.subject}"/>
-            <af:inputText label="To:" 
+            <tr:inputText label="To:" 
                           required="true"
                           value="#{newMessageBacking.to}"
                           validator="#{newMessageBacking.validateEmailList}"/>
-            <af:inputText label="Cc:" 
+            <tr:inputText label="Cc:" 
                           value="#{newMessageBacking.cc}"
                           validator="#{newMessageBacking.validateEmailList}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{newMessageBacking.attachment1}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{newMessageBacking.attachment2}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{newMessageBacking.attachment3}"/>
-            <af:inputText label="Content:" columns="80" rows="20" wrap="soft"
+            <tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
                           value="#{newMessageBacking.content}"/>
-          </af:panelForm>
-         </af:panelHeader>
+          </tr:panelForm>
+         </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">
-            <af:commandLink text="Return to #{email.currentFolder.name}"
+            <tr:commandLink text="Return to #{email.currentFolder.name}"
                             action="messages" immediate="true"/>
           </f:facet>
           -->
-          <af:panelButtonBar>
-            <af:commandButton textAndAccessKey="&amp;Send Message"
+          <tr:panelButtonBar>
+            <tr:commandButton textAndAccessKey="&amp;Send Message"
                               action="#{newMessageBacking.send}"/>
-            <af:commandButton textAndAccessKey="Save as &amp;Draft"
+            <tr:commandButton textAndAccessKey="Save as &amp;Draft"
                               action="#{newMessageBacking.saveAsDraft}"/>
-            <af:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
+            <tr:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
                               action="cancel"/>                                
-          </af:panelButtonBar>
-        </af:panelPage>
+          </tr:panelButtonBar>
+        </tr:panelPage>
     
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -29,80 +29,80 @@
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   
   <f:view>
-    <af:document title="Preferences">
-       <af:form>
+    <tr:document title="Preferences">
+       <tr:form>
        
-        <af:panelPage>
-          <af:messages/>
+        <tr:panelPage>
+          <tr:messages/>
 
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index"
                     immediate="true"
                     action="home"/>
-                <af:commandNavigationItem text="Logout" 
+                <tr:commandNavigationItem text="Logout" 
                                   action="#{email.logout}"/>
-                <af:commandNavigationItem text="Preferences"
+                <tr:commandNavigationItem text="Preferences"
                                   action="preferences" selected="true"/>
-                <af:commandNavigationItem text="Help"
+                <tr:commandNavigationItem text="Help"
                                   action="action.none"/>
-              </af:menuButtons>
+              </tr:menuButtons>
             </f:facet>
             
             <f:facet name="infoUser">
-              <af:outputFormatted value="Logged in as #{email.username}"
+              <tr:outputFormatted value="Logged in as #{email.username}"
                              styleUsage="pageStamp"/>
             </f:facet>
     
-        <af:panelHeader text="Update Preferences">
-          <af:panelForm> 
-            <af:selectOneChoice label="Skin-family:"
+        <tr:panelHeader text="Update Preferences">
+          <tr:panelForm> 
+            <tr:selectOneChoice label="Skin-family:"
                               value="#{email.preferences.skinFamily}">
               <f:selectItems value="#{email.preferences.skinFamilyItems}"/>
-            </af:selectOneChoice>
-            <af:selectOneChoice label="Accessibility features:"
+            </tr:selectOneChoice>
+            <tr:selectOneChoice label="Accessibility features:"
                               value="#{email.preferences.accessibilityMode}">
               <f:selectItems value="#{email.preferences.accessibilityModeItems}"/>
-            </af:selectOneChoice>
-            <af:inputText label="Messages per screen:"
+            </tr:selectOneChoice>
+            <tr:inputText label="Messages per screen:"
                           value="#{email.preferences.rowsShown}">
               <f:facet name="help">
-                <af:outputText value="Enter a value between 5 and 100."/>
+                <tr:outputText value="Enter a value between 5 and 100."/>
               </f:facet>
               <f:validateLongRange minimum="5" maximum="100"/>
-            </af:inputText>
-            <af:panelLabelAndMessage label="Columns:">
-              <af:panelGroup layout="vertical">
-                <af:selectBooleanCheckbox text="Sender"
+            </tr:inputText>
+            <tr:panelLabelAndMessage label="Columns:">
+              <tr:panelGroup layout="vertical">
+                <tr:selectBooleanCheckbox text="Sender"
                      value="#{email.preferences.displaySenderColumn}"/>
-                <af:selectBooleanCheckbox text="Date"
+                <tr:selectBooleanCheckbox text="Date"
                      value="#{email.preferences.displayDateColumn}"/>
-                <af:selectBooleanCheckbox text="Size"
+                <tr:selectBooleanCheckbox text="Size"
                      value="#{email.preferences.displaySizeColumn}"/>
-              </af:panelGroup>
-            </af:panelLabelAndMessage>
-          </af:panelForm>
-         </af:panelHeader>
-          <af:panelButtonBar>  
-            <af:commandButton textAndAccessKey="&amp;Save"
+              </tr:panelGroup>
+            </tr:panelLabelAndMessage>
+          </tr:panelForm>
+         </tr:panelHeader>
+          <tr:panelButtonBar>  
+            <tr:commandButton textAndAccessKey="&amp;Save"
                               action="success"/>   
-            <af:commandButton textAndAccessKey="Cance&amp;l"
+            <tr:commandButton textAndAccessKey="Cance&amp;l"
                               action="success" immediate="true"/>                                  
-          </af:panelButtonBar>
-        </af:panelPage>
+          </tr:panelButtonBar>
+        </tr:panelPage>
     
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx Thu Jul 27 17:05:32 2006
@@ -16,7 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -29,84 +29,84 @@
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>
   
   <f:view>
-    <af:document title="New Message">
-       <af:form usesUpload="true">
-        <af:panelPage>
-          <af:messages/>
+    <tr:document title="New Message">
+       <tr:form usesUpload="true">
+        <tr:panelPage>
+          <tr:messages/>
 
           <f:facet name="infoStatus">
-            <af:objectLegend name="required" />
+            <tr:objectLegend name="required" />
           </f:facet>
           
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-              <af:menuButtons>
-                <af:commandNavigationItem text="Return to Index"
+              <tr:menuButtons>
+                <tr:commandNavigationItem text="Return to Index"
                     immediate="true"
                     action="home"/>
-                <af:commandNavigationItem text="Logout" 
+                <tr:commandNavigationItem text="Logout" 
                                   action="#{email.logout}"/>
-                <af:commandNavigationItem text="Preferences"
+                <tr:commandNavigationItem text="Preferences"
                                   action="preferences"/>
-                <af:commandNavigationItem text="Help"
+                <tr:commandNavigationItem text="Help"
                                   action="action.none"/>
-              </af:menuButtons>
+              </tr:menuButtons>
             </f:facet>
             
             <f:facet name="infoUser">
-              <af:outputFormatted value="Logged in as #{email.username}"
+              <tr:outputFormatted value="Logged in as #{email.username}"
                              styleUsage="pageStamp"/>
             </f:facet>
 
-        <af:panelHeader text="New Message">
-          <af:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
-            <af:inputText label="Subject:" 
+        <tr:panelHeader text="New Message">
+          <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+            <tr:inputText label="Subject:" 
                           required="true"
                           value="#{replyToMessageBacking.subject}"/>
-            <af:inputText label="To:" 
+            <tr:inputText label="To:" 
                           required="true"
                           value="#{replyToMessageBacking.to}"
                           validator="#{replyToMessageBacking.validateEmailList}"/>
-            <af:inputText label="Cc:" 
+            <tr:inputText label="Cc:" 
                           value="#{replyToMessageBacking.cc}"
                           validator="#{replyToMessageBacking.validateEmailList}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{replyToMessageBacking.attachment1}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{replyToMessageBacking.attachment2}"/>
-            <af:inputFile label="Attachment:"
+            <tr:inputFile label="Attachment:"
                           value="#{replyToMessageBacking.attachment3}"/>
-            <af:inputText label="Content:" columns="80" rows="20" wrap="soft"
+            <tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
                           value="#{replyToMessageBacking.content}"/>
-          </af:panelForm>
-        </af:panelHeader>
+          </tr:panelForm>
+        </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">
-            <af:commandLink text="Return to #{email.currentFolder.name}"
+            <tr:commandLink text="Return to #{email.currentFolder.name}"
                             action="messages" immediate="true"/>
           </f:facet>
           -->
-          <af:panelButtonBar>
-            <af:commandButton textAndAccessKey="&amp;Send Message"
+          <tr:panelButtonBar>
+            <tr:commandButton textAndAccessKey="&amp;Send Message"
                               action="#{replyToMessageBacking.send}"/>
-            <af:commandButton textAndAccessKey="Save as &amp;Draft"
+            <tr:commandButton textAndAccessKey="Save as &amp;Draft"
                               action="#{replyToMessageBacking.saveAsDraft}"/>
-            <af:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
+            <tr:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
                               action="cancel"/>                                
-          </af:panelButtonBar>
-        </af:panelPage>
+          </tr:panelButtonBar>
+        </tr:panelPage>
     
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx Thu Jul 27 17:05:32 2006
@@ -16,8 +16,8 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <!-- 
   Load a resource bundle localized for the Locale of the current view, 
@@ -29,135 +29,135 @@
   <f:loadBundle var="nls"
                 basename="org.apache.myfaces.adfdemo.email.resource.EmailDemoBundle"/>  
   <f:view>
-    <af:document title="Message">
-       <af:form>
-        <af:panelPage>
-          <af:messages/>
+    <tr:document title="Message">
+       <tr:form>
+        <tr:panelPage>
+          <tr:messages/>
           
           <f:facet name="branding">
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <af:objectImage source="/email/images/pbs.gif"/>
-              </af:panelGroup>
-              <af:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
+                <tr:objectImage source="/email/images/pbs.gif"/>
+              </tr:panelGroup>
+              <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </af:panelGroup>
+            </tr:panelGroup>
           </f:facet>
           
           <f:facet name="navigationGlobal">
-            <af:menuButtons>
-              <af:commandNavigationItem text="Return to Index"
+            <tr:menuButtons>
+              <tr:commandNavigationItem text="Return to Index"
                   immediate="true"
                   action="home"/>
-              <af:commandNavigationItem text="Logout" 
+              <tr:commandNavigationItem text="Logout" 
                                 action="#{email.logout}"/>
-              <af:commandNavigationItem text="Preferences"
+              <tr:commandNavigationItem text="Preferences"
                                 action="preferences"/>
-              <af:commandNavigationItem text="Help"
+              <tr:commandNavigationItem text="Help"
                                 action="action.none"/>
-            </af:menuButtons>
+            </tr:menuButtons>
            </f:facet>
               
           <f:facet name="infoUser">
-            <af:outputFormatted value="Logged in as #{email.username}"
+            <tr:outputFormatted value="Logged in as #{email.username}"
                            styleUsage="pageStamp"/>
           </f:facet>
           
-        <af:panelHeader text="Message">
-          <af:panelBorder>
+        <tr:panelHeader text="Message">
+          <tr:panelBorder>
             <!-- Top section: include the headers -->
             <f:facet name="innerTop">
-              <af:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
-                <af:panelLabelAndMessage label="From:">
-                  <af:outputText value="#{showMessageBacking.message.sender}"/>
-                </af:panelLabelAndMessage>
-                <af:panelLabelAndMessage label="To:">
-                  <af:panelGroup layout="vertical">
-                    <af:forEach items="#{showMessageBacking.message.tos}"
+              <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+                <tr:panelLabelAndMessage label="From:">
+                  <tr:outputText value="#{showMessageBacking.message.sender}"/>
+                </tr:panelLabelAndMessage>
+                <tr:panelLabelAndMessage label="To:">
+                  <tr:panelGroup layout="vertical">
+                    <tr:forEach items="#{showMessageBacking.message.tos}"
                                 var="address">  
-                      <af:outputText value="#{address}"/>
-                    </af:forEach>
-                 </af:panelGroup>
-                </af:panelLabelAndMessage>
-                <af:panelLabelAndMessage label="Cc:"
+                      <tr:outputText value="#{address}"/>
+                    </tr:forEach>
+                 </tr:panelGroup>
+                </tr:panelLabelAndMessage>
+                <tr:panelLabelAndMessage label="Cc:"
                   labelStyle="vertical-align: top;">
-                  <af:panelGroup layout="vertical">
-                    <af:forEach items="#{showMessageBacking.message.ccs}"
+                  <tr:panelGroup layout="vertical">
+                    <tr:forEach items="#{showMessageBacking.message.ccs}"
                                 var="address">
-                      <af:outputText value="#{address}"/>
-                    </af:forEach>
-                  </af:panelGroup>
-                </af:panelLabelAndMessage>
-                <af:inputText label="Subject:" readOnly="true"
+                      <tr:outputText value="#{address}"/>
+                    </tr:forEach>
+                  </tr:panelGroup>
+                </tr:panelLabelAndMessage>
+                <tr:inputText label="Subject:" readOnly="true"
                               value="#{showMessageBacking.message.subject}"/>
-                <af:inputText label="Sent:" readOnly="true"
+                <tr:inputText label="Sent:" readOnly="true"
                               value="#{showMessageBacking.message.sentDate}"/>
                 <!-- Commented out: content type
-                <af:inputText label="Content type:" readOnly="true"
+                <tr:inputText label="Content type:" readOnly="true"
                               value="#{showMessageBacking.message.contentType}"/>
                 -->
-              </af:panelForm>
+              </tr:panelForm>
 
             </f:facet>
 
             <!-- Main content -->
-            <af:panelHeader text="Content:">
+            <tr:panelHeader text="Content:">
               <!-- For plain text, show in a readOnly inputText -->
-              <af:inputText rendered="#{showMessageBacking.message.contentType == 'TEXT/PLAIN'}"
+              <tr:inputText rendered="#{showMessageBacking.message.contentType == 'TEXT/PLAIN'}"
                             readOnly="true" columns="80"
                             rows="#{showMessageBacking.message.lineCount &gt; 30
                                 ? 30 : showMessageBacking.message.lineCount}"
                             value="#{showMessageBacking.message.content}"/>
               <!-- HTML content: run through our "outputFormatted" filter -->
-              <afh:rowLayout rendered="#{showMessageBacking.message.contentType != 'TEXT/PLAIN'}"
+              <trh:rowLayout rendered="#{showMessageBacking.message.contentType != 'TEXT/PLAIN'}"
                           width="75%">
-                <af:outputFormatted
+                <tr:outputFormatted
                           value="#{showMessageBacking.message.content}"/>
-              </afh:rowLayout>
-            </af:panelHeader>
+              </trh:rowLayout>
+            </tr:panelHeader>
   
             <!-- Side content for the secondary layer: show attachments -->
             <f:facet name="auxiliary2">
-              <af:panelBox text="Attachments"
+              <tr:panelBox text="Attachments"
                     rendered="#{showMessageBacking.message.attachmentPresent}">
-                <af:panelGroup layout="vertical">
-                  <af:forEach items="#{showMessageBacking.message.attachments}"
+                <tr:panelGroup layout="vertical">
+                  <tr:forEach items="#{showMessageBacking.message.attachments}"
                               var="attachment">
-                    <af:commandLink text="#{attachment.fileName}"
+                    <tr:commandLink text="#{attachment.fileName}"
                         action="#{showMessageBacking.downloadAttachment}">
-                      <af:setActionListener from="#{attachment}"
+                      <tr:setActionListener from="#{attachment}"
                          to="#{showMessageBacking.attachmentToDownload}"/>
-                    </af:commandLink>
-                  </af:forEach>
-                </af:panelGroup>
-              </af:panelBox>
+                    </tr:commandLink>
+                  </tr:forEach>
+                </tr:panelGroup>
+              </tr:panelBox>
             </f:facet>
-          </af:panelBorder>
-        </af:panelHeader>
+          </tr:panelBorder>
+        </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">
-            <af:commandLink text="Return to #{email.currentFolder.name}"
+            <tr:commandLink text="Return to #{email.currentFolder.name}"
                             action="messages"/>
           </f:facet>
           -->
-          <af:panelButtonBar>
-            <af:commandButton textAndAccessKey="&amp;Reply" 
+          <tr:panelButtonBar>
+            <tr:commandButton textAndAccessKey="&amp;Reply" 
                               action="reply">
-              <af:setActionListener from="#{'false'}"
+              <tr:setActionListener from="#{'false'}"
                                     to="#{pageFlowScope.replyToAll}"/>
-            </af:commandButton>  
-            <af:commandButton textAndAccessKey="&amp;Reply to &amp;All" 
+            </tr:commandButton>  
+            <tr:commandButton textAndAccessKey="&amp;Reply to &amp;All" 
                               action="reply">
-              <af:setActionListener from="#{'true'}"
+              <tr:setActionListener from="#{'true'}"
                                     to="#{pageFlowScope.replyToAll}"/>
-            </af:commandButton>                   
-            <af:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
+            </tr:commandButton>                   
+            <tr:commandButton textAndAccessKey="Cance&amp;l" immediate="true"
                               action="messages"/>                                
-          </af:panelButtonBar>
-        </af:panelPage>
+          </tr:panelButtonBar>
+        </tr:panelPage>
     
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/index.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/index.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/index.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/index.jspx Thu Jul 27 17:05:32 2006
@@ -16,45 +16,45 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
-    <af:document title="Apache Trinidad Demo Index">
-       <af:form>
+    <tr:document title="Apache Trinidad Demo Index">
+       <tr:form>
        
-        <af:panelPage>
-         <af:messages/>
-         <af:panelHeader text="Welcome to the Apache Trinidad Demos">  
-          <af:panelHeader text="Basics">    
-            <af:panelGroup layout="vertical">
-              <af:commandLink text="Component Guide" action="guide" />
-            </af:panelGroup>
-          </af:panelHeader>
+        <tr:panelPage>
+         <tr:messages/>
+         <tr:panelHeader text="Welcome to the Apache Trinidad Demos">  
+          <tr:panelHeader text="Basics">    
+            <tr:panelGroup layout="vertical">
+              <tr:commandLink text="Component Guide" action="guide" />
+            </tr:panelGroup>
+          </tr:panelHeader>
           
-          <af:panelHeader text="Simple Demos">     
-            <af:panelGroup layout="vertical">
-              <af:commandLink text="Feature Demos"
+          <tr:panelHeader text="Simple Demos">     
+            <tr:panelGroup layout="vertical">
+              <tr:commandLink text="Feature Demos"
                        action="demos" />
-            </af:panelGroup>
-          </af:panelHeader>
+            </tr:panelGroup>
+          </tr:panelHeader>
 
-          <af:panelHeader text="Sample Applications">     
-            <af:panelGroup layout="vertical">
-              <af:panelGroup>
-                <af:commandLink text="Email" action="emaildemo" />
-                <af:outputText styleClass="AFInstructionText" value=" - Trinidad Email Demo"/>
-              </af:panelGroup>
-              <af:panelGroup>
-                <af:commandLink text="Survey" action="survey" />                
-                <af:outputText styleClass="AFInstructionText" value=" - simple application"/>
-              </af:panelGroup>
+          <tr:panelHeader text="Sample Applications">     
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup>
+                <tr:commandLink text="Email" action="emaildemo" />
+                <tr:outputText styleClass="AFInstructionText" value=" - Trinidad Email Demo"/>
+              </tr:panelGroup>
+              <tr:panelGroup>
+                <tr:commandLink text="Survey" action="survey" />                
+                <tr:outputText styleClass="AFInstructionText" value=" - simple application"/>
+              </tr:panelGroup>
 
-            </af:panelGroup>
-          </af:panelHeader>
-         </af:panelHeader>
-        </af:panelPage>
+            </tr:panelGroup>
+          </tr:panelHeader>
+         </tr:panelHeader>
+        </tr:panelPage>
        
-       </af:form>
-    </af:document>
+       </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx Thu Jul 27 17:05:32 2006
@@ -17,40 +17,40 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
-          xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
    <html>
     <head>
      <title>Editable form ADF</title>
-     <afh:styleSheet/>
+     <trh:styleSheet/>
     </head>
     <body>
-      <af:form >
-        <af:messages/>
-        <af:panelForm>
-          <af:inputText label="First:" value="1"/>
-          <af:inputText label="Second:" value="2"/>
-          <af:inputText label="Third:" value="3"/>
-          <af:inputText label="Fourth:" value="4"/>
-          <af:inputText label="Fifth:" value="5"/>
-          <af:selectOneRadio label="Radio:" value="3">
+      <tr:form >
+        <tr:messages/>
+        <tr:panelForm>
+          <tr:inputText label="First:" value="1"/>
+          <tr:inputText label="Second:" value="2"/>
+          <tr:inputText label="Third:" value="3"/>
+          <tr:inputText label="Fourth:" value="4"/>
+          <tr:inputText label="Fifth:" value="5"/>
+          <tr:selectOneRadio label="Radio:" value="3">
             <f:selectItem itemValue="1" itemLabel="1"/>
             <f:selectItem itemValue="2" itemLabel="2"/>
             <f:selectItem itemValue="3" itemLabel="3"/>
-          </af:selectOneRadio>
-          <af:selectOneListbox label="List:" value="2">
+          </tr:selectOneRadio>
+          <tr:selectOneListbox label="List:" value="2">
             <f:selectItem itemValue="1" itemLabel="1"/>
             <f:selectItem itemValue="2" itemLabel="2"/>
             <f:selectItem itemValue="3" itemLabel="3"/>
-          </af:selectOneListbox>
-          <af:inputText label="Textarea:" value="Long text" rows="5" />
-          <af:selectBooleanCheckbox label="Checked:" selected="true"
+          </tr:selectOneListbox>
+          <tr:inputText label="Textarea:" value="Long text" rows="5" />
+          <tr:selectBooleanCheckbox label="Checked:" selected="true"
                text="True or false"/>
-        </af:panelForm>
-        <af:commandButton text="Submit"/>
-      </af:form>
+        </tr:panelForm>
+        <tr:commandButton text="Submit"/>
+      </tr:form>
      </body>
     </html>
   </f:view>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_jsf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_jsf.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_jsf.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/editForm_jsf.jspx Thu Jul 27 17:05:32 2006
@@ -17,8 +17,8 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
-          xmlns:afh="http://myfaces.apache.org/adf/faces/html" 
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:trh="http://myfaces.apache.org/trinidad/html" 
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
    <html>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx Thu Jul 27 17:05:32 2006
@@ -17,206 +17,206 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
-          xmlns:af="http://myfaces.apache.org/adf/faces" >
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
- <af:document title="Components using style resource maps">
-        <af:form>
-          <af:panelGroup layout="vertical">
+ <tr:document title="Components using style resource maps">
+        <tr:form>
+          <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <af:objectSeparator/>
+              <tr:objectSeparator/>
             </f:facet>
         
-            <af:commandLink immediate="true" text="Component Guide"
+            <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>
-                <af:outputFormatted styleUsage="instruction" value="&lt;b>Simple messages demo&lt;/b>"/>
+                <tr:outputFormatted styleUsage="instruction" value="&lt;b>Simple messages demo&lt;/b>"/>
               
-            <af:messages/>
+            <tr:messages/>
 
-            <af:inputText label="Label:">
+            <tr:inputText label="Label:">
               <f:facet name="help">
-                <af:outputText value="Type 'cat' to see an error in the message box"/>
+                <tr:outputText value="Type 'cat' to see an error in the message box"/>
               </f:facet>
               <f:converter converterId="javax.faces.BigInteger"/>
-            </af:inputText>                      
+            </tr:inputText>                      
              
-            <af:commandButton text="Submit"/>
+            <tr:commandButton text="Submit"/>
 
-            <af:outputFormatted styleUsage="instruction"
+            <tr:outputFormatted styleUsage="instruction"
                                value="&lt;b>basic panelPage &lt;/b>"/>
         
-            <af:panelPage binding="#{editor.component}">
+            <tr:panelPage binding="#{editor.component}">
               <f:facet name="navigation1">
-                <af:menuTabs>
-                  <af:commandNavigationItem text="tab 1" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="tab 2" action="guide.menuTabs" 
+                <tr:menuTabs>
+                  <tr:commandNavigationItem text="tab 1" action="guide.menuTabs"/>
+                  <tr:commandNavigationItem text="tab 2" action="guide.menuTabs" 
                                    selected="true" />
-                  <af:commandNavigationItem text="tab 3" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="tab 4" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="tab 5" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="tab 6" action="guide.menuTabs"
+                  <tr:commandNavigationItem text="tab 3" action="guide.menuTabs"/>
+                  <tr:commandNavigationItem text="tab 4" action="guide.menuTabs"/>
+                  <tr:commandNavigationItem text="tab 5" action="guide.menuTabs"/>
+                  <tr:commandNavigationItem text="tab 6" action="guide.menuTabs"
                                    disabled="true" />
-                </af:menuTabs>
+                </tr:menuTabs>
               </f:facet>
               <f:facet name="navigation2">
-                <af:menuBar>
-                  <af:commandNavigationItem text="item 1" action="guide.menuBar" 
+                <tr:menuBar>
+                  <tr:commandNavigationItem text="item 1" action="guide.menuBar" 
                                    selected="true" />
-                  <af:commandNavigationItem text="item 2" action="guide.menuBar"
+                  <tr:commandNavigationItem text="item 2" action="guide.menuBar"
                                    disabled="true" />
-                  <af:commandNavigationItem text="item 3" action="guide.menuBar"/>
-                  <af:commandNavigationItem text="item 4" action="guide.menuBar"/>
-                </af:menuBar>
+                  <tr:commandNavigationItem text="item 3" action="guide.menuBar"/>
+                  <tr:commandNavigationItem text="item 4" action="guide.menuBar"/>
+                </tr:menuBar>
               </f:facet>
               <f:facet name="navigation3">
-                <af:menuList>
-                  <af:commandNavigationItem text="item 1" action="guide.menuList" 
+                <tr:menuList>
+                  <tr:commandNavigationItem text="item 1" action="guide.menuList" 
                                    selected="true" />
-                  <af:commandNavigationItem text="item 2" action="guide.menuList"
+                  <tr:commandNavigationItem text="item 2" action="guide.menuList"
                                    disabled="true" />
-                  <af:commandNavigationItem text="item 3" action="guide.menuList"/>
-                  <af:commandNavigationItem text="item 4" action="guide.menuList"/>
-                </af:menuList>
+                  <tr:commandNavigationItem text="item 3" action="guide.menuList"/>
+                  <tr:commandNavigationItem text="item 4" action="guide.menuList"/>
+                </tr:menuList>
               </f:facet>
               <f:facet name="navigationGlobal">
-                <af:menuButtons>
-                  <af:commandNavigationItem text="help"
+                <tr:menuButtons>
+                  <tr:commandNavigationItem text="help"
                                     icon="/components/images/globalhelp.gif"
                                     action="guide.menuButtons"/>
-                  <af:commandNavigationItem text="help more"
+                  <tr:commandNavigationItem text="help more"
                                     icon="/components/images/globalhelp.gif"
                                     action="guide.menuButtons"/>
-                </af:menuButtons>
+                </tr:menuButtons>
               </f:facet>
               <f:facet name="branding">
-                <af:outputFormatted value="Customer &lt;b&gt;InContextBranding Company - Menlo Park&lt;/b&gt;"
+                <tr:outputFormatted value="Customer &lt;b&gt;InContextBranding Company - Menlo Park&lt;/b&gt;"
                                    styleUsage="inContextBranding"/>
               </f:facet>
               <f:facet name="location">
-                <af:navigationPath>
-                  <af:commandNavigationItem text="item 1" action="guide.navigationPath" />
-                  <af:commandNavigationItem text="item 2" action="guide.navigationPath" />
-                  <af:commandNavigationItem text="item 3" action="guide.navigationPath" />
-                  <af:commandNavigationItem text="item 4" action="guide.navigationPath" />
-                </af:navigationPath>
+                <tr:navigationPath>
+                  <tr:commandNavigationItem text="item 1" action="guide.navigationPath" />
+                  <tr:commandNavigationItem text="item 2" action="guide.navigationPath" />
+                  <tr:commandNavigationItem text="item 3" action="guide.navigationPath" />
+                  <tr:commandNavigationItem text="item 4" action="guide.navigationPath" />
+                </tr:navigationPath>
               </f:facet>
               <f:facet name="appCopyright">
-                <af:outputText value="copyright facet"/>
+                <tr:outputText value="copyright facet"/>
               </f:facet>
               <f:facet name="appPrivacy">
-                <af:commandLink text="privacy facet" action="action.none" />
+                <tr:commandLink text="privacy facet" action="action.none" />
               </f:facet>
               <f:facet name="appAbout">
-                <af:commandLink text="about facet" action="action.none" />
+                <tr:commandLink text="about facet" action="action.none" />
               </f:facet>
-              <af:panelHeader text="Title">
-                <af:outputText value="Content here" />
-              </af:panelHeader>
-            </af:panelPage>
+              <tr:panelHeader text="Title">
+                <tr:outputText value="Content here" />
+              </tr:panelHeader>
+            </tr:panelPage>
             
           
-            <af:outputFormatted styleUsage="instruction" value="&lt;b>SelectManyShuttle bound to list&lt;/b>"/>
+            <tr:outputFormatted styleUsage="instruction" value="&lt;b>SelectManyShuttle bound to list&lt;/b>"/>
               
-            <af:selectManyShuttle id="shuttle2" valuePassThru="true"
+            <tr:selectManyShuttle id="shuttle2" valuePassThru="true"
                                  leadingHeader="Available values:"
                                  trailingHeader="Selected values:"
                                  valueChangeListener="#{list.valueChanged}"
                                  value="#{list.objectList}">
-               <af:selectItem label="First" value="foo"/>
-               <af:selectItem label="Second" value="bar"/>
-               <af:selectItem label="Third" value="baz"/>
-            </af:selectManyShuttle>
+               <tr:selectItem label="First" value="foo"/>
+               <tr:selectItem label="Second" value="bar"/>
+               <tr:selectItem label="Third" value="baz"/>
+            </tr:selectManyShuttle>
             
-           <af:outputFormatted styleUsage="instruction" value="&lt;b>SelectOrderShuttle bound to list&lt;/b>"/>
+           <tr:outputFormatted styleUsage="instruction" value="&lt;b>SelectOrderShuttle bound to list&lt;/b>"/>
               
-           <af:selectOrderShuttle id="shuttle3" valuePassThru="true"
+           <tr:selectOrderShuttle id="shuttle3" valuePassThru="true"
                                  leadingHeader="Available values:"
                                  trailingHeader="Selected values:"
                                  valueChangeListener="#{list.valueChanged}"
                                  value="#{list.objectList}" leadingDescShown="true" 
                                  >
-               <af:selectItem label="First" value="foo"/>
-               <af:selectItem label="Second" value="bar"/>
-               <af:selectItem label="Third" value="baz"/>
-           </af:selectOrderShuttle>
+               <tr:selectItem label="First" value="foo"/>
+               <tr:selectItem label="Second" value="bar"/>
+               <tr:selectItem label="Third" value="baz"/>
+           </tr:selectOrderShuttle>
            
            
-           <af:outputFormatted styleUsage="instruction" 
+           <tr:outputFormatted styleUsage="instruction" 
               value="&lt;b>Editable treeTable with Record Set Navigation&lt;/b>"/>
-           <af:treeTable var="foo" value="#{tree.model}" rendered="true"
+           <tr:treeTable var="foo" value="#{tree.model}" rendered="true"
               rowsByDepth="3" summary="Demo of treeTable"
               >
               <f:facet name="nodeStamp">
-                <af:column>
+                <tr:column>
                   <f:facet name="header">
-                    <af:outputText value="Text"/>
+                    <tr:outputText value="Text"/>
                   </f:facet>
-                  <af:outputFormatted value="&lt;b>text:#{foo.text}&lt;/b>"/>
-                </af:column>
+                  <tr:outputFormatted value="&lt;b>text:#{foo.text}&lt;/b>"/>
+                </tr:column>
               </f:facet>
               <f:facet name="pathStamp">
-                <af:outputFormatted value="&lt;b>text:#{foo.text}&lt;/b>"/>
+                <tr:outputFormatted value="&lt;b>text:#{foo.text}&lt;/b>"/>
               </f:facet>
 
-              <af:column>
+              <tr:column>
                 <f:facet name="header">
-                  <af:outputText value="Foo Column"/>
+                  <tr:outputText value="Foo Column"/>
                 </f:facet>
-                <af:inputText value="#{foo.text}"/>
-              </af:column>
+                <tr:inputText value="#{foo.text}"/>
+              </tr:column>
 
-              <af:column>
+              <tr:column>
                 <f:facet name="header">
                   <h:outputText value="Bar Column"/>
                 </f:facet>
                 <h:outputText value="#{foo.text} Bar"/>
-              </af:column>
-         </af:treeTable>
+              </tr:column>
+         </tr:treeTable>
 
-         <af:commandButton text="Submit"/>
+         <tr:commandButton text="Submit"/>
          
-      <af:outputFormatted styleUsage="instruction" value="&lt;b>Giant treeTable&lt;/b>"/>
-         <af:treeTable var="foo" value="#{largeTree.model}" 
+      <tr:outputFormatted styleUsage="instruction" value="&lt;b>Giant treeTable&lt;/b>"/>
+         <tr:treeTable var="foo" value="#{largeTree.model}" 
                summary="Giant treeTable"
               rendered='true'>
               <f:facet name="nodeStamp">
-                <af:column>
+                <tr:column>
                   <f:facet name="header">
-                    <af:outputText value="Label"/>
+                    <tr:outputText value="Label"/>
                   </f:facet>
-                <af:outputFormatted value="&lt;b>#{foo.label}&lt;/b>"/>
-                </af:column>
+                <tr:outputFormatted value="&lt;b>#{foo.label}&lt;/b>"/>
+                </tr:column>
               </f:facet>
               <f:facet name="pathStamp">
-                <af:outputFormatted value="&lt;b>#{foo.label}&lt;/b>"/>
+                <tr:outputFormatted value="&lt;b>#{foo.label}&lt;/b>"/>
               </f:facet>
 
-              <af:column>
+              <tr:column>
                 <f:facet name="header">
-                  <af:outputText value="Parent"/>
+                  <tr:outputText value="Parent"/>
                 </f:facet>
-                <af:outputText value="#{foo.parentLabel}"/>
-              </af:column>
+                <tr:outputText value="#{foo.parentLabel}"/>
+              </tr:column>
 
-              <af:column>
+              <tr:column>
                 <f:facet name="header">
                   <h:outputText value="Index"/>
                 </f:facet>
                 <h:outputText value="#{foo.index}"/>
-              </af:column>
-              <af:column>
+              </tr:column>
+              <tr:column>
                 <f:facet name="header">
                   <h:outputText value="Depth"/>
                 </f:facet>
                 <h:outputText value="#{foo.depth}"/>
-              </af:column>
-          </af:treeTable>
+              </tr:column>
+          </tr:treeTable>
             
             <jsp:directive.include file="../components/editor.jspf" />
     
-          </af:panelGroup>           
+          </tr:panelGroup>           
         
-        </af:form>        
- </af:document>
+        </tr:form>        
+ </tr:document>
   </f:view>
 </jsp:root>