incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r428081 [6/12] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/ trinidad-api/src/test/java/org/apache/myfa...
Date Wed, 02 Aug 2006 18:35:05 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx Wed Aug  2 11:34:29 2006
@@ -34,9 +34,9 @@
            <tr:panelHeader text="Client-side Converters and Validators">
             <tr:outputText styleClass="AFInstructionText"
                            value="In the following examples, converters and validators run on the client, avoiding a round trip."/>
-            <tr:objectSpacer height="10"/>
+            <tr:spacer height="10"/>
             <tr:panelHeader text="Client Converters"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="#{clientValidation.integer}"
                             label="integer converter">
                 <f:facet name="help">
@@ -73,20 +73,20 @@
                   <tr:outputText value="examples of unconvertable values: 'a' or 'cat'"/>
                 </f:facet>
               </tr:inputText>
-              <tr:selectInputColor label="color converter">
+              <tr:inputColor label="color converter">
                 <f:facet name="help">
                   <tr:outputText value="examples of unconvertable values: '9/05' or 'cat'"/>
                 </f:facet>
-              </tr:selectInputColor>
-              <tr:selectInputDate label="date converter">
+              </tr:inputColor>
+              <tr:inputDate label="date converter">
                 <f:facet name="help">
                   <tr:outputText value="examples of unconvertable values: '#FFFF' or 'cat'"/>
                 </f:facet>
-              </tr:selectInputDate>
-            </tr:panelForm>
+              </tr:inputDate>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Client Validators"/>
-            <tr:objectSpacer height="10"/>
-            <tr:panelForm>
+            <tr:spacer height="10"/>
+            <tr:panelFormLayout>
               <tr:inputText value="#{clientValidation.long}"
                             label="long range validator">
                 <f:facet name="help">
@@ -108,15 +108,15 @@
                 </f:facet>
                 <tr:validateByteLength encoding="ISO-8859-1" maximum="4"/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Required"/>
-            <tr:objectSpacer height="10"/>
-            <tr:panelForm>
+            <tr:spacer height="10"/>
+            <tr:panelFormLayout>
               <tr:inputText required="true" label="required field"/>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Example of 3rd party Converter and Validator"/>
-            <tr:objectSpacer height="10"/>
-            <tr:panelForm>
+            <tr:spacer height="10"/>
+            <tr:panelFormLayout>
               <tr:inputText value="#{clientValidation.ssn}"
                             label="ssn converter">
                 <f:facet name="help">
@@ -131,7 +131,7 @@
                 </f:facet>
                 <trdemo:validatePassword/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
            </tr:panelHeader>
             <tr:panelButtonBar>
               <tr:commandButton text="Submit"/>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx Wed Aug  2 11:34:29 2006
@@ -32,7 +32,7 @@
             </f:facet>
           <tr:panelHeader text="Converters and Validators">
             <tr:panelHeader text="Server Side Number Converter"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="99.99" label="number converter1">
                 <f:facet name="help">
                   <tr:outputText value="type='number' integerOnly='true' - This will result in fraction part to be omitted"/>
@@ -69,9 +69,9 @@
                 <f:convertNumber type="currency" locale="en_US"
                                  currencySymbol="#"/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Validators"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="9999" label="reg exp validator">
                 <f:facet name="help">
                   <tr:outputText value="pattern='[9]*'"/>
@@ -91,10 +91,10 @@
                 <tr:validateRegExp pattern="[1-9][2][0-9]"/>
                 <f:validateLongRange maximum="920"/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Date time range validator with ISO date format support"/>
-            <tr:panelForm>
-              <tr:selectInputDate id="mdf3" value="2004-11-25"
+            <tr:panelFormLayout>
+              <tr:inputDate id="mdf3" value="2004-11-25"
                                   label="Submission period">
                 <f:facet name="help">
                   <tr:outputText value="min=2004-11-16  max=2004-12-16"/>
@@ -103,8 +103,8 @@
                 <tr:validateDateTimeRange minimum="2004-11-16"
                                           maximum="2004-12-16"
                                           notInRangeMessageDetail='Date "{0}" does not fall within {1} : {2}'/>
-              </tr:selectInputDate>
-            </tr:panelForm>
+              </tr:inputDate>
+            </tr:panelFormLayout>
            </tr:panelHeader>
            <tr:commandButton text="Submit"/>
           </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx Wed Aug  2 11:34:29 2006
@@ -32,14 +32,14 @@
             </f:facet>
           <tr:panelHeader text="Custom messages for conversion and validation failures">
             <tr:panelHeader text="Message customization on input component for 'required' validation"/>
-            <tr:panelForm>
-              <tr:selectInputDate id="mdf1"
+            <tr:panelFormLayout>
+              <tr:inputDate id="mdf1"
                                   value="#{messageCustomization.date1}"
                                   label="Date of birth" required="true"
-                                  requiredMessageDetail="#{messageCustomization.messages.DOB_REQD_ID}"></tr:selectInputDate>
-            </tr:panelForm>
+                                  requiredMessageDetail="#{messageCustomization.messages.DOB_REQD_ID}"></tr:inputDate>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on reg exp validator"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="#{messageCustomization.regExpValue}"
                             label="Pin" >
                 <f:facet name="help">
@@ -48,9 +48,9 @@
                 <tr:validateRegExp pattern="[1-9][0-9][0-9]"
                                    noMatchMessageDetail="#{messageCustomization.messages.PIN_NO_MATCH_ID}"/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on byte length validator"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="#{messageCustomization.byteLengthValue}"
                             label="Name">
                 <f:facet name="help">
@@ -59,10 +59,10 @@
                 <tr:validateByteLength encoding="ISO-8859-1" maximum="4"
                                        maximumMessageDetail='The "{0}" "{1}" exceeds {2} characters'/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on date time range validator"/>
-            <tr:panelForm>
-              <tr:selectInputDate id="mdf3"
+            <tr:panelFormLayout>
+              <tr:inputDate id="mdf3"
                                   value="#{messageCustomization.date1}"
                                   label="Start date for submission">
                 <f:facet name="help">
@@ -72,8 +72,8 @@
                                           maximumMessageDetail='Date "{1}" in "{0}" is farther than {2}'
                                           minimumMessageDetail='Date "{1}" in "{0}" is before the accepted date - {2} for receving forms. '
                                           notInRangeMessageDetail='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}'/>
-              </tr:selectInputDate>
-              <tr:selectInputDate id="mdf4"
+              </tr:inputDate>
+              <tr:inputDate id="mdf4"
                                   value="#{messageCustomization.date1}"
                                   label="Last date">
                 <f:facet name="help">
@@ -83,8 +83,8 @@
                                           maximumMessageDetail='The date "{1}" in "{0}" which you have chosen, falls after the final acceptable date - {2}.'
                                           minimumMessageDetail='Date "{1}" in "{0}" is less than the minimum acceptable: {2}.'
                                           notInRangeMessageDetail='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}.'/>
