incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r426332 [9/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/org...
Date Fri, 28 Jul 2006 00:05:45 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx Thu Jul 27 17:05:32 2006
@@ -17,75 +17,75 @@
 <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="Explicit AttributeChange Persistence Feature Demo">
-      <af:form>
+    <tr:document title="Explicit AttributeChange Persistence Feature Demo">
+      <tr:form>
 
-        <af:panelPage>
+        <tr:panelPage>
          <f:facet name="navigationGlobal">
-          <af:menuButtons>
-            <af:commandNavigationItem 
+          <tr:menuButtons>
+            <tr:commandNavigationItem 
               text="Return to Change Persistence demo index page"
               immediate="true"
               action="demos.changePersistence"/>
-           </af:menuButtons>
+           </tr:menuButtons>
           </f:facet>
-         <af:panelHeader text="Explicit AttributeChange Persistence Feature Demo">
-          <af:panelGroup layout="vertical">
+         <tr:panelHeader text="Explicit AttributeChange Persistence Feature Demo">
+          <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <af:objectSeparator/>
+              <tr:objectSeparator/>
             </f:facet>
-            <af:panelGroup layout="horizontal">
-              <af:objectImage 
+            <tr:panelGroup layout="horizontal">
+              <tr:objectImage 
                 id="oi1" 
                 source="/adf/images/error.gif"/>
-              <af:objectSpacer width="10"/>
-              <af:commandButton 
+              <tr:objectSpacer width="10"/>
+              <tr:commandButton 
                 text="Change Image" 
                 actionListener="#{change.modifyObjectImage}"/>
-            </af:panelGroup>
-            <af:panelGroup layout="horizontal">
-              <af:panelBox 
+            </tr:panelGroup>
+            <tr:panelGroup layout="horizontal">
+              <tr:panelBox 
                 id="pb1" 
                 text="PanelBoxText"/>
-              <af:objectSpacer width="10"/>
-              <af:commandButton 
+              <tr:objectSpacer width="10"/>
+              <tr:commandButton 
                 text="Change panelBox text" 
                 actionListener="#{change.modifyPanelBox}"/>
-            </af:panelGroup>
-            <af:panelGroup layout="horizontal">
-              <af:table 
+            </tr:panelGroup>
+            <tr:panelGroup layout="horizontal">
+              <tr:table 
                 id="t1"
                 summary="Periodic table elements" 
                 value="#{periodicTable.tableData}" 
                 var="row" 
                 rows="10">
-                <af:column id="c1" sortProperty="name">
+                <tr:column id="c1" sortProperty="name">
                   <f:facet name="header">
-                    <af:outputText value="Name"/>
+                    <tr:outputText value="Name"/>
                   </f:facet>
-                  <af:outputText value="#{row.name}"/>
-                </af:column>
-              </af:table>
-              <af:objectSpacer width="10"/>
-              <af:commandButton 
+                  <tr:outputText value="#{row.name}"/>
+                </tr:column>
+              </tr:table>
+              <tr:objectSpacer width="10"/>
+              <tr:commandButton 
                 text="Toggle sortablity" 
                 actionListener="#{change.modifyColumn}"/>
-            </af:panelGroup>
-            <af:panelGroup layout="horizontal">
-              <af:inputText id="it1" label="Label One"/>
-              <af:objectSpacer width="10"/>
-              <af:commandButton 
+            </tr:panelGroup>
+            <tr:panelGroup layout="horizontal">
+              <tr:inputText id="it1" label="Label One"/>
+              <tr:objectSpacer width="10"/>
+              <tr:commandButton 
                 text="Change label" 
                 actionListener="#{change.modifyInputText}"/>
-            </af:panelGroup>
-          </af:panelGroup>
-         </af:panelHeader>
-        </af:panelPage>
-      </af:form>
-    </af:document>
+            </tr:panelGroup>
+          </tr:panelGroup>
+         </tr:panelHeader>
+        </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/changeDemos/attributeChange_Implicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx Thu Jul 27 17:05:32 2006
@@ -17,69 +17,69 @@
 <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="Implicit AttributeChange Persistence Feature Demo">
-      <af:form>
+    <tr:document title="Implicit AttributeChange Persistence Feature Demo">
+      <tr:form>
 
-        <af:panelPage>
+        <tr:panelPage>
          <f:facet name="navigationGlobal">
-          <af:menuButtons>
-            <af:commandNavigationItem 
+          <tr:menuButtons>
+            <tr:commandNavigationItem 
               text="Return to Change Persistence demo index page"
               immediate="true"
               action="demos.changePersistence"/>
-           </af:menuButtons>
+           </tr:menuButtons>
           </f:facet>
 
-          <af:messages/>
-        <af:panelHeader text="Implicit AttributeChange Persistence Feature Demo">
-          <af:panelGroup layout="vertical">
+          <tr:messages/>
+        <tr:panelHeader text="Implicit AttributeChange Persistence Feature Demo">
+          <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <af:objectSeparator/>
+              <tr:objectSeparator/>
             </f:facet>
-            <af:showDetail 
+            <tr:showDetail 
               id="hs1" 
               partialTriggers="hs1"
               disclosedText="Click to hide me"
               undisclosedText="Click to disclose me">
               <h:outputText value="This showDetail is now Disclosed"/>
-            </af:showDetail>
-            <af:table 
+            </tr:showDetail>
+            <tr:table 
               summary="Periodic table" 
               id="ta1"
               binding="#{tableActions.table}"
               rowSelection="multiple"
               value="#{periodicTable.tableData}" var="row" rows="10">
               <f:facet name="footer">
-                <af:commandButton 
+                <tr:commandButton 
                   text="Report"
                   actionListener="#{tableActions.performReport}"/>
               </f:facet>
-              <af:column>
+              <tr:column>
                 <f:facet name="header">
-                  <af:outputText value="Name"/>
+                  <tr:outputText value="Name"/>
                 </f:facet>
-                <af:outputText value="#{row.name}"/>
-              </af:column>
-              <af:column>
+                <tr:outputText value="#{row.name}"/>
+              </tr:column>
+              <tr:column>
                 <f:facet name="header">
-                  <af:outputText value="Symbol"/>
+                  <tr:outputText value="Symbol"/>
                 </f:facet>
-                <af:outputText value="#{row.symbol}"/>
-              </af:column>
-            </af:table>
-            <af:tree id="tr1" var="foo" value="#{tree.model}">
+                <tr:outputText value="#{row.symbol}"/>
+              </tr:column>
+            </tr:table>
+            <tr:tree id="tr1" var="foo" value="#{tree.model}">
               <f:facet name="nodeStamp">
-                <af:inputText simple="true" shortDesc="Example" value="#{foo.text}"/>
+                <tr:inputText simple="true" shortDesc="Example" value="#{foo.text}"/>
               </f:facet>
-            </af:tree>
-          </af:panelGroup>
-         </af:panelHeader>
-        </af:panelPage>
+            </tr:tree>
+          </tr:panelGroup>
+         </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/demos/changeDemos/changePersistence.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx Thu Jul 27 17:05:32 2006
@@ -17,33 +17,33 @@
 <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="Change Persistence Feature Demos">
-       <af:form>
+    <tr:document title="Change Persistence Feature Demos">
+       <tr:form>
 
-        <af:panelPage>
+        <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:panelHeader text="Change Persistence Feature Demos">
-          <af:panelHeader text="Demos and overview">
-            <af:panelGroup layout="vertical">
+         <tr:panelHeader text="Change Persistence Feature Demos">
+          <tr:panelHeader text="Demos and overview">
+            <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <af:objectSeparator/>
+                <tr:objectSeparator/>
               </f:facet>
-              <af:panelGroup layout="vertical">
-                <af:commandLink 
+              <tr:panelGroup layout="vertical">
+                <tr:commandLink 
                   text="Attribute Change Demo - Implicit Change registration" 
                   action="demos.attributeChange_Implicit"/>
-               <af:outputFormatted 
+               <tr:outputFormatted 
                   styleUsage="instruction"
                   value="Certain of the user actions on few Trinidad components,
                     alter the attributes implicitly. AttributeChange behind such 
@@ -51,23 +51,23 @@
                     UI is restored upon re-visit to the page. In this demo upon
                     interaction with the following components, one can see this 
                     happen:"/>
-                <af:menuList>
-                  <af:outputFormatted 
+                <tr:menuList>
+                  <tr:outputFormatted 
                     styleUsage="instruction" 
                     value="showDetail: Disclosure state"/>
-                  <af:outputFormatted 
+                  <tr:outputFormatted 
                     styleUsage="instruction" 
                     value="table: Row range, Row selection"/>
-                  <af:outputFormatted 
+                  <tr:outputFormatted 
                     styleUsage="instruction" 
                     value="tree: The expansion state of the nodes"/>
-                </af:menuList>
-              </af:panelGroup>
-              <af:panelGroup layout="vertical">
-                <af:commandLink 
+                </tr:menuList>
+              </tr:panelGroup>
+              <tr:panelGroup layout="vertical">
+                <tr:commandLink 
                   text="Attribute Change Demo - Explicit Change registration"
                   action="demos.attributeChange_Explicit"/>
-               <af:outputFormatted 
+               <tr:outputFormatted 
                   styleUsage="instruction"
                   value="This demo shows how AttributeChanges can be created 
                     explicitly and added to ChangeManager, at any 
@@ -78,13 +78,13 @@
                     a change in the UI. A managed bean behind the scene, changes 
                     the attributes, and in addition creates and registers 
                     AttributeChanges."/>
-              </af:panelGroup>
-              <af:panelGroup layout="vertical">
-                <af:commandLink 
+              </tr:panelGroup>
+              <tr:panelGroup layout="vertical">
+                <tr:commandLink 
                   text="Add, Remove or Reorder Children Change Demo - 
                     Explicit Change registration" 
                   action="demos.addRemoveReorderChildrenChange_Explicit"/>
-               <af:outputFormatted 
+               <tr:outputFormatted 
                   styleUsage="instruction"
                   value="This demo shows usage of AddChildChange, 
                     RemoveChildChange and ReorderChildChange. In this demo page, 
@@ -95,13 +95,13 @@
                     these Changes explicitly. Upon re-visit to the page, one can
                     see that these Changes are automatically applied, resulting
                     in the component tree being restored to the last known state."/>
-              </af:panelGroup>
-              <af:panelGroup layout="vertical">
-                <af:commandLink 
+              </tr:panelGroup>
+              <tr:panelGroup layout="vertical">
+                <tr:commandLink 
                   text="Add or Remove Facets Change Demo - 
                     Explicit Change registration"
                   action="demos.addRemoveFacetsChange_Explicit"/>
-               <af:outputFormatted 
+               <tr:outputFormatted 
                   styleUsage="instruction"
                   value="This demo shows usage of AddFacetChange and 
                     RemoveFacetChange. This demo page contains a panelPage, with 
@@ -111,13 +111,13 @@
                     explicitly, so that the UI state is restored upon re-visit 
                     to this page. All this is done by a managed bean behind the 
                     scene."/>
-              </af:panelGroup>
-            </af:panelGroup>
-          </af:panelHeader>
-         </af:panelHeader>
-        </af:panelPage>
+              </tr:panelGroup>
+            </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/demos/chooseInteger.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx Thu Jul 27 17:05:32 2006
@@ -16,43 +16,43 @@
 -->
 <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="Add dialog">
-    <af:form>
-     <af:panelPage>
-       <af:messages/>
-      <af:panelHeader text="Add two numbers">
-      <af:panelForm>
-       <af:inputText label="Number 1:" value="#{chooseInteger.value1}"
+   <tr:document title="Add dialog">
+    <tr:form>
+     <tr:panelPage>
+       <tr:messages/>
+      <tr:panelHeader text="Add two numbers">
+      <tr:panelForm>
+       <tr:inputText label="Number 1:" value="#{chooseInteger.value1}"
                      required="true">
         <f:facet name="help">
-         <af:outputText value="Enter an integer."/>
+         <tr:outputText value="Enter an integer."/>
         </f:facet>
-       </af:inputText>
-       <af:inputText label="Number 2:" value="#{chooseInteger.value2}"
+       </tr:inputText>
+       <tr:inputText label="Number 2:" value="#{chooseInteger.value2}"
                      required="true">
         <f:facet name="help">
-         <af:outputText value="Enter an integer."/>
+         <tr:outputText value="Enter an integer."/>
         </f:facet>
-       </af:inputText>
-       </af:panelForm>
-      </af:panelHeader>
-       <af:panelButtonBar>
-        <af:commandButton text="Show Dialog" action="dialog:simpleDialog"
+       </tr:inputText>
+       </tr:panelForm>
+      </tr:panelHeader>
+       <tr:panelButtonBar>
+        <tr:commandButton text="Show Dialog" action="dialog:simpleDialog"
                           windowWidth="150" windowHeight="150" immediate="true"
                           partialSubmit="true" useWindow="true"
                           returnListener="#{chooseInteger.sayHello}"/>
-        <af:commandButton text="Submit">
-         <af:returnActionListener value="#{chooseInteger.value1 + chooseInteger.value2}"/>
-        </af:commandButton>
-        <af:commandButton text="Cancel" immediate="true">
-         <af:returnActionListener/>
-        </af:commandButton>
-       </af:panelButtonBar>
-     </af:panelPage>
-    </af:form>
-  </af:document>
+        <tr:commandButton text="Submit">
+         <tr:returnActionListener value="#{chooseInteger.value1 + chooseInteger.value2}"/>
+        </tr:commandButton>
+        <tr:commandButton text="Cancel" immediate="true">
+         <tr:returnActionListener/>
+        </tr:commandButton>
+       </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/demos/demos.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx Thu Jul 27 17:05:32 2006
@@ -17,43 +17,43 @@
 <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="Apache Trinidad Feature Demos">
-       <af:form>
+    <tr:document title="Apache Trinidad Feature Demos">
+       <tr:form>
 
-        <af:panelPage>
+        <tr:panelPage>
          <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:menuButtons>
+           </tr:menuButtons>
           </f:facet>
 
-          <af:panelHeader text="Welcome to the Apache Trinidad Feature Demos">
-           <af:panelHeader text="Basics">
-            <af:panelGroup layout="vertical">
-              <af:commandLink text="Converters and Validators" action="convertValidateDemos" />
-              <af:commandLink text="Partial Page Rendering Demos"
+          <tr:panelHeader text="Welcome to the Apache Trinidad Feature Demos">
+           <tr:panelHeader text="Basics">
+            <tr:panelGroup layout="vertical">
+              <tr:commandLink text="Converters and Validators" action="convertValidateDemos" />
+              <tr:commandLink text="Partial Page Rendering Demos"
                               action="demos.ppr" />
-              <af:commandLink text="Dialog Framework Demo"
+              <tr:commandLink text="Dialog Framework Demo"
                               action="demos.dialog" />
-              <af:commandLink text="Progress steps Demo"
+              <tr:commandLink text="Progress steps Demo"
                               action="demos.progressSteps" />
-              <af:commandLink text="Change Persistence Demos"
+              <tr:commandLink text="Change Persistence Demos"
                               action="demos.changePersistence" />
-              <af:commandLink text="Table Demos" action="demos.tableDemos" />
-              <af:commandLink text="Skin Demo" action="demos.skin" />
+              <tr:commandLink text="Table Demos" action="demos.tableDemos" />
+              <tr:commandLink text="Skin Demo" action="demos.skin" />
               
-            </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/demos/launchDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx Thu Jul 27 17:05:32 2006
@@ -16,52 +16,52 @@
 -->
 <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="Dialog Demo">
-      <af:form>
-        <af:panelPage>
+    <tr:document title="Dialog Demo">
+      <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:messages/>
-        <af:panelHeader text="Click &quot;...&quot; or &quot;Add&quot; to change a value">
-         <af:inputText label="Pick a number:" value="(Empty)"
+          <tr:messages/>
+        <tr:panelHeader text="Click &quot;...&quot; or &quot;Add&quot; to change a value">
+         <tr:inputText label="Pick a number:" value="(Empty)"
                        binding="#{launchDialog.input}"/>
-         <af:commandButton text="Add" action="#{launchDialog.doLaunch}"
+         <tr:commandButton text="Add" action="#{launchDialog.doLaunch}"
                           partialSubmit="true" useWindow="true"
                           windowWidth="250" windowHeight="250"
                           launchListener="#{launchDialog.addParameter}"
                           returnListener="#{launchDialog.returned}"/>
-         <af:objectSeparator/>
+         <tr:objectSeparator/>
 
-         <af:table value="#{table}" var="row" width="40%">
-           <af:column>
-             <af:outputText value="#{row.int}"/>
-           </af:column>
-           <af:column noWrap="true" width="100%">
-             <af:panelBorder>
-               <af:inputText readOnly="true" value="(Empty)" binding="#{launchDialog.tableInput}"/>
+         <tr:table value="#{table}" var="row" width="40%">
+           <tr:column>
+             <tr:outputText value="#{row.int}"/>
+           </tr:column>
+           <tr:column noWrap="true" width="100%">
+             <tr:panelBorder>
+               <tr:inputText readOnly="true" value="(Empty)" binding="#{launchDialog.tableInput}"/>
                <f:facet name="end">
-                 <af:commandButton text="..." action="dialog:chooseInteger"
+                 <tr:commandButton text="..." action="dialog:chooseInteger"
                                   windowWidth="300" windowHeight="150"
                                   useWindow="true"
                                   returnListener="#{launchDialog.tableReturned}"/>
                </f:facet>
-             </af:panelBorder>
-           </af:column>
-         </af:table>
-         <af:goLink text="Demo of launching a dialog from &lt;af:poll&gt;"
+             </tr:panelBorder>
+           </tr:column>
+         </tr:table>
+         <tr:goLink text="Demo of launching a dialog from &lt;tr:poll&gt;"
                     destination="launchFromPoll.jspx"/>
-        </af:panelHeader>
-       </af:panelPage>
-      </af:form>
-    </af:document>
+        </tr:panelHeader>
+       </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/launchFromPoll.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchFromPoll.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchFromPoll.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/launchFromPoll.jspx Thu Jul 27 17:05:32 2006
@@ -16,27 +16,27 @@
 -->
 <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="Demo of launching from &lt;af: poll&gt;">
-      <af:form>
-        <af:panelPage>
+    <tr:document title="Demo of launching from &lt;tr: poll&gt;">
+      <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:messages/>
-         <af:panelHeader text="A dialog will launch in 3 seconds">
-           <af:poll pollListener="#{launchDialog.poll}" interval="3000"/>
-         </af:panelHeader>
-        </af:panelPage>
-       </af:form>
-    </af:document>
+          <tr:messages/>
+         <tr:panelHeader text="A dialog will launch in 3 seconds">
+           <tr:poll pollListener="#{launchDialog.poll}" interval="3000"/>
+         </tr:panelHeader>
+        </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/optionsDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx Thu Jul 27 17:05:32 2006
@@ -17,28 +17,28 @@
 <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="Choose options">
-      <af:form>
-       <af:panelPage>
-        <af:messages/>
-        <af:panelHeader text="Choose options">
-         <af:panelForm>
-           <af:panelLabelAndMessage label="Options:" for="options">
+    <tr:document title="Choose options">
+      <tr:form>
+       <tr:panelPage>
+        <tr:messages/>
+        <tr:panelHeader text="Choose options">
+         <tr:panelForm>
+           <tr:panelLabelAndMessage label="Options:" for="options">
             <h:selectManyCheckbox value="#{carOptionsBacking.options}" id="options">
               <f:selectItems value="#{carOptionsBacking.optionsItems}"/>
             </h:selectManyCheckbox>
                
-           </af:panelLabelAndMessage>
-         </af:panelForm>
-        </af:panelHeader>
-        <af:panelButtonBar>
-          <af:commandButton text="OK" action="#{carOptionsBacking.pickOptions}"/>
-        </af:panelButtonBar>
-       </af:panelPage>
-     </af:form>
-    </af:document>
+           </tr:panelLabelAndMessage>
+         </tr:panelForm>
+        </tr:panelHeader>
+        <tr:panelButtonBar>
+          <tr:commandButton text="OK" action="#{carOptionsBacking.pickOptions}"/>
+        </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/demos/panelPageSkinDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx Thu Jul 27 17:05:32 2006
@@ -17,199 +17,199 @@
 <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>
-    <afh:html>
-      <afh:head title="Skin Demo">
+    <trh:html>
+      <trh:head title="Skin Demo">
         <!-- the beach skin is defined in beach.css. If you want to add your own
      custom style classes, you can add it to beach.css or to your own css 
      file, like what we demo here in beachCustomStyles.css -->
         <link rel="stylesheet" charset="UTF-8" type="text/css"
               href="/adf-faces-demo-context-root/skins/beach/CustomStyles.css"/>
-      </afh:head>
-      <afh:body>
-        <af:form>
-          <af:panelGroup layout="vertical">
+      </trh:head>
+      <trh:body>
+        <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:panelGroup layout="vertical">
-              <af:panelGroup layout="horizontal" styleClass="tabsPanelGroup">
-                <af:menuTabs shortDesc="Select tab">
-                  <af:commandNavigationItem text="Home" action="guide.menuTabs"
+            <tr:panelGroup layout="vertical">
+              <tr:panelGroup layout="horizontal" styleClass="tabsPanelGroup">
+                <tr:menuTabs shortDesc="Select tab">
+                  <tr:commandNavigationItem text="Home" action="guide.menuTabs"
                                       selected="true"/>
-                  <af:commandNavigationItem text="Clothing" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="Equipment" action="guide.menuTabs"/>
-                </af:menuTabs>
-                <af:menuButtons>
-                  <af:commandNavigationItem text="Your Account"
+                  <tr:commandNavigationItem text="Clothing" action="guide.menuTabs"/>
+                  <tr:commandNavigationItem text="Equipment" action="guide.menuTabs"/>
+                </tr:menuTabs>
+                <tr:menuButtons>
+                  <tr:commandNavigationItem text="Your Account"
                                       action="guide.menuButtons"/>
-                  <af:outputText value="|"/>
-                  <af:objectIcon name="required"/>
-                  <af:commandNavigationItem text="SALES!" action="guide.menuButtons"/>
-                  <af:objectIcon name="required"/>
-                  <af:outputText value="|"/>
-                  <af:commandNavigationItem text="Help" action="guide.menuButtons"/>
-                </af:menuButtons>
-              </af:panelGroup>
-              <af:menuBar>
-                <af:commandNavigationItem text="Jackets" action="guide.menuBar"
+                  <tr:outputText value="|"/>
+                  <tr:objectIcon name="required"/>
+                  <tr:commandNavigationItem text="SALES!" action="guide.menuButtons"/>
+                  <tr:objectIcon name="required"/>
+                  <tr:outputText value="|"/>
+                  <tr:commandNavigationItem text="Help" action="guide.menuButtons"/>
+                </tr:menuButtons>
+              </tr:panelGroup>
+              <tr:menuBar>
+                <tr:commandNavigationItem text="Jackets" action="guide.menuBar"
                                     selected="true"/>
-                <af:commandNavigationItem text="Pants" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Shirts" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Shoes" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Swimwear" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Sale Items" action="guide.menuBar"/>
-              </af:menuBar>
-              <af:panelGroup layout="horizontal"
+                <tr:commandNavigationItem text="Pants" action="guide.menuBar"/>
+                <tr:commandNavigationItem text="Shirts" action="guide.menuBar"/>
+                <tr:commandNavigationItem text="Shoes" action="guide.menuBar"/>
+                <tr:commandNavigationItem text="Swimwear" action="guide.menuBar"/>
+                <tr:commandNavigationItem text="Sale Items" action="guide.menuBar"/>
+              </tr:menuBar>
+              <tr:panelGroup layout="horizontal"
                              styleClass="adfFacesDemoSearchPanelGroup">
                 <f:facet name="separator">
-                  <af:objectSpacer width="10px"/>
+                  <tr:objectSpacer width="10px"/>
                 </f:facet>
-                <af:selectOneChoice label="Search">
-                  <af:selectItem label="Cycling"/>
-                  <af:selectItem label="Climbing"/>
-                </af:selectOneChoice>
-                <af:selectOneChoice label="Skin-family:" autoSubmit="false"
+                <tr:selectOneChoice label="Search">
+                  <tr:selectItem label="Cycling"/>
+                  <tr:selectItem label="Climbing"/>
+                </tr:selectOneChoice>
+                <tr:selectOneChoice label="Skin-family:" autoSubmit="false"
                                     value="#{sessionScope.skinFamily}">
-                  <af:selectItem label="simple" value="simple"/>
-                  <af:selectItem label="minimal" value="minimal"/>
-                  <af:selectItem label="purple" value="purple"/>
-                  <af:selectItem label="beach" value="beach"/>
-                </af:selectOneChoice>
-                <af:commandButton text="Go"/>
-              </af:panelGroup>
-              <af:panelGroup layout="horizontal" styleClass="welcomePanel">
-                <af:outputFormatted styleUsage="instruction"
-                                    value="&lt;b>Welcome!&lt;/b> We hope you find something you like."></af:outputFormatted>
-              </af:panelGroup>
-              <af:panelHorizontal valign="top" inlineStyle="padding:5px;">
-                <af:panelBox background="medium" text="Browse" inlineStyle="width:160px">
-                  <af:outputText value="Recent Purchases"
+                  <tr:selectItem label="simple" value="simple"/>
+                  <tr:selectItem label="minimal" value="minimal"/>
+                  <tr:selectItem label="purple" value="purple"/>
+                  <tr:selectItem label="beach" value="beach"/>
+                </tr:selectOneChoice>
+                <tr:commandButton text="Go"/>
+              </tr:panelGroup>
+              <tr:panelGroup layout="horizontal" styleClass="welcomePanel">
+                <tr:outputFormatted styleUsage="instruction"
+                                    value="&lt;b>Welcome!&lt;/b> We hope you find something you like."></tr:outputFormatted>
+              </tr:panelGroup>
+              <tr:panelHorizontal valign="top" inlineStyle="padding:5px;">
+                <tr:panelBox background="medium" text="Browse" inlineStyle="width:160px">
+                  <tr:outputText value="Recent Purchases"
                                  styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="flip flops"
+                  <tr:panelList>
+                    <tr:goLink text="flip flops"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="sandals"
+                    <tr:goLink text="sandals"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="trail shoes"
+                    <tr:goLink text="trail shoes"
                                destination="http://www.apache.org"/>
-                  </af:panelList>
-                  <af:outputText value="Equipment" styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="Cycling"
+                  </tr:panelList>
+                  <tr:outputText value="Equipment" styleClass="panelBoxHeader"/>
+                  <tr:panelList>
+                    <tr:goLink text="Cycling"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="Climbing"
+                    <tr:goLink text="Climbing"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="Kayaking"
+                    <tr:goLink text="Kayaking"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="Camping"
+                    <tr:goLink text="Camping"
                                destination="http://www.apache.org"/>
-                  </af:panelList>
-                  <af:outputText value="Clothing" styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="Shirts"
+                  </tr:panelList>
+                  <tr:outputText value="Clothing" styleClass="panelBoxHeader"/>
+                  <tr:panelList>
+                    <tr:goLink text="Shirts"
                                destination="http://www.apache.org"/>
-                    <af:goLink text="Shoes"
+                    <tr:goLink text="Shoes"
                                destination="http://www.apache.org"/>
-                  </af:panelList>
-                </af:panelBox>
-                <af:panelGroup layout="vertical">
-                  <af:panelHeader text="Recommendations for you">
-                    <af:outputText value="Everything in Camping  is on sale! Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
+                  </tr:panelList>
+                </tr:panelBox>
+                <tr:panelGroup layout="vertical">
+                  <tr:panelHeader text="Recommendations for you">
+                    <tr:outputText value="Everything in Camping  is on sale! Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
                                    styleClass="mainContentText"/>
-                  </af:panelHeader>
-                  <af:objectSpacer height="5px"/>
-                  <af:panelHeader text="New in Down Jackets!">
-                    <af:outputText value="You might be sweltering in 100 degree heat, but think ahead to the cold winters and buy                     a down jacket!"
+                  </tr:panelHeader>
+                  <tr:objectSpacer height="5px"/>
+                  <tr:panelHeader text="New in Down Jackets!">
+                    <tr:outputText value="You might be sweltering in 100 degree heat, but think ahead to the cold winters and buy                     a down jacket!"
                                    styleClass="mainContentText"/>
-                  </af:panelHeader>
-                  <af:objectSpacer height="15px"/>
-                  <af:showOneTab>
-                    <af:showDetailItem text="Tab 1">
-                      <af:panelHeader text="Tab Header 1">
-                        <af:panelForm>
-                          <af:inputText readOnly="true" label="Label 2-1"
+                  </tr:panelHeader>
+                  <tr:objectSpacer height="15px"/>
+                  <tr:showOneTab>
+                    <tr:showDetailItem text="Tab 1">
+                      <tr:panelHeader text="Tab Header 1">
+                        <tr:panelForm>
+                          <tr:inputText readOnly="true" label="Label 2-1"
                                         value="Value" styleClass="AFDataText"/>
-                          <af:inputText readOnly="true"
+                          <tr:inputText readOnly="true"
                                         label="Date/Time from last partial refresh"
                                         value="#{date.currentDate}"
                                         styleClass="AFDataText">
-                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
-                          </af:inputText>
-                          <af:selectInputDate label="Birthdate:"/>
-                        </af:panelForm>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                    <af:showDetailItem text="Tab 2" disclosed="true">
-                      <af:panelHeader text="ShowOneTab details">
-                        <af:outputText value="Everything in Camping  is on sale!  Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
+                            <tr:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
+                          </tr:inputText>
+                          <tr:selectInputDate label="Birthdate:"/>
+                        </tr:panelForm>
+                      </tr:panelHeader>
+                    </tr:showDetailItem>
+                    <tr:showDetailItem text="Tab 2" disclosed="true">
+                      <tr:panelHeader text="ShowOneTab details">
+                        <tr:outputText value="Everything in Camping  is on sale!  Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
                                        styleClass="mainContentText"/>
-                        <af:panelGroup layout="horizontal">
-                          <af:goButton text="Sorry, Disabled" disabled="true"/>
-                          <af:objectSpacer width="10px"/>
-                          <af:goButton text="Go!" disabled="false"/>
-                        </af:panelGroup>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                    <af:showDetailItem text="Tab 4" disabled="true"/>
-                    <af:showDetailItem text="Tab 5">
-                      <af:panelHeader text="Header 5">
-                        <af:panelForm>
-                          <af:inputText readOnly="true" label="Label 5-1"
+                        <tr:panelGroup layout="horizontal">
+                          <tr:goButton text="Sorry, Disabled" disabled="true"/>
+                          <tr:objectSpacer width="10px"/>
+                          <tr:goButton text="Go!" disabled="false"/>
+                        </tr:panelGroup>
+                      </tr:panelHeader>
+                    </tr:showDetailItem>
+                    <tr:showDetailItem text="Tab 4" disabled="true"/>
+                    <tr:showDetailItem text="Tab 5">
+                      <tr:panelHeader text="Header 5">
+                        <tr:panelForm>
+                          <tr:inputText readOnly="true" label="Label 5-1"
                                         value="Value" styleClass="AFDataText"/>
-                          <af:inputText readOnly="true"
+                          <tr:inputText readOnly="true"
                                         label="Date/Time from last partial refresh"
                                         value="#{date.currentDate}"
                                         styleClass="AFDataText">
-                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
-                          </af:inputText>
-                        </af:panelForm>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                  </af:showOneTab>
-                </af:panelGroup>
-                <af:panelGroup layout="vertical">
+                            <tr:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
+                          </tr:inputText>
+                        </tr:panelForm>
+                      </tr:panelHeader>
+                    </tr:showDetailItem>
+                  </tr:showOneTab>
+                </tr:panelGroup>
+                <tr:panelGroup layout="vertical">
                   <f:facet name="separator">
-                    <af:objectSpacer height="10px"/>
+                    <tr:objectSpacer height="10px"/>
                   </f:facet>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="New Releases"
+                  <tr:panelBox background="medium" inlineStyle="width:160px">
+                    <tr:panelGroup layout="vertical">
+                      <tr:outputText value="New Releases"
                                      styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
+                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="More Stuff"
+                    </tr:panelGroup>
+                  </tr:panelBox>
+                  <tr:panelBox background="medium" inlineStyle="width:160px">
+                    <tr:panelGroup layout="vertical">
+                      <tr:outputText value="More Stuff"
                                      styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
+                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="Your New Releases"
+                    </tr:panelGroup>
+                  </tr:panelBox>
+                  <tr:panelBox background="medium" inlineStyle="width:160px">
+                    <tr:panelGroup layout="vertical">
+                      <tr:outputText value="Your New Releases"
                                      styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
+                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                </af:panelGroup>
-              </af:panelHorizontal>
-            </af:panelGroup>
-          </af:panelGroup>
-        </af:form>
-      </afh:body>
-    </afh:html>
+                    </tr:panelGroup>
+                  </tr:panelBox>
+                </tr:panelGroup>
+              </tr:panelHorizontal>
+            </tr:panelGroup>
+          </tr:panelGroup>
+        </tr:form>
+      </trh:body>
+    </trh:html>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx Thu Jul 27 17:05:32 2006
@@ -17,247 +17,247 @@
 <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="Partial Page Rendering Demos">
-    <af:form>
+  <tr:document title="Partial Page Rendering Demos">
+    <tr:form>
 
-     <af:panelPage>
+     <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:panelHeader text="Welcome to the Apache Trinidad Partial Page Rendering Demos">
-      <af:outputFormatted styleUsage="instruction"
+    <tr:panelHeader text="Welcome to the Apache Trinidad Partial Page Rendering Demos">
+      <tr:outputFormatted styleUsage="instruction"
                           value="These demos illustrate Partial Page Refresh capabilities using the autoSubmit attribute of various input components."/>
-      <af:panelGroup layout="vertical">
-       <!--af:panelHeader text="Globally updated">
-        <af:outputFormatted styleUsage="instruction"
+      <tr:panelGroup layout="vertical">
+       <!--tr:panelHeader text="Globally updated">
+        <tr:outputFormatted styleUsage="instruction"
                             value="This text gets updated on ANY partial update of the page."/>
-        <af:panelGroup>
-         <af:panelLabelAndMessage label="last PPR update: ">
-          <af:outputFormatted id="globalUpdate"
+        <tr:panelGroup>
+         <tr:panelLabelAndMessage label="last PPR update: ">
+          <tr:outputFormatted id="globalUpdate"
                               partialTriggers="*"
                               styleUsage="instruction"
                               binding="#{partialDemoUtil.globalUpdate}"
                               value="never">
            <f:convertDateTime pattern="HH:mm:ss"/>
-          </af:outputFormatted>
-         </af:panelLabelAndMessage>
-        </af:panelGroup>
-       </af:panelHeader-->
-       <af:panelHeader text="Radio Buttons">
-       <af:outputFormatted styleUsage="instruction"
+          </tr:outputFormatted>
+         </tr:panelLabelAndMessage>
+        </tr:panelGroup>
+       </tr:panelHeader-->
+       <tr:panelHeader text="Radio Buttons">
+       <tr:outputFormatted styleUsage="instruction"
                            value="This demo shows a two sets of radio buttons which use autoSubmit. There is also an output component which is listening on updates to the radio buttons and displaying status text accordingly."/>
-        <af:panelGroup layout="horizontal">
-         <af:panelGroup layout="vertical">
-          <af:panelGroup layout="horizontal">
-           <af:outputFormatted styleUsage="instruction"
+        <tr:panelGroup layout="horizontal">
+         <tr:panelGroup layout="vertical">
+          <tr:panelGroup layout="horizontal">
+           <tr:outputFormatted styleUsage="instruction"
                                value="selectBooleanRadio buttons"/>
-           <af:panelGroup layout="vertical">
-            <af:selectBooleanRadio id="rb1"
+           <tr:panelGroup layout="vertical">
+            <tr:selectBooleanRadio id="rb1"
                                    group="theGroup"
                                    selected="false"
                                    text="item 1"
                                    autoSubmit="true"
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"/>
-            <af:selectBooleanRadio id="rb2"
+            <tr:selectBooleanRadio id="rb2"
                                    group="theGroup"
                                    text="item 2"
                                    selected="false"
                                    autoSubmit="true"
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"/>
-            <af:selectBooleanRadio id="rb3"
+            <tr:selectBooleanRadio id="rb3"
                                    group="theGroup"
                                    text="item 3"
                                    selected="false"
                                    autoSubmit="true"
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"/>
-           </af:panelGroup>
-          </af:panelGroup>
-          <af:objectSpacer width="30" height="10"/>
-          <af:panelGroup layout="vertical">
-           <af:selectOneRadio id="sor1"
+           </tr:panelGroup>
+          </tr:panelGroup>
+          <tr:objectSpacer width="30" height="10"/>
+          <tr:panelGroup layout="vertical">
+           <tr:selectOneRadio id="sor1"
                               label="selectOneRadio buttons"
                               autoSubmit="true"
                               valueChangeListener="#{partialDemoUtil.valueChanged}">
-            <af:selectItem label="item 1" value="1" />
-            <af:selectItem label="item 2" value="2" />
-            <af:selectItem label="item 3" value="3" />
-           </af:selectOneRadio>
-          </af:panelGroup>
-         </af:panelGroup>
-         <af:objectSpacer width="30" height="10"/>
-         <af:panelLabelAndMessage label="Selected: ">
-          <af:outputFormatted id="rbTarget"
+            <tr:selectItem label="item 1" value="1" />
+            <tr:selectItem label="item 2" value="2" />
+            <tr:selectItem label="item 3" value="3" />
+           </tr:selectOneRadio>
+          </tr:panelGroup>
+         </tr:panelGroup>
+         <tr:objectSpacer width="30" height="10"/>
+         <tr:panelLabelAndMessage label="Selected: ">
+          <tr:outputFormatted id="rbTarget"
                               partialTriggers="rb1 rb2 rb3 sor1"
                               styleUsage="instruction"
                               value="#{partialDemoUtil.status.radioStateText}">
            <f:convertDateTime pattern="HH:mm:ss"/>
-          </af:outputFormatted>
-         </af:panelLabelAndMessage>
-        </af:panelGroup>
-       </af:panelHeader>
-       <af:panelHeader text="InputText">
-       <af:outputFormatted styleUsage="instruction"
+          </tr:outputFormatted>
+         </tr:panelLabelAndMessage>
+        </tr:panelGroup>
+       </tr:panelHeader>
+       <tr:panelHeader text="InputText">
+       <tr:outputFormatted styleUsage="instruction"
                            value="This demo shows an autoSubmitting text field."/>
-        <afh:tableLayout width="80%">
-         <afh:rowLayout>
-          <af:inputText id="itxt"
+        <trh:tableLayout width="80%">
+         <trh:rowLayout>
+          <tr:inputText id="itxt"
                         autoSubmit="true"
                         value="#{partialDemoUtil.status.textValue}"
                         label="Enter text here and tab out: "
                         valueChangeListener="#{partialDemoUtil.valueChanged}"/>
-          <af:panelLabelAndMessage label="You entered: ">
-           <af:outputFormatted id="itTarget"
+          <tr:panelLabelAndMessage label="You entered: ">
+           <tr:outputFormatted id="itTarget"
                                partialTriggers="itxt"
                                styleUsage="instruction"
                                value="#{partialDemoUtil.status.textStateText}"/>
-          </af:panelLabelAndMessage>
-         </afh:rowLayout>
-        </afh:tableLayout>
-       </af:panelHeader>
-       <af:panelHeader text="selectOneChoice">
-       <af:outputFormatted styleUsage="instruction"
+          </tr:panelLabelAndMessage>
+         </trh:rowLayout>
+        </trh:tableLayout>
+       </tr:panelHeader>
+       <tr:panelHeader text="selectOneChoice">
+       <tr:outputFormatted styleUsage="instruction"
                            value="This demo illustrates PPR from a choice component."/>
-        <af:panelGroup layout="horizontal">
-         <af:selectOneChoice id="selOne"
+        <tr:panelGroup layout="horizontal">
+         <tr:selectOneChoice id="selOne"
                              autoSubmit="true"
                              label="Choose one"
                              valueChangeListener="#{partialDemoUtil.valueChanged}"
                              value="#{partialDemoUtil.status.choiceInt}">
-          <af:selectItem label="First" value="1"/>
-          <af:selectItem label="Second" value="2"/>
-          <af:selectItem label="Third" value="3"/>
-         </af:selectOneChoice>
-         <af:objectSpacer width="30" height="10"/>
-         <af:panelLabelAndMessage label="You picked: ">
-          <af:outputFormatted partialTriggers="selOne"
+          <tr:selectItem label="First" value="1"/>
+          <tr:selectItem label="Second" value="2"/>
+          <tr:selectItem label="Third" value="3"/>
+         </tr:selectOneChoice>
+         <tr:objectSpacer width="30" height="10"/>
+         <tr:panelLabelAndMessage label="You picked: ">
+          <tr:outputFormatted partialTriggers="selOne"
                               styleUsage="instruction"
                               value="#{partialDemoUtil.status.choiceText}"/>
-         </af:panelLabelAndMessage>
-        </af:panelGroup>
-       </af:panelHeader>
+         </tr:panelLabelAndMessage>
+        </tr:panelGroup>
+       </tr:panelHeader>
 
-       <af:panelHeader text="selectManyListbox">
-       <af:outputFormatted styleUsage="instruction"
+       <tr:panelHeader text="selectManyListbox">
+       <tr:outputFormatted styleUsage="instruction"
 
 
                            value="This demo also shows a multiple select list box component that is bound to a value that will be updated by the ValueChangeEvent listener. This demo only shows the multi-select listbox, but the single select (selectOneListbox) works in exactly the same way."/>
-        <af:panelGroup layout="horizontal">
-         <af:selectManyListbox id="smlb"
+        <tr:panelGroup layout="horizontal">
+         <tr:selectManyListbox id="smlb"
                                autoSubmit="true"
                                label="Choose one or more values: "
                                valueChangeListener="#{partialDemoUtil.valueChanged}">
-          <af:selectItem label="One"   value="1"/>
-          <af:selectItem label="Two"   value="2"/>
-          <af:selectItem label="Three" value="3"/>
-          <af:selectItem label="Four"  value="4"/>
-         </af:selectManyListbox>
-         <af:objectSpacer width="30" height="10"/>
-         <af:panelLabelAndMessage label="List items selected: ">
-          <af:outputFormatted id="smlbTarget"
+          <tr:selectItem label="One"   value="1"/>
+          <tr:selectItem label="Two"   value="2"/>
+          <tr:selectItem label="Three" value="3"/>
+          <tr:selectItem label="Four"  value="4"/>
+         </tr:selectManyListbox>
+         <tr:objectSpacer width="30" height="10"/>
+         <tr:panelLabelAndMessage label="List items selected: ">
+          <tr:outputFormatted id="smlbTarget"
                               styleUsage="instruction"
                               binding="#{partialDemoUtil.listUpdate}"
                               value="nothing yet."/>
-         </af:panelLabelAndMessage>
-        </af:panelGroup>
-       </af:panelHeader>
-       <af:panelHeader text="SelectBooleanCheckbox">
-       <af:outputFormatted styleUsage="instruction"
+         </tr:panelLabelAndMessage>
+        </tr:panelGroup>
+       </tr:panelHeader>
+       <tr:panelHeader text="SelectBooleanCheckbox">
+       <tr:outputFormatted styleUsage="instruction"
                            value="This demo shows a simple checkbox which uses autoSubmit. There are two components listening on the change to the checkbox, one is now visible, the other will become visible after the first click. This also illustrates a cascading PPR update."/>
 
-        <af:panelGroup layout="horizontal">
-         <af:selectBooleanCheckbox id="cb1"
+        <tr:panelGroup layout="horizontal">
+         <tr:selectBooleanCheckbox id="cb1"
                                    value="#{partialDemoUtil.status.checked}"
                                    label="This PPR checkbox"
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"
                                    autoSubmit="true"/>
-         <af:outputFormatted id="cbTarget"
+         <tr:outputFormatted id="cbTarget"
                              partialTriggers="cb1"
                              styleUsage="instruction"
                              value="#{partialDemoUtil.status.checkBoxStateText}"/>
-         <af:objectSpacer width="20"/>
-         <af:panelGroup id="pg1" partialTriggers="cbTarget">
-          <af:outputFormatted styleUsage="instruction"
+         <tr:objectSpacer width="20"/>
+         <tr:panelGroup id="pg1" partialTriggers="cbTarget">
+          <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 0}"
                               value="(clicked #{partialDemoUtil.status.checkBoxUpdateCount} time"/>