-              </tr:selectInputDate>
-              <tr:selectInputDate id="mdf5"
+              </tr:inputDate>
+              <tr:inputDate id="mdf5"
                                   value="#{messageCustomization.date1}"
                                   label="Submission period">
                 <f:facet name="help">
@@ -93,22 +93,22 @@
                 <tr:validateDateTimeRange minimum="#{messageCustomization.minDate}"
                                           maximum="#{messageCustomization.maxDate}"
                                           notInRangeMessageDetail='Submission date "{1}" in "{0}" is not with in the specified period {2}-{3}.'/>
-              </tr:selectInputDate>
-            </tr:panelForm>
+              </tr:inputDate>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on color converter"/>
-            <tr:panelForm>
-              <tr:selectInputColor id="sicConvx" label="Enter or choose color"
+            <tr:panelFormLayout>
+              <tr:inputColor id="sicConvx" label="Enter or choose color"
                                    value="#{messageCustomization.color}">
                 <f:facet name="help">
                   <tr:outputText value="HTML hex color pattern:#RRGGBB"/>
                 </f:facet>
                 <tr:convertColor patterns="#RRGGBB" transparentAllowed="true"
                                  convertMessageDetail='The color "{1}" you have chosen in "{0}" is not a valid HTML hex pattern {2}.'/>
-              </tr:selectInputColor>
-            </tr:panelForm>
+              </tr:inputColor>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on date time converter"/>
-            <tr:panelForm>
-              <tr:selectInputDate id="mdf6" value="2004/09/06"
+            <tr:panelFormLayout>
+              <tr:inputDate id="mdf6" value="2004/09/06"
                                   label="Date of birth">
                 <f:facet name="help">
                   <tr:outputText value="1/20/1972 or 1972/20/2"/>
@@ -119,26 +119,26 @@
                                     convertDateMessageDetail='"{1}" in "{0}" is not a valid date. Example is {2}'
                                     convertTimeMessageDetail='"{1}" in "{0}", is not valid date. Example is {2}.'
                                     convertBothMessageDetail='"{1}" in "{0}", is not valid Date and time. The format is {2}.'/>
-              </tr:selectInputDate>
-              <tr:selectInputDate id="mdf7" value="11:36:15 AM"
+              </tr:inputDate>
+              <tr:inputDate id="mdf7" value="11:36:15 AM"
                                   label="Time of birth">
                 <f:facet name="help">
                   <tr:outputText value="11:36:15 AM"/>
                 </f:facet>
                 <tr:convertDateTime type="time" timeStyle="medium"
                                     convertTimeMessageDetail='"{1}" in "{0}", is not a valid time. Example: {2}.'/>
-              </tr:selectInputDate>
-              <tr:selectInputDate id="mdf8" value="12/20/2004 8:11 AM"
+              </tr:inputDate>
+              <tr:inputDate id="mdf8" value="12/20/2004 8:11 AM"
                                   label="Date and time of birth">
                 <f:facet name="help">
                   <tr:outputText value="2/26/2005 8:11 AM"/>
                 </f:facet>
                 <tr:convertDateTime type="both"
                                     convertBothMessageDetail='"{1}" in "{0}", is not a valid Date and time. Example: {2}.'/>
-              </tr:selectInputDate>
-            </tr:panelForm>
+              </tr:inputDate>
+            </tr:panelFormLayout>
             <tr:panelHeader text="Message customization on number converter"/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText value="555" label="Your lucky number">
                 <f:facet name="help">
                   <tr:outputText value="type='number' locale='en_US' Valid input=44444456 Invalid value=555o"/>
@@ -164,7 +164,7 @@
                 <tr:convertNumber pattern="##.000" locale="en_US"
                                   convertPatternMessageDetail='"{1}" in "{0}" does not match pattern {2}.'/>
               </tr:inputText>
-            </tr:panelForm>
+            </tr:panelFormLayout>
            </tr:panelHeader>
            <tr:commandButton text="Submit"/>
           </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/index.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/index.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/index.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/index.jspx Wed Aug  2 11:34:29 2006
@@ -30,11 +30,11 @@
               </tr:menuButtons>
             </f:facet>
             <tr:panelHeader text="Converter and Validator Demos">
-              <tr:panelGroup layout="vertical">
+              <tr:panelGroupLayout layout="vertical">
                 <tr:commandLink text="client converters and validators" action="clientConvert"/>
                 <tr:commandLink text="converters and validators" action="convertValidate"/>
                 <tr:commandLink text="message customization on validators and converters" action="messageCustomization"/>
-              </tr:panelGroup>
+              </tr:panelGroupLayout>
             </tr:panelHeader>
           </tr:panelPage>
         </tr:form>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx Wed Aug  2 11:34:29 2006
@@ -33,7 +33,7 @@
           </tr:menuButtons>
          </f:facet>
          <tr:messages/>
-         <tr:panelForm>
+         <tr:panelFormLayout>
 
           <tr:selectOneChoice id="makesChoice" label="Makes:"
                               autoSubmit="true"
@@ -48,17 +48,17 @@
            <f:selectItems binding="#{carBacking.modelItems}"/>
           </tr:selectOneChoice>
 
-         </tr:panelForm>
+         </tr:panelFormLayout>
 
          <!-- Show the price -->
-         <tr:panelGroup layout="vertical">
+         <tr:panelGroupLayout layout="vertical">
           <tr:outputText value="Price: "/>
           <tr:outputText id="price" 
                          partialTriggers="modelsChoice makesChoice launchOptions"
                          binding="#{carBacking.price}">
            <f:convertNumber type="currency"/>
           </tr:outputText>
-          <tr:objectSpacer width="10"/>
+          <tr:spacer width="10"/>
           <!-- A link to show the options;  it starts out disabled -->
           <tr:commandLink id="launchOptions" disabled="true"
                          shortDesc="Click to pick new options"
@@ -70,7 +70,7 @@
           <tr:outputText id="options"
                          binding="#{carBacking.options}"
                          partialTriggers="launchOptions modelsChoice makeChoice"/>
-         </tr:panelGroup>
+         </tr:panelGroupLayout>
 
         </tr:panelPage>
        </tr:form>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx Wed Aug  2 11:34:29 2006
@@ -65,12 +65,12 @@
               </tr:menuButtons>
             </f:facet>
             <f:facet name="location">
-              <tr:navigationPath>
+              <tr:breadCrumbs>
                 <tr:commandNavigationItem text="item 1"/>
                 <tr:commandNavigationItem text="item 2"/>
                 <tr:commandNavigationItem text="item 3"/>
                 <tr:commandNavigationItem text="item 4"/>
-              </tr:navigationPath>
+              </tr:breadCrumbs>
             </f:facet>
             <f:facet name="appCopyright">
               <tr:outputText value="copyright facet"/>