-          <af:outputFormatted styleUsage="instruction"
+          <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 1}"
                               value="s"/>
-          <af:outputFormatted styleUsage="instruction"
+          <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 0}"
                               value=")"/>
-         </af:panelGroup>
-        </af:panelGroup>
-       </af:panelHeader>
+         </tr:panelGroup>
+        </tr:panelGroup>
+       </tr:panelHeader>
 
-       <af:panelHeader text="Command components with partialSubmit">
-        <af:outputFormatted styleUsage="instruction"
+       <tr:panelHeader text="Command components with partialSubmit">
+        <tr:outputFormatted styleUsage="instruction"
                             value="This demo shows how command links and buttons can be used to generate partial events."/>
-        <af:panelGroup layout="horizontal">
-         <af:panelGroup layout="vertical">
-          <af:commandLink id="pSub_link"
+        <tr:panelGroup layout="horizontal">
+         <tr:panelGroup layout="vertical">
+          <tr:commandLink id="pSub_link"
                           immediate="true"
                           partialSubmit="true"
                           text="Do a partial Submit."
                           actionListener="#{partialDemoUtil.action}"/>
-          <af:objectSpacer height="6"/>
-          <af:commandButton id="pSub_button"
+          <tr:objectSpacer height="6"/>
+          <tr:commandButton id="pSub_button"
                             immediate="true"
                             partialSubmit="true"
                             text="partialSubmit Button"
                             actionListener="#{partialDemoUtil.action}"/>