@@ -83,9 +83,9 @@
             </f:facet>
           <tr:panelHeader
             text="Explicit AddFacetChange/RemoveFacetChange Persistence Feature Demo">
-            <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
               <tr:commandButton 
                 text="navigation1: Remove facet for menu tabs" 
@@ -105,7 +105,7 @@
               <tr:commandButton 
                 text="Add facet for application branding" 
                 actionListener="#{change.addFacet}"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
            </tr:panelHeader>
           </tr:panelPage>
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx Wed Aug  2 11:34:29 2006
@@ -35,18 +35,18 @@
           </f:facet>
         <tr:panelHeader text="Explicit AddChildChange/RemoveChildChange/ReorderChildrenChange 
           Persistence Feature Demo">
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
-            <tr:panelGroup id="pg1">
-              <tr:objectImage 
+            <tr:panelGroupLayout id="pg1">
+              <tr:image 
                 id="oi1" 
   shortDesc="Corporate Brand"
                 source="/components/images/corporateBrand.gif"/>
               <tr:panelBox id="pb1" text="PanelBoxText"/>
               <tr:inputText id="it1" label="Label"/>
-              <tr:selectInputColor 
+              <tr:inputColor 
                 id="sic1" 
                 chooseId="cc1"
                 label="Color:"
@@ -54,41 +54,41 @@
                 <f:facet name="help">
                   <tr:outputText value="Use format (#RRGGBB) or (r,g,b)"/>
                 </f:facet>
-              </tr:selectInputColor>
+              </tr:inputColor>
               <tr:chooseColor 
                 id="cc1" 
                 colorData="#{requestContext.colorPalette.default49}"/>
               <tr:chooseDate id="cd1"/>
-              <tr:selectInputDate label="Date:" id="sid1" chooseId="cd1"/>
-            </tr:panelGroup>
-            <tr:panelGroup>
+              <tr:inputDate label="Date:" id="sid1" chooseId="cd1"/>
+            </tr:panelGroupLayout>
+            <tr:panelGroupLayout>
               <tr:commandButton 
                 id="cb1" 
                 text="Reorder children" 
                 actionListener="#{change.reorderChildren}"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 id="cb2" 
                 text="Remove color child components" 
                 actionListener="#{change.removeChildren}"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 id="cb3" 
                 text="Remove date child components" 
                 actionListener="#{change.removeChildren}"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 id="cb4" 
                 text="Add an object image child" 
                 actionListener="#{change.appendChild}"/>
-              <tr:objectSpacer width="10" rendered="false"/>
+              <tr:spacer width="10" rendered="false"/>
               <tr:commandButton 
                 id="cb5" 
                 text="Add an object image child to document" 
                 actionListener="#{change.appendChildToDocument}"
                 rendered="false"/>
-            </tr:panelGroup>
-          </tr:panelGroup>
+            </tr:panelGroupLayout>
+          </tr:panelGroupLayout>
          </tr:panelHeader>
         </tr:panelPage>
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx Wed Aug  2 11:34:29 2006
@@ -34,29 +34,29 @@
            </tr:menuButtons>
           </f:facet>
          <tr:panelHeader text="Explicit AttributeChange Persistence Feature Demo">
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
-            <tr:panelGroup layout="horizontal">
-              <tr:objectImage 
+            <tr:panelGroupLayout layout="horizontal">
+              <tr:image 
                 id="oi1" 
                 source="/adf/images/error.gif"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Change Image" 
                 actionListener="#{change.modifyObjectImage}"/>
-            </tr:panelGroup>
-            <tr:panelGroup layout="horizontal">
+            </tr:panelGroupLayout>
+            <tr:panelGroupLayout layout="horizontal">
               <tr:panelBox 
                 id="pb1" 
                 text="PanelBoxText"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Change panelBox text" 
                 actionListener="#{change.modifyPanelBox}"/>
-            </tr:panelGroup>
-            <tr:panelGroup layout="horizontal">
+            </tr:panelGroupLayout>
+            <tr:panelGroupLayout layout="horizontal">
               <tr:table 
                 id="t1"
                 summary="Periodic table elements" 
@@ -70,19 +70,19 @@
                   <tr:outputText value="#{row.name}"/>
                 </tr:column>
               </tr:table>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Toggle sortablity" 
                 actionListener="#{change.modifyColumn}"/>
-            </tr:panelGroup>
-            <tr:panelGroup layout="horizontal">
+            </tr:panelGroupLayout>
+            <tr:panelGroupLayout layout="horizontal">
               <tr:inputText id="it1" label="Label One"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Change label" 
                 actionListener="#{change.modifyInputText}"/>
-            </tr:panelGroup>
-          </tr:panelGroup>
+            </tr:panelGroupLayout>
+          </tr:panelGroupLayout>
          </tr:panelHeader>
         </tr:panelPage>
       </tr:form>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx Wed Aug  2 11:34:29 2006
@@ -35,9 +35,9 @@
 
           <tr:messages/>
         <tr:panelHeader text="Implicit AttributeChange Persistence Feature Demo">
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:showDetail 
               id="hs1" 
@@ -75,7 +75,7 @@
                 <tr:inputText simple="true" shortDesc="Example" value="#{foo.text}"/>
               </f:facet>
             </tr:tree>
-          </tr:panelGroup>
+          </tr:panelGroupLayout>
          </tr:panelHeader>
         </tr:panelPage>
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx Wed Aug  2 11:34:29 2006
@@ -35,11 +35,11 @@
 
          <tr:panelHeader text="Change Persistence Feature Demos">
           <tr:panelHeader text="Demos and overview">
-            <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
-              <tr:panelGroup layout="vertical">
+              <tr:panelGroupLayout layout="vertical">
                 <tr:commandLink 
                   text="Attribute Change Demo - Implicit Change registration" 
                   action="demos.attributeChange_Implicit"/>
@@ -62,8 +62,8 @@
                     styleUsage="instruction" 
                     value="tree: The expansion state of the nodes"/>
                 </tr:menuList>
-              </tr:panelGroup>
-              <tr:panelGroup layout="vertical">
+              </tr:panelGroupLayout>
+              <tr:panelGroupLayout layout="vertical">
                 <tr:commandLink 
                   text="Attribute Change Demo - Explicit Change registration"
                   action="demos.attributeChange_Explicit"/>
@@ -78,8 +78,8 @@
                     a change in the UI. A managed bean behind the scene, changes 
                     the attributes, and in addition creates and registers 
                     AttributeChanges."/>
-              </tr:panelGroup>
-              <tr:panelGroup layout="vertical">
+              </tr:panelGroupLayout>
+              <tr:panelGroupLayout layout="vertical">
                 <tr:commandLink 
                   text="Add, Remove or Reorder Children Change Demo - 
                     Explicit Change registration" 
@@ -95,8 +95,8 @@
                     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."/>