-         </af:panelGroup>
-         <af:objectSpacer width="30" height="10"/>
-         <af:panelGroup>
-          <af:panelLabelAndMessage label="last link click: ">
-           <af:outputFormatted id="cmdTarget"
+         </tr:panelGroup>
+         <tr:objectSpacer width="30" height="10"/>
+         <tr:panelGroup>
+          <tr:panelLabelAndMessage label="last link click: ">
+           <tr:outputFormatted id="cmdTarget"
                                partialTriggers="pSub_link pSub_button"
                                styleUsage="instruction"
                                value="#{partialDemoUtil.status.linkUpdate}">
             <f:convertDateTime pattern="HH:mm:ss"/>
-           </af:outputFormatted>
-          </af:panelLabelAndMessage>
-         </af:panelGroup>
-        </af:panelGroup>
-       </af:panelHeader>
-       <af:panelHeader text="Command components with partialSubmit going to another page.">
-        <af:panelGroup layout="vertical">
-         <af:commandLink immediate="true"
+           </tr:outputFormatted>
+          </tr:panelLabelAndMessage>
+         </tr:panelGroup>
+        </tr:panelGroup>
+       </tr:panelHeader>
+       <tr:panelHeader text="Command components with partialSubmit going to another page.">
+        <tr:panelGroup layout="vertical">
+         <tr:commandLink immediate="true"
                          partialSubmit="true"
                          action="home"
                          text="Go to Trinidad demos home page."/>
-         <af:objectSpacer height="6"/>
-         <af:commandLink immediate="true"
+         <tr:objectSpacer height="6"/>
+         <tr:commandLink immediate="true"
                          partialSubmit="true"
                          action="demos.direct"
                          text="Go to feature demos page (no redirect)."/>
-         <af:objectSpacer height="6"/>
-         <af:commandButton immediate="true"
+         <tr:objectSpacer height="6"/>
+         <tr:commandButton immediate="true"
                            partialSubmit="true"
                            action="demos"
                            text="Go to feature demos page."/>
-         </af:panelGroup>
-       </af:panelHeader>
-       <af:panelHeader text="This Reset button will reset all values on the page.">
-        <af:commandButton id="reset"
+         </tr:panelGroup>
+       </tr:panelHeader>
+       <tr:panelHeader text="This Reset button will reset all values on the page.">
+        <tr:commandButton id="reset"
                           text="Reset"
                           immediate="true"
                           actionListener="#{partialDemoUtil.reset}">
-         <af:resetActionListener/>
-        </af:commandButton>
-       </af:panelHeader>
-      </af:panelGroup>
-     </af:panelHeader>
-     </af:panelPage>
-    </af:form>
-  </af:document>
+         <tr:resetActionListener/>
+        </tr:commandButton>
+       </tr:panelHeader>
+      </tr:panelGroup>
+     </tr:panelHeader>
+     </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/progressSteps.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx Thu Jul 27 17:05:32 2006
@@ -17,110 +17,110 @@
 <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="Progress steps Demo">