-              </tr:panelGroup>
-              <tr:panelGroup layout="vertical">
+              </tr:panelGroupLayout>
+              <tr:panelGroupLayout layout="vertical">
                 <tr:commandLink 
                   text="Add or Remove Facets Change Demo - 
                     Explicit Change registration"
@@ -111,8 +111,8 @@
                     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."/>
-              </tr:panelGroup>
-            </tr:panelGroup>
+              </tr:panelGroupLayout>
+            </tr:panelGroupLayout>
           </tr:panelHeader>
          </tr:panelHeader>
         </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/chooseInteger.jspx Wed Aug  2 11:34:29 2006
@@ -24,7 +24,7 @@
      <tr:panelPage>
        <tr:messages/>
       <tr:panelHeader text="Add two numbers">
-      <tr:panelForm>
+      <tr:panelFormLayout>
        <tr:inputText label="Number 1:" value="#{chooseInteger.value1}"
                      required="true">
         <f:facet name="help">
@@ -37,7 +37,7 @@
          <tr:outputText value="Enter an integer."/>
         </f:facet>
        </tr:inputText>
-       </tr:panelForm>
+       </tr:panelFormLayout>
       </tr:panelHeader>
        <tr:panelButtonBar>
         <tr:commandButton text="Show Dialog" action="dialog:simpleDialog"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/demos.jspx Wed Aug  2 11:34:29 2006
@@ -35,7 +35,7 @@
 
           <tr:panelHeader text="Welcome to the Apache Trinidad Feature Demos">
            <tr:panelHeader text="Basics">
-            <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="vertical">
               <tr:commandLink text="Converters and Validators" action="convertValidateDemos" />
               <tr:commandLink text="Partial Page Rendering Demos"
                               action="demos.ppr" />
@@ -48,7 +48,7 @@
               <tr:commandLink text="Table Demos" action="demos.tableDemos" />
               <tr:commandLink text="Skin Demo" action="demos.skin" />
               
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
            </tr:panelHeader>
           </tr:panelHeader>
         </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx Wed Aug  2 11:34:29 2006
@@ -39,14 +39,14 @@
                           windowWidth="250" windowHeight="250"
                           launchListener="#{launchDialog.addParameter}"
                           returnListener="#{launchDialog.returned}"/>
-         <tr:objectSeparator/>
+         <tr:separator/>
 
          <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:panelBorderLayout>
                <tr:inputText readOnly="true" value="(Empty)" binding="#{launchDialog.tableInput}"/>
                <f:facet name="end">
                  <tr:commandButton text="..." action="dialog:chooseInteger"
@@ -54,7 +54,7 @@
                                   useWindow="true"
                                   returnListener="#{launchDialog.tableReturned}"/>
                </f:facet>
-             </tr:panelBorder>
+             </tr:panelBorderLayout>
            </tr:column>
          </tr:table>
          <tr:goLink text="Demo of launching a dialog from &lt;tr:poll&gt;"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/optionsDialog.jspx Wed Aug  2 11:34:29 2006
@@ -25,14 +25,14 @@
        <tr:panelPage>
         <tr:messages/>
         <tr:panelHeader text="Choose options">
-         <tr:panelForm>
+         <tr:panelFormLayout>
            <tr:panelLabelAndMessage label="Options:" for="options">
             <h:selectManyCheckbox value="#{carOptionsBacking.options}" id="options">
               <f:selectItems value="#{carOptionsBacking.optionsItems}"/>
             </h:selectManyCheckbox>
                
            </tr:panelLabelAndMessage>
-         </tr:panelForm>
+         </tr:panelFormLayout>
         </tr:panelHeader>
         <tr:panelButtonBar>
           <tr:commandButton text="OK" action="#{carOptionsBacking.pickOptions}"/>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx Wed Aug  2 11:34:29 2006
@@ -31,14 +31,14 @@
       </trh:head>
       <trh:body>
         <tr:form>
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                             action="guide"/>
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup layout="horizontal" styleClass="tabsPanelGroup">
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout layout="horizontal" styleClass="tabsPanelGroup">
                 <tr:menuTabs shortDesc="Select tab">
                   <tr:commandNavigationItem text="Home" action="guide.menuTabs"
                                       selected="true"/>
@@ -49,13 +49,13 @@
                   <tr:commandNavigationItem text="Your Account"
                                       action="guide.menuButtons"/>
                   <tr:outputText value="|"/>
-                  <tr:objectIcon name="required"/>
+                  <tr:icon name="required"/>
                   <tr:commandNavigationItem text="SALES!" action="guide.menuButtons"/>
-                  <tr:objectIcon name="required"/>
+                  <tr:icon name="required"/>
                   <tr:outputText value="|"/>
                   <tr:commandNavigationItem text="Help" action="guide.menuButtons"/>
                 </tr:menuButtons>
-              </tr:panelGroup>
+              </tr:panelGroupLayout>
               <tr:menuBar>
                 <tr:commandNavigationItem text="Jackets" action="guide.menuBar"
                                     selected="true"/>
@@ -65,10 +65,10 @@
                 <tr:commandNavigationItem text="Swimwear" action="guide.menuBar"/>
                 <tr:commandNavigationItem text="Sale Items" action="guide.menuBar"/>
               </tr:menuBar>
-              <tr:panelGroup layout="horizontal"
+              <tr:panelGroupLayout layout="horizontal"
                              styleClass="adfFacesDemoSearchPanelGroup">
                 <f:facet name="separator">
-                  <tr:objectSpacer width="10px"/>
+                  <tr:spacer width="10px"/>
                 </f:facet>
                 <tr:selectOneChoice label="Search">
                   <tr:selectItem label="Cycling"/>
@@ -82,12 +82,12 @@
                   <tr:selectItem label="beach" value="beach"/>
                 </tr:selectOneChoice>
                 <tr:commandButton text="Go"/>
-              </tr:panelGroup>
-              <tr:panelGroup layout="horizontal" styleClass="welcomePanel">
+              </tr:panelGroupLayout>
+              <tr:panelGroupLayout 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:panelGroupLayout>
+              <tr:panelHorizontalLayout valign="top" inlineStyle="padding:5px;">
                 <tr:panelBox background="medium" text="Browse" inlineStyle="width:160px">
                   <tr:outputText value="Recent Purchases"
                                  styleClass="panelBoxHeader"/>
@@ -118,21 +118,21 @@
                                destination="http://www.apache.org"/>
                   </tr:panelList>
                 </tr:panelBox>
-                <tr:panelGroup layout="vertical">
+                <tr:panelGroupLayout 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"/>
                   </tr:panelHeader>
-                  <tr:objectSpacer height="5px"/>
+                  <tr:spacer 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"/>
                   </tr:panelHeader>
-                  <tr:objectSpacer height="15px"/>
-                  <tr:showOneTab>
+                  <tr:spacer height="15px"/>
+                  <tr:panelTabbed>
                     <tr:showDetailItem text="Tab 1">
                       <tr:panelHeader text="Tab Header 1">