-        <af:form>
-          <af:panelPage>
+    <tr:document title="Progress steps Demo">
+        <tr:form>
+          <tr:panelPage>
           
             <f:facet name="navigationGlobal">
-             <af:menuButtons>
-              <af:commandNavigationItem 
+             <tr:menuButtons>
+              <tr:commandNavigationItem 
                 text="Return to Feature Demos page"
                 immediate="true"
                 action="demos"
                 actionListener="#{progressSteps.cancelProcess}"/>
-             </af:menuButtons>
+             </tr:menuButtons>
             </f:facet>
-          <af:panelHeader
-             text="Progress steps demo using af:forEach and BoundedRangeModel">
+          <tr:panelHeader
+             text="Progress steps demo using tr:forEach and BoundedRangeModel">
 
-            <af:poll 
+            <tr:poll 
               binding="#{editor.component}" 
               interval="2000" 
               id="pollid" 
               pollListener="#{progressSteps.onPoll}"/>
-            <af:outputFormatted 
+            <tr:outputFormatted 
               styleUsage="instruction" 
               value="&lt;b>The steps completed in a background task could be 
               shown as a check list or a growing list as shown below.&lt;br>
               This could be achieved using suitable output components and the
-              'af:forEach' tag in conjunction with bindings to a 
+              'tr:forEach' tag in conjunction with bindings to a 
               BoundedRangeModel&lt;/b>"/>
 
             <!--Represents a check list-->