-                        <tr:panelForm>
+                        <tr:panelFormLayout>
                           <tr:inputText readOnly="true" label="Label 2-1"
                                         value="Value" styleClass="AFDataText"/>
                           <tr:inputText readOnly="true"
@@ -141,25 +141,25 @@
                                         styleClass="AFDataText">
                             <tr:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
                           </tr:inputText>
-                          <tr:selectInputDate label="Birthdate:"/>
-                        </tr:panelForm>
+                          <tr:inputDate label="Birthdate:"/>
+                        </tr:panelFormLayout>
                       </tr:panelHeader>
                     </tr:showDetailItem>
                     <tr:showDetailItem text="Tab 2" disclosed="true">
-                      <tr:panelHeader text="ShowOneTab details">
+                      <tr:panelHeader text="PanelTabbed 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"/>
-                        <tr:panelGroup layout="horizontal">
+                        <tr:panelGroupLayout layout="horizontal">
                           <tr:goButton text="Sorry, Disabled" disabled="true"/>
-                          <tr:objectSpacer width="10px"/>
+                          <tr:spacer width="10px"/>
                           <tr:goButton text="Go!" disabled="false"/>
-                        </tr:panelGroup>
+                        </tr:panelGroupLayout>
                       </tr:panelHeader>
                     </tr:showDetailItem>
                     <tr:showDetailItem text="Tab 4" disabled="true"/>
                     <tr:showDetailItem text="Tab 5">
                       <tr:panelHeader text="Header 5">
-                        <tr:panelForm>
+                        <tr:panelFormLayout>
                           <tr:inputText readOnly="true" label="Label 5-1"
                                         value="Value" styleClass="AFDataText"/>
                           <tr:inputText readOnly="true"
@@ -168,46 +168,46 @@
                                         styleClass="AFDataText">
                             <tr:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
                           </tr:inputText>
-                        </tr:panelForm>
+                        </tr:panelFormLayout>
                       </tr:panelHeader>
                     </tr:showDetailItem>
-                  </tr:showOneTab>
-                </tr:panelGroup>
-                <tr:panelGroup layout="vertical">
+                  </tr:panelTabbed>
+                </tr:panelGroupLayout>
+                <tr:panelGroupLayout layout="vertical">
                   <f:facet name="separator">
-                    <tr:objectSpacer height="10px"/>
+                    <tr:spacer height="10px"/>
                   </f:facet>
                   <tr:panelBox background="medium" inlineStyle="width:160px">
-                    <tr:panelGroup layout="vertical">
+                    <tr:panelGroupLayout layout="vertical">
                       <tr:outputText value="New Releases"
                                      styleClass="panelBoxHeader"/>
-                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:image source="/skins/beach/images/otn_logo_small.gif"/>
                       <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </tr:panelGroup>
+                    </tr:panelGroupLayout>
                   </tr:panelBox>
                   <tr:panelBox background="medium" inlineStyle="width:160px">
-                    <tr:panelGroup layout="vertical">
+                    <tr:panelGroupLayout layout="vertical">
                       <tr:outputText value="More Stuff"
                                      styleClass="panelBoxHeader"/>
-                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:image source="/skins/beach/images/otn_logo_small.gif"/>
                       <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </tr:panelGroup>
+                    </tr:panelGroupLayout>
                   </tr:panelBox>
                   <tr:panelBox background="medium" inlineStyle="width:160px">
-                    <tr:panelGroup layout="vertical">
+                    <tr:panelGroupLayout layout="vertical">
                       <tr:outputText value="Your New Releases"
                                      styleClass="panelBoxHeader"/>
-                      <tr:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <tr:image source="/skins/beach/images/otn_logo_small.gif"/>
                       <tr:outputFormatted styleUsage="instruction"
                                           value="Check this out!"/>
-                    </tr:panelGroup>
+                    </tr:panelGroupLayout>
                   </tr:panelBox>
-                </tr:panelGroup>
-              </tr:panelHorizontal>
-            </tr:panelGroup>
-          </tr:panelGroup>
+                </tr:panelGroupLayout>
+              </tr:panelHorizontalLayout>
+            </tr:panelGroupLayout>
+          </tr:panelGroupLayout>
         </tr:form>
       </trh:body>
     </trh:html>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx Wed Aug  2 11:34:29 2006
@@ -36,11 +36,11 @@
     <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."/>
-      <tr:panelGroup layout="vertical">
+      <tr:panelGroupLayout layout="vertical">
        <!--tr:panelHeader text="Globally updated">
         <tr:outputFormatted styleUsage="instruction"
                             value="This text gets updated on ANY partial update of the page."/>
-        <tr:panelGroup>
+        <tr:panelGroupLayout>
          <tr:panelLabelAndMessage label="last PPR update: ">
           <tr:outputFormatted id="globalUpdate"
                               partialTriggers="*"
@@ -50,17 +50,17 @@
            <f:convertDateTime pattern="HH:mm:ss"/>
           </tr:outputFormatted>
          </tr:panelLabelAndMessage>
-        </tr:panelGroup>
+        </tr:panelGroupLayout>
        </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."/>
-        <tr:panelGroup layout="horizontal">
-         <tr:panelGroup layout="vertical">
-          <tr:panelGroup layout="horizontal">
+        <tr:panelGroupLayout layout="horizontal">
+         <tr:panelGroupLayout layout="vertical">
+          <tr:panelGroupLayout layout="horizontal">
            <tr:outputFormatted styleUsage="instruction"
                                value="selectBooleanRadio buttons"/>
-           <tr:panelGroup layout="vertical">
+           <tr:panelGroupLayout layout="vertical">
             <tr:selectBooleanRadio id="rb1"
                                    group="theGroup"
                                    selected="false"
@@ -79,10 +79,10 @@
                                    selected="false"
                                    autoSubmit="true"
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"/>
-           </tr:panelGroup>
-          </tr:panelGroup>
-          <tr:objectSpacer width="30" height="10"/>
-          <tr:panelGroup layout="vertical">
+           </tr:panelGroupLayout>
+          </tr:panelGroupLayout>
+          <tr:spacer width="30" height="10"/>
+          <tr:panelGroupLayout layout="vertical">
            <tr:selectOneRadio id="sor1"
                               label="selectOneRadio buttons"
                               autoSubmit="true"
@@ -91,9 +91,9 @@
             <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:panelGroupLayout>
+         </tr:panelGroupLayout>
+         <tr:spacer width="30" height="10"/>
          <tr:panelLabelAndMessage label="Selected: ">
           <tr:outputFormatted id="rbTarget"
                               partialTriggers="rb1 rb2 rb3 sor1"
@@ -102,7 +102,7 @@
            <f:convertDateTime pattern="HH:mm:ss"/>
           </tr:outputFormatted>
          </tr:panelLabelAndMessage>
-        </tr:panelGroup>
+        </tr:panelGroupLayout>
        </tr:panelHeader>
        <tr:panelHeader text="InputText">
        <tr:outputFormatted styleUsage="instruction"
@@ -126,7 +126,7 @@
        <tr:panelHeader text="selectOneChoice">
        <tr:outputFormatted styleUsage="instruction"
                            value="This demo illustrates PPR from a choice component."/>
-        <tr:panelGroup layout="horizontal">
+        <tr:panelGroupLayout layout="horizontal">
          <tr:selectOneChoice id="selOne"
                              autoSubmit="true"
                              label="Choose one"
@@ -136,13 +136,13 @@
           <tr:selectItem label="Second" value="2"/>
           <tr:selectItem label="Third" value="3"/>
          </tr:selectOneChoice>
-         <tr:objectSpacer width="30" height="10"/>
+         <tr:spacer width="30" height="10"/>
          <tr:panelLabelAndMessage label="You picked: ">
           <tr:outputFormatted partialTriggers="selOne"
                               styleUsage="instruction"
                               value="#{partialDemoUtil.status.choiceText}"/>
          </tr:panelLabelAndMessage>
-        </tr:panelGroup>
+        </tr:panelGroupLayout>
        </tr:panelHeader>
 
        <tr:panelHeader text="selectManyListbox">
@@ -150,7 +150,7 @@
 
 
                            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."/>
-        <tr:panelGroup layout="horizontal">
+        <tr:panelGroupLayout layout="horizontal">
          <tr:selectManyListbox id="smlb"
                                autoSubmit="true"
                                label="Choose one or more values: "
@@ -160,20 +160,20 @@
           <tr:selectItem label="Three" value="3"/>
           <tr:selectItem label="Four"  value="4"/>
          </tr:selectManyListbox>
-         <tr:objectSpacer width="30" height="10"/>
+         <tr:spacer width="30" height="10"/>
          <tr:panelLabelAndMessage label="List items selected: ">
           <tr:outputFormatted id="smlbTarget"
                               styleUsage="instruction"
                               binding="#{partialDemoUtil.listUpdate}"
                               value="nothing yet."/>
          </tr:panelLabelAndMessage>
-        </tr:panelGroup>
+        </tr:panelGroupLayout>
        </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."/>
 
-        <tr:panelGroup layout="horizontal">
+        <tr:panelGroupLayout layout="horizontal">
          <tr:selectBooleanCheckbox id="cb1"
                                    value="#{partialDemoUtil.status.checked}"
                                    label="This PPR checkbox"
@@ -183,8 +183,8 @@
                              partialTriggers="cb1"
                              styleUsage="instruction"
                              value="#{partialDemoUtil.status.checkBoxStateText}"/>
-         <tr:objectSpacer width="20"/>
-         <tr:panelGroup id="pg1" partialTriggers="cbTarget">
+         <tr:spacer width="20"/>
+         <tr:panelGroupLayout id="pg1" partialTriggers="cbTarget">
           <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 0}"
                               value="(clicked #{partialDemoUtil.status.checkBoxUpdateCount} time"/>
@@ -194,29 +194,29 @@
           <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 0}"
                               value=")"/>
-         </tr:panelGroup>
-        </tr:panelGroup>
+         </tr:panelGroupLayout>
+        </tr:panelGroupLayout>
        </tr:panelHeader>
 
        <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."/>
-        <tr:panelGroup layout="horizontal">
-         <tr:panelGroup layout="vertical">
+        <tr:panelGroupLayout layout="horizontal">
+         <tr:panelGroupLayout layout="vertical">
           <tr:commandLink id="pSub_link"
                           immediate="true"
                           partialSubmit="true"
                           text="Do a partial Submit."
                           actionListener="#{partialDemoUtil.action}"/>
-          <tr:objectSpacer height="6"/>
+          <tr:spacer height="6"/>
           <tr:commandButton id="pSub_button"
                             immediate="true"
                             partialSubmit="true"
                             text="partialSubmit Button"
                             actionListener="#{partialDemoUtil.action}"/>
-         </tr:panelGroup>
-         <tr:objectSpacer width="30" height="10"/>
-         <tr:panelGroup>
+         </tr:panelGroupLayout>
+         <tr:spacer width="30" height="10"/>
+         <tr:panelGroupLayout>
           <tr:panelLabelAndMessage label="last link click: ">
            <tr:outputFormatted id="cmdTarget"
                                partialTriggers="pSub_link pSub_button"
@@ -225,26 +225,26 @@
             <f:convertDateTime pattern="HH:mm:ss"/>
            </tr:outputFormatted>
           </tr:panelLabelAndMessage>
-         </tr:panelGroup>
-        </tr:panelGroup>
+         </tr:panelGroupLayout>
+        </tr:panelGroupLayout>
        </tr:panelHeader>
        <tr:panelHeader text="Command components with partialSubmit going to another page.">
-        <tr:panelGroup layout="vertical">
+        <tr:panelGroupLayout layout="vertical">
          <tr:commandLink immediate="true"
                          partialSubmit="true"
                          action="home"
                          text="Go to Trinidad demos home page."/>
-         <tr:objectSpacer height="6"/>
+         <tr:spacer height="6"/>
          <tr:commandLink immediate="true"
                          partialSubmit="true"
                          action="demos.direct"
                          text="Go to feature demos page (no redirect)."/>
-         <tr:objectSpacer height="6"/>
+         <tr:spacer height="6"/>
          <tr:commandButton immediate="true"
                            partialSubmit="true"
                            action="demos"
                            text="Go to feature demos page."/>
-         </tr:panelGroup>
+         </tr:panelGroupLayout>
        </tr:panelHeader>
        <tr:panelHeader text="This Reset button will reset all values on the page.">
         <tr:commandButton id="reset"
@@ -254,7 +254,7 @@
          <tr:resetActionListener/>
         </tr:commandButton>
        </tr:panelHeader>
-      </tr:panelGroup>
+      </tr:panelGroupLayout>
      </tr:panelHeader>
      </tr:panelPage>
     </tr:form>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx Wed Aug  2 11:34:29 2006
@@ -52,56 +52,56 @@
 
             <!--Represents a check list-->
             <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:panelGroupLayout layout="horizontal">
+              <tr:spacer width="30"/>
+              <tr:panelGroupLayout layout="vertical" partialTriggers="pollid" id="pg1">
                 <tr:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
                   end="#{progressSteps.progressModel.maximum - 1}" 
                   items="#{progressSteps.progressSteps}">
-                  <tr:panelGroup layout="horizontal">
-                    <tr:objectSpacer 
+                  <tr:panelGroupLayout layout="horizontal">
+                    <tr:spacer 
                       width="13"
                       rendered="#{vs.index > progressSteps.progressModel.value}"/>
-                    <tr:objectImage 
+                    <tr:image 
                       source="/components/images/processCheck.gif" 
                       rendered="#{progressSteps.progressModel.value >= vs.index}"/>