-            <af:panelHeader text="Progress steps as a check list"/>
-            <af:panelGroup layout="horizontal">
-              <af:objectSpacer width="30"/>
-              <af:panelGroup layout="vertical" partialTriggers="pollid" id="pg1">
-                <af:forEach 
+            <tr:panelHeader text="Progress steps as a check list"/>
+            <tr:panelGroup layout="horizontal">
+              <tr:objectSpacer width="30"/>
+              <tr:panelGroup layout="vertical" partialTriggers="pollid" id="pg1">
+                <tr:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
                   end="#{progressSteps.progressModel.maximum - 1}" 
                   items="#{progressSteps.progressSteps}">
-                  <af:panelGroup layout="horizontal">
-                    <af:objectSpacer 
+                  <tr:panelGroup layout="horizontal">
+                    <tr:objectSpacer 
                       width="13"
                       rendered="#{vs.index > progressSteps.progressModel.value}"/>
-                    <af:objectImage 
+                    <tr:objectImage 
                       source="/components/images/processCheck.gif" 
                       rendered="#{progressSteps.progressModel.value >= vs.index}"/>
-                    <af:objectSpacer width="5"/>
-                    <af:outputText 
+                    <tr:objectSpacer width="5"/>
+                    <tr:outputText 
                       value="#{progressStep}" 
                       styleClass="AFFieldText"/>