-                    <tr:objectSpacer width="5"/>
+                    <tr:spacer width="5"/>
                     <tr:outputText 
                       value="#{progressStep}" 
                       styleClass="AFFieldText"/>
-                  </tr:panelGroup>
+                  </tr:panelGroupLayout>
                 </tr:forEach>
-              </tr:panelGroup>
-            </tr:panelGroup>
+              </tr:panelGroupLayout>
+            </tr:panelGroupLayout>
 
             <!--Represents a growing list-->
             <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:panelGroupLayout layout="horizontal">
+              <tr:spacer width="30"/>
+              <tr:panelGroupLayout layout="vertical" partialTriggers="pollid" id="pg2">
                 <tr:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
                   end="#{progressSteps.progressModel.maximum - 1}" 
                   items="#{progressSteps.progressSteps}">
-                  <tr:panelGroup layout="horizontal">
+                  <tr:panelGroupLayout layout="horizontal">
                     <tr:outputText 
                       value="#{progressStep}" 
                       styleClass="AFFieldText"
                       rendered="#{progressSteps.progressModel.value >= vs.index}"/>
-                  </tr:panelGroup>
+                  </tr:panelGroupLayout>
                 </tr:forEach>
-              </tr:panelGroup>
-            </tr:panelGroup>
+              </tr:panelGroupLayout>
+            </tr:panelGroupLayout>
 
             <tr:panelHeader/>
-            <tr:panelGroup layout="horizontal">
-              <tr:objectSpacer width="30"/>
-              <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="horizontal">
+              <tr:spacer width="30"/>
+              <tr:panelGroupLayout layout="vertical">
                 <tr:inputText 
                   readOnly="true" 
                   label="Date/Time from last full page refresh" 
@@ -110,13 +110,13 @@
                   <tr:convertDateTime 
                     pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
                 </tr:inputText>
-                <tr:objectSpacer height="10"/>
+                <tr:spacer height="10"/>
                 <tr:commandButton 
                   text="Cancel" 
                   action="progressCancel" 
                   actionListener="#{progressSteps.cancelProcess}"/>
-              </tr:panelGroup>
-            </tr:panelGroup>
+              </tr:panelGroupLayout>
+            </tr:panelGroupLayout>
           </tr:panelHeader>
 
           </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/demos/tableDemos/WelCome.jspx Wed Aug  2 11:34:29 2006
@@ -33,7 +33,7 @@
           </f:facet>
           <tr:outputFormatted styleUsage="instruction" 
             value="These demos show how you can play around with table data"/>
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout 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 
@@ -48,7 +48,7 @@
               <tr:commandButton id="TotalRowButton" text="go to TotalRow Demo" 
                 action="totalRow"/>
             </tr:panelHeader>
-          </tr:panelGroup>
+          </tr:panelGroupLayout>
         </tr:panelPage>
       </tr:form>
     </tr:document>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx Wed Aug  2 11:34:29 2006
@@ -33,14 +33,14 @@
         <tr:panelPage>
           
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/login.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/login.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/login.jspx Wed Aug  2 11:34:29 2006
@@ -33,16 +33,16 @@
           <tr:panelPage>
             <tr:messages/>
             <f:facet name="branding">
-              <tr:panelGroup layout="vertical">
-                <tr:panelGroup>
+              <tr:panelGroupLayout layout="vertical">
+                <tr:panelGroupLayout>
                   <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}"
                                       styleClass="AFHeaderLevelOne"/>
-                  <tr:objectImage source="/email/images/pbs.gif"
+                  <tr:image source="/email/images/pbs.gif"
                                   shortDesc="Email demo"/>
-                </tr:panelGroup>
+                </tr:panelGroupLayout>
                 <tr:outputFormatted value="Customer &lt;b>Foo - Anywhere, U.S.A. &lt;/b>"
                                     styleUsage="inContextBranding"/>
-              </tr:panelGroup>
+              </tr:panelGroupLayout>
             </f:facet>
             <f:facet name="navigationGlobal">
               <tr:menuButtons>
@@ -56,7 +56,7 @@
                              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>
            <tr:panelHeader text="Email Log In">
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText required="true" labelAndAccessKey="&amp;Username"
                             value="#{email.username}">
                 <f:facet name="help">
@@ -75,7 +75,7 @@
                             value="#{email.server}"/>
               <tr:inputText required="true" label="SMTP Server"
                             value="#{email.smtpServer}"/>
-            </tr:panelForm>
+            </tr:panelFormLayout>
            </tr:panelHeader>
             <tr:panelButtonBar>
               <tr:commandButton textAndAccessKey="&amp;Log In"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx Wed Aug  2 11:34:29 2006
@@ -36,14 +36,14 @@
           <tr:messages/>
           
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">
@@ -98,8 +98,8 @@
                 <f:facet name="header">
                   <tr:outputText value="Subject"/>
                 </f:facet>
-                <tr:panelGroup>
-                  <tr:objectImage rendered="#{currentMessage.deleted}"
+                <tr:panelGroupLayout>
+                  <tr:image rendered="#{currentMessage.deleted}"
                                   source="/email/images/deleted.gif"/>
                   <tr:commandLink action="showMessage">
                     <tr:outputText
@@ -109,7 +109,7 @@
                     <tr:setActionListener from="#{currentMessage}"
                                           to="#{pageFlowScope.message}"/>
                   </tr:commandLink>
-                </tr:panelGroup>
+                </tr:panelGroupLayout>
               </tr:column>
               <tr:column rendered="#{email.preferences.displaySenderColumn}">
                 <f:facet name="header">

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx Wed Aug  2 11:34:29 2006
@@ -35,18 +35,18 @@
           <tr:messages/>
 
           <f:facet name="infoStatus">
-            <tr:objectLegend name="required" />
+            <tr:legend name="required" />
           </f:facet>
           
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">
@@ -69,7 +69,7 @@
             </f:facet>
 
          <tr:panelHeader text="New Message">
-          <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+          <tr:panelFormLayout inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
             <tr:inputText label="Subject:" 
                           required="true"
                           value="#{newMessageBacking.subject}"/>
@@ -88,7 +88,7 @@
                           value="#{newMessageBacking.attachment3}"/>
             <tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
                           value="#{newMessageBacking.content}"/>
-          </tr:panelForm>
+          </tr:panelFormLayout>
          </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx Wed Aug  2 11:34:29 2006
@@ -36,14 +36,14 @@
           <tr:messages/>
 
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">
@@ -66,7 +66,7 @@
             </f:facet>
     
         <tr:panelHeader text="Update Preferences">
-          <tr:panelForm> 
+          <tr:panelFormLayout> 
             <tr:selectOneChoice label="Skin-family:"
                               value="#{email.preferences.skinFamily}">
               <f:selectItems value="#{email.preferences.skinFamilyItems}"/>
@@ -83,16 +83,16 @@
               <f:validateLongRange minimum="5" maximum="100"/>
             </tr:inputText>
             <tr:panelLabelAndMessage label="Columns:">
-              <tr:panelGroup layout="vertical">
+              <tr:panelGroupLayout layout="vertical">
                 <tr:selectBooleanCheckbox text="Sender"
                      value="#{email.preferences.displaySenderColumn}"/>
                 <tr:selectBooleanCheckbox text="Date"
                      value="#{email.preferences.displayDateColumn}"/>
                 <tr:selectBooleanCheckbox text="Size"
                      value="#{email.preferences.displaySizeColumn}"/>
-              </tr:panelGroup>
+              </tr:panelGroupLayout>
             </tr:panelLabelAndMessage>
-          </tr:panelForm>
+          </tr:panelFormLayout>
          </tr:panelHeader>
           <tr:panelButtonBar>  
             <tr:commandButton textAndAccessKey="&amp;Save"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx Wed Aug  2 11:34:29 2006
@@ -35,18 +35,18 @@
           <tr:messages/>
 
           <f:facet name="infoStatus">
-            <tr:objectLegend name="required" />
+            <tr:legend name="required" />
           </f:facet>
           
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">
@@ -69,7 +69,7 @@
             </f:facet>
 
         <tr:panelHeader text="New Message">
-          <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+          <tr:panelFormLayout inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
             <tr:inputText label="Subject:" 
                           required="true"
                           value="#{replyToMessageBacking.subject}"/>
@@ -88,7 +88,7 @@
                           value="#{replyToMessageBacking.attachment3}"/>
             <tr:inputText label="Content:" columns="80" rows="20" wrap="soft"
                           value="#{replyToMessageBacking.content}"/>
-          </tr:panelForm>
+          </tr:panelFormLayout>
         </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx Wed Aug  2 11:34:29 2006
@@ -35,14 +35,14 @@
           <tr:messages/>
           
           <f:facet name="branding">
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
-              </tr:panelGroup>
+                <tr:image source="/email/images/pbs.gif"/>
+              </tr:panelGroupLayout>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </f:facet>
           
           <f:facet name="navigationGlobal">
@@ -65,29 +65,29 @@
           </f:facet>
           
         <tr:panelHeader text="Message">
-          <tr:panelBorder>
+          <tr:panelBorderLayout>
             <!-- Top section: include the headers -->
             <f:facet name="innerTop">
-              <tr:panelForm inlineStyle="width: 100%" labelWidth="15%" fieldWidth="85%">
+              <tr:panelFormLayout 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:panelGroupLayout layout="vertical">
                     <tr:forEach items="#{showMessageBacking.message.tos}"
                                 var="address">  
                       <tr:outputText value="#{address}"/>
                     </tr:forEach>
-                 </tr:panelGroup>
+                 </tr:panelGroupLayout>
                 </tr:panelLabelAndMessage>
                 <tr:panelLabelAndMessage label="Cc:"
                   labelStyle="vertical-align: top;">
-                  <tr:panelGroup layout="vertical">
+                  <tr:panelGroupLayout layout="vertical">
                     <tr:forEach items="#{showMessageBacking.message.ccs}"
                                 var="address">
                       <tr:outputText value="#{address}"/>
                     </tr:forEach>
-                  </tr:panelGroup>
+                  </tr:panelGroupLayout>
                 </tr:panelLabelAndMessage>
                 <tr:inputText label="Subject:" readOnly="true"
                               value="#{showMessageBacking.message.subject}"/>
@@ -97,7 +97,7 @@
                 <tr:inputText label="Content type:" readOnly="true"
                               value="#{showMessageBacking.message.contentType}"/>
                 -->
-              </tr:panelForm>
+              </tr:panelFormLayout>
 
             </f:facet>
 
@@ -121,7 +121,7 @@
             <f:facet name="auxiliary2">
               <tr:panelBox text="Attachments"
                     rendered="#{showMessageBacking.message.attachmentPresent}">
-                <tr:panelGroup layout="vertical">
+                <tr:panelGroupLayout layout="vertical">
                   <tr:forEach items="#{showMessageBacking.message.attachments}"
                               var="attachment">
                     <tr:commandLink text="#{attachment.fileName}"
@@ -130,10 +130,10 @@
                          to="#{showMessageBacking.attachmentToDownload}"/>
                     </tr:commandLink>
                   </tr:forEach>
-                </tr:panelGroup>
+                </tr:panelGroupLayout>
               </tr:panelBox>
             </f:facet>
-          </tr:panelBorder>
+          </tr:panelBorderLayout>
         </tr:panelHeader>
           <!--
           <f:facet name="infoReturn">

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/index.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/index.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/index.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/index.jspx Wed Aug  2 11:34:29 2006
@@ -26,30 +26,30 @@
          <tr:messages/>
          <tr:panelHeader text="Welcome to the Apache Trinidad Demos">  
           <tr:panelHeader text="Basics">    
-            <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="vertical">
               <tr:commandLink text="Component Guide" action="guide" />
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </tr:panelHeader>
           
           <tr:panelHeader text="Simple Demos">     
-            <tr:panelGroup layout="vertical">
+            <tr:panelGroupLayout layout="vertical">
               <tr:commandLink text="Feature Demos"
                        action="demos" />
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </tr:panelHeader>
 
           <tr:panelHeader text="Sample Applications">     
-            <tr:panelGroup layout="vertical">
-              <tr:panelGroup>
+            <tr:panelGroupLayout layout="vertical">
+              <tr:panelGroupLayout>
                 <tr:commandLink text="Email" action="emaildemo" />
                 <tr:outputText styleClass="AFInstructionText" value=" - Trinidad Email Demo"/>
-              </tr:panelGroup>
-              <tr:panelGroup>
+              </tr:panelGroupLayout>
+              <tr:panelGroupLayout>
                 <tr:commandLink text="Survey" action="survey" />                
                 <tr:outputText styleClass="AFInstructionText" value=" - simple application"/>
-              </tr:panelGroup>
+              </tr:panelGroupLayout>
 
-            </tr:panelGroup>
+            </tr:panelGroupLayout>
           </tr:panelHeader>
          </tr:panelHeader>
         </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/editForm_adf.jspx Wed Aug  2 11:34:29 2006
@@ -29,7 +29,7 @@
     <body>
       <tr:form >
         <tr:messages/>
-        <tr:panelForm>
+        <tr:panelFormLayout>
           <tr:inputText label="First:" value="1"/>
           <tr:inputText label="Second:" value="2"/>
           <tr:inputText label="Third:" value="3"/>
@@ -48,7 +48,7 @@
           <tr:inputText label="Textarea:" value="Long text" rows="5" />
           <tr:selectBooleanCheckbox label="Checked:" selected="true"
                text="True or false"/>
-        </tr:panelForm>
+        </tr:panelFormLayout>
         <tr:commandButton text="Submit"/>
       </tr:form>
      </body>



Mime
View raw message