-                  </af:panelGroup>
-                </af:forEach>
-              </af:panelGroup>
-            </af:panelGroup>
+                  </tr:panelGroup>
+                </tr:forEach>
+              </tr:panelGroup>
+            </tr:panelGroup>
 
             <!--Represents a growing list-->
-            <af:panelHeader text="Progress steps as a growing list"/>
-            <af:panelGroup layout="horizontal">
-              <af:objectSpacer width="30"/>
-              <af:panelGroup layout="vertical" partialTriggers="pollid" id="pg2">
-                <af:forEach 
+            <tr:panelHeader text="Progress steps as a growing list"/>
+            <tr:panelGroup layout="horizontal">
+              <tr:objectSpacer width="30"/>
+              <tr:panelGroup layout="vertical" partialTriggers="pollid" id="pg2">
+                <tr:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
                   end="#{progressSteps.progressModel.maximum - 1}" 
                   items="#{progressSteps.progressSteps}">
-                  <af:panelGroup layout="horizontal">
-                    <af:outputText 
+                  <tr:panelGroup layout="horizontal">
+                    <tr:outputText 
                       value="#{progressStep}" 
                       styleClass="AFFieldText"
                       rendered="#{progressSteps.progressModel.value >= vs.index}"/>
-                  </af:panelGroup>
-                </af:forEach>
-              </af:panelGroup>
-            </af:panelGroup>
+                  </tr:panelGroup>
+                </tr:forEach>
+              </tr:panelGroup>
+            </tr:panelGroup>
 
-            <af:panelHeader/>
-            <af:panelGroup layout="horizontal">
-              <af:objectSpacer width="30"/>
-              <af:panelGroup layout="vertical">
-                <af:inputText 
+            <tr:panelHeader/>
+            <tr:panelGroup layout="horizontal">
+              <tr:objectSpacer width="30"/>
+              <tr:panelGroup layout="vertical">
+                <tr:inputText 
                   readOnly="true" 
                   label="Date/Time from last full page refresh" 
                   value="#{date.currentDate}" 
                   styleClass="AFDataText">
-                  <af:convertDateTime 
+                  <tr:convertDateTime 
                     pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
-                </af:inputText>
-                <af:objectSpacer height="10"/>
-                <af:commandButton 
+                </tr:inputText>
+                <tr:objectSpacer height="10"/>
+                <tr:commandButton 
                   text="Cancel" 
                   action="progressCancel" 
                   actionListener="#{progressSteps.cancelProcess}"/>
-              </af:panelGroup>
-            </af:panelGroup>
-          </af:panelHeader>
+              </tr:panelGroup>
+            </tr:panelGroup>
+          </tr:panelHeader>
 
-          </af:panelPage>
-        </af:form>
-    </af:document>
+          </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/simpleDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/simpleDialog.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/simpleDialog.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/simpleDialog.jspx Thu Jul 27 17:05:32 2006
@@ -16,26 +16,26 @@
 -->
 <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"/>
   <f:view>
-    <afh:html>
-      <afh:head title="Simple dialog"/>
-      <afh:body>
-       <af:form>
-        <af:panelPage>
-          <af:messages/>
-         <af:panelHeader text="Hi there!">
-           <af:panelButtonBar>
-            <af:commandButton text="Say Hello" immediate="true">
-              <af:returnActionListener/>                      
-            </af:commandButton>
-           </af:panelButtonBar>
-         </af:panelHeader>
-        </af:panelPage>
-       </af:form>
-      </afh:body>
-    </afh:html>
+    <trh:html>
+      <trh:head title="Simple dialog"/>
+      <trh:body>
+       <tr:form>
+        <tr:panelPage>
+          <tr:messages/>
+         <tr:panelHeader text="Hi there!">
+           <tr:panelButtonBar>
+            <tr:commandButton text="Say Hello" immediate="true">
+              <tr:returnActionListener/>                      
+            </tr:commandButton>
+           </tr:panelButtonBar>
+         </tr:panelHeader>
+        </tr:panelPage>
+       </tr:form>
+      </trh:body>
+    </trh:html>
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/successDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/successDialog.jspx?rev=426332&r1=426331&r2=426332&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/successDialog.jspx (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/successDialog.jspx Thu Jul 27 17:05:32 2006
@@ -16,23 +16,23 @@
 -->
 <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"/>
   <f:view>
-    <af:document title="Success">
-      <af:form>
-       <af:panelPage>
-        <af:panelHeader text="Success">
-         <af:outputText value="The value was #{pageFlowScope.value}"/>
-         <af:panelButtonBar>
-          <af:commandButton text="Done" immediate="true">
-            <af:returnActionListener/>                      
-          </af:commandButton>
-         </af:panelButtonBar>
-        </af:panelHeader>
-       </af:panelPage>
-     </af:form>
-    </af:document>
+    <tr:document title="Success">
+      <tr:form>
+       <tr:panelPage>
+        <tr:panelHeader text="Success">
+         <tr:outputText value="The value was #{pageFlowScope.value}"/>
+         <tr:panelButtonBar>
+          <tr:commandButton text="Done" immediate="true">
+            <tr:returnActionListener/>                      
+          </tr:commandButton>
+         </tr:panelButtonBar>
+        </tr:panelHeader>
+       </tr:panelPage>
+     </tr:form>
+    </tr:document>
   </f:view>
 </jsp:root>



Mime
View raw message