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

svn commit: r426839 [4/4] - in /incubator/adffaces/branches/matzew-component-renaming/trinidad: trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trini...

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectBooleanRadio.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectBooleanRadio.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectBooleanRadio.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectBooleanRadio.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>     

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx Sat Jul 29 14:14:55 2006
@@ -23,7 +23,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
               action="guide"/>       

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputDate.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputDate.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputDate.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputDate.jspx Sat Jul 29 14:14:55 2006
@@ -23,13 +23,13 @@
         <tr:form>
           <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>   
-          <tr:objectSeparator/>
+          <tr:separator/>
           <tr:panelPage>
             <tr:messages/>
            <tr:panelHeader text="SelectInputDate Demo">
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>            
               <tr:outputFormatted styleUsage="instruction"
                                  value="&lt;b>A basic selectInputDate, no converter &lt;/b>"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputText.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputText.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputText.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectInputText.jspx Sat Jul 29 14:14:55 2006
@@ -23,13 +23,13 @@
         <tr:form>
           <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>   
-          <tr:objectSeparator/>
+          <tr:separator/>
           <tr:panelPage>
            <tr:messages/>
            <tr:panelHeader text="SelectInputText Demo">
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>            
               <tr:outputFormatted styleUsage="instruction"
                                  value="&lt;b>A basic selectInputText&lt;/b>"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectItem.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectItem.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectItem.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectItem.jspx Sat Jul 29 14:14:55 2006
@@ -27,7 +27,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet> 
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>             

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyCheckbox.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyCheckbox.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyCheckbox.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyCheckbox.jspx Sat Jul 29 14:14:55 2006
@@ -27,7 +27,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyListbox.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyListbox.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyListbox.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyListbox.jspx Sat Jul 29 14:14:55 2006
@@ -27,7 +27,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyShuttle.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyShuttle.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyShuttle.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectManyShuttle.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneChoice.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneChoice.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneChoice.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneChoice.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet> 
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>             

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneListbox.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneListbox.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneListbox.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneListbox.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneRadio.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneRadio.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneRadio.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOneRadio.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>     

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOrderShuttle.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOrderShuttle.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOrderShuttle.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectOrderShuttle.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide" action="guide"/>
             <tr:outputFormatted styleUsage="instruction" value="&lt;b>selectRangeChoiceBar&lt;/b>"/>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/separator.jspx (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSeparator.jspx)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/separator.jspx?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/separator.jspx&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSeparator.jspx&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSeparator.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/separator.jspx Sat Jul 29 14:14:55 2006
@@ -22,14 +22,14 @@
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
     <trh:html>
-      <trh:head title="ObjectSeparator Demo"/>
+      <trh:head title="Separator Demo"/>
       <trh:body>
         <tr:form >
           <tr:panelGroup layout="vertical">
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>   
             <tr:outputText styleClass="AFInstructionText" value="Above separator"/>
-            <tr:objectSeparator binding="#{editor.component}"/>
+            <tr:separator binding="#{editor.component}"/>
             <tr:outputText styleClass="AFInstructionText" value="Below separator"/>
             <jsp:directive.include file="editor.jspf" />
           </tr:panelGroup>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetail.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetail.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetail.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetail.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailHeader.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailHeader.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailHeader.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailHeader.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailItem.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailItem.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailItem.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showDetailItem.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink 
                 immediate="true" 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink immediate="true" 
                             text="Component Guide"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink immediate="true" 
                             text="Component Guide"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink immediate="true" 
                             text="Component Guide"
@@ -46,7 +46,7 @@
                                      text="Monthly Sales Distribution">
                                      
                     <tr:panelHeader  text="Monthly Sales Distribution">
-                      <tr:objectImage source="images/monthlySalesDistribution.gif" 
+                      <tr:image source="images/monthlySalesDistribution.gif" 
                                       inlineStyle="height:200px; width:300px;" 
                                       id="monthlySalesImage"
                                       shortDesc="Monthly sales distribution"/> 
@@ -56,7 +56,7 @@
                   <tr:showDetailItem id="showDetailItem3" 
                                      text="Sales by Geography">
                     <tr:panelHeader text="Sales by Geography">
-                         <tr:objectImage source="images/salesByGeography.gif"              
+                         <tr:image source="images/salesByGeography.gif"              
                                          shortDesc="Sales by Geography"
                                          inlineStyle="height:200px; width:300px;" 
                                          id="salesByGeographyImage"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneRadio.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneRadio.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneRadio.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneRadio.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink immediate="true" 
                             text="Component Guide"
@@ -45,7 +45,7 @@
                                      text="Monthly Sales Distribution"
                                      accessKey="M">
                     <tr:panelHeader text="Monthly Sales Distribution">
-                      <tr:objectImage source="images/monthlySalesDistribution.gif" 
+                      <tr:image source="images/monthlySalesDistribution.gif" 
                                       shortDesc="Koenigsegg CCR" 
                                       inlineStyle="height:200px; width:300px;" 
                                       id="monthlySalesImage"/> 
@@ -56,7 +56,7 @@
                                      text="Sales by Geography"
                                      accessKey="S">
                     <tr:panelHeader text="Sales by Geography">
-                         <tr:objectImage source="images/salesByGeography.gif" 
+                         <tr:image source="images/salesByGeography.gif" 
                                          inlineStyle="height:200px;  width:300px;" 
                                          id="salesByGeographyImage"
                                          shortDesc="Sales information"/> 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneTab.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneTab.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneTab.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneTab.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
         
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>                   

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/singleStepButtonBar.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/singleStepButtonBar.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/singleStepButtonBar.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/singleStepButtonBar.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>                 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/styleSheet.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/styleSheet.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/styleSheet.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/styleSheet.jspx Sat Jul 29 14:14:55 2006
@@ -31,7 +31,7 @@
         <tr:form>       
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator />
+                <tr:separator />
               </f:facet>   
               <tr:commandLink immediate="true" text="Component Guide"
                   action="guide"/>      

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
           <tr:messages/>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>     

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_dynamic.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_dynamic.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_dynamic.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_dynamic.jspx Sat Jul 29 14:14:55 2006
@@ -24,7 +24,7 @@
           <tr:messages/>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>     

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_nested.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_nested.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_nested.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_nested.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
           <tr:messages/>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>     

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_selection.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_selection.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_selection.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/table_selection.jspx Sat Jul 29 14:14:55 2006
@@ -29,7 +29,7 @@
         </tr:panelGroup>
         <tr:panelGroup layout="vertical">
           <f:facet name="separator">
-            <tr:objectSeparator/>
+            <tr:separator/>
           </f:facet>
           <tr:messages/>
           <tr:selectOneChoice value="#{sessionScope.tableSelection}"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/template.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/template.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/template.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/template.jspx Sat Jul 29 14:14:55 2006
@@ -27,7 +27,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet> 
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>             

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/tree.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/tree.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/tree.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/tree.jspx Sat Jul 29 14:14:55 2006
@@ -26,7 +26,7 @@
           <tr:messages/>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>  
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>                

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/treeTable.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/treeTable.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/treeTable.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/treeTable.jspx Sat Jul 29 14:14:55 2006
@@ -25,7 +25,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator />
+              <tr:separator />
             </f:facet>   
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>    

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveFacetsChange_Explicit.jspx Sat Jul 29 14:14:55 2006
@@ -85,7 +85,7 @@
             text="Explicit AddFacetChange/RemoveFacetChange Persistence Feature Demo">
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
               <tr:commandButton 
                 text="navigation1: Remove facet for menu tabs" 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx Sat Jul 29 14:14:55 2006
@@ -37,10 +37,10 @@
           Persistence Feature Demo">
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:panelGroup id="pg1">
-              <tr:objectImage 
+              <tr:image 
                 id="oi1" 
   shortDesc="Corporate Brand"
                 source="/components/images/corporateBrand.gif"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx Sat Jul 29 14:14:55 2006
@@ -36,10 +36,10 @@
          <tr:panelHeader text="Explicit AttributeChange Persistence Feature Demo">
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:panelGroup layout="horizontal">
-              <tr:objectImage 
+              <tr:image 
                 id="oi1" 
                 source="/adf/images/error.gif"/>
               <tr:objectSpacer width="10"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx Sat Jul 29 14:14:55 2006
@@ -37,7 +37,7 @@
         <tr:panelHeader text="Implicit AttributeChange Persistence Feature Demo">
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:showDetail 
               id="hs1" 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/changePersistence.jspx Sat Jul 29 14:14:55 2006
@@ -37,7 +37,7 @@
           <tr:panelHeader text="Demos and overview">
             <tr:panelGroup layout="vertical">
               <f:facet name="separator">
-                <tr:objectSeparator/>
+                <tr:separator/>
               </f:facet>
               <tr:panelGroup layout="vertical">
                 <tr:commandLink 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/launchDialog.jspx Sat Jul 29 14:14:55 2006
@@ -39,7 +39,7 @@
                           windowWidth="250" windowHeight="250"
                           launchListener="#{launchDialog.addParameter}"
                           returnListener="#{launchDialog.returned}"/>
-         <tr:objectSeparator/>
+         <tr:separator/>
 
          <tr:table value="#{table}" var="row" width="40%">
            <tr:column>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx Sat Jul 29 14:14:55 2006
@@ -33,7 +33,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
             <tr:commandLink immediate="true" text="Component Guide"
                             action="guide"/>
@@ -49,9 +49,9 @@
                   <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>
@@ -181,7 +181,7 @@
                     <tr:panelGroup 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>
@@ -190,7 +190,7 @@
                     <tr:panelGroup 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>
@@ -199,7 +199,7 @@
                     <tr:panelGroup 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>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx Sat Jul 29 14:14:55 2006
@@ -65,7 +65,7 @@
                     <tr:objectSpacer 
                       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"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/confirmSent.jspx Sat Jul 29 14:14:55 2006
@@ -36,7 +36,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/login.jspx Sat Jul 29 14:14:55 2006
@@ -37,7 +37,7 @@
                 <tr:panelGroup>
                   <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:outputFormatted value="Customer &lt;b>Foo - Anywhere, U.S.A. &lt;/b>"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/messages.jspx Sat Jul 29 14:14:55 2006
@@ -39,7 +39,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>
@@ -99,7 +99,7 @@
                   <tr:outputText value="Subject"/>
                 </f:facet>
                 <tr:panelGroup>
-                  <tr:objectImage rendered="#{currentMessage.deleted}"
+                  <tr:image rendered="#{currentMessage.deleted}"
                                   source="/email/images/deleted.gif"/>
                   <tr:commandLink action="showMessage">
                     <tr:outputText

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/newMessage.jspx Sat Jul 29 14:14:55 2006
@@ -42,7 +42,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/preferences.jspx Sat Jul 29 14:14:55 2006
@@ -39,7 +39,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/replyToMessage.jspx Sat Jul 29 14:14:55 2006
@@ -42,7 +42,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx Sat Jul 29 14:14:55 2006
@@ -38,7 +38,7 @@
             <tr:panelGroup layout="vertical">
               <tr:panelGroup>
                 <tr:outputFormatted value="#{nls.EMAIL_DEMO_TITLE}" styleClass="AFHeaderLevelOne"/>
-                <tr:objectImage source="/email/images/pbs.gif"/>
+                <tr:image source="/email/images/pbs.gif"/>
               </tr:panelGroup>
               <tr:outputFormatted value="Customer &lt;b&gt;Foo - Anywhere, U.S.A. &lt;/b&gt;"
                                  styleUsage="inContextBranding"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx Sat Jul 29 14:14:55 2006
@@ -24,7 +24,7 @@
         <tr:form>
           <tr:panelGroup layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
         
             <tr:commandLink immediate="true" text="Component Guide"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/composite.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/composite.jspx?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/composite.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/test/webapp/composite.jspx Sat Jul 29 14:14:55 2006
@@ -34,7 +34,7 @@
            <tr:message for="dateField"/>
            <tr:outputText value="Date is now #{date.date1}"/>
 
-           <tr:objectSeparator/>
+           <tr:separator/>
 
     <!-- Use a normal inputText, but use binding to force the renderer type -->
            <h:inputText id="dateInput" value="#{date.date2}" binding="#{compositeTest.dateInput}"/>
@@ -42,7 +42,7 @@
            <tr:message for="dateInput"/>
            <tr:outputText value="Date is now #{date.date2}"/>
 
-           <tr:objectSeparator/>
+           <tr:separator/>
 
            <tr:commandButton text="Submit"/>
          </tr:panelGroup>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java Sat Jul 29 14:14:55 2006
@@ -25,17 +25,17 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectIcon;
+import org.apache.myfaces.trinidad.component.core.output.CoreIcon;
 import org.apache.myfaces.trinidad.util.ArrayMap;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
-public class ObjectIconRenderer extends XhtmlRenderer
+public class IconRenderer extends XhtmlRenderer
 {
-  public ObjectIconRenderer()
+  public IconRenderer()
   {
-    super(CoreObjectIcon.TYPE);
+    super(CoreIcon.TYPE);
   }
 
   protected void findTypeConstants(FacesBean.Type type)

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java Sat Jul 29 14:14:55 2006
@@ -23,16 +23,16 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectImage;
+import org.apache.myfaces.trinidad.component.core.output.CoreImage;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 
-public class ObjectImageRenderer extends XhtmlRenderer
+public class ImageRenderer extends XhtmlRenderer
 {
-  public ObjectImageRenderer()
+  public ImageRenderer()
   {
-    super(CoreObjectImage.TYPE);
+    super(CoreImage.TYPE);
   }
   
   protected void findTypeConstants(FacesBean.Type type)
@@ -125,7 +125,7 @@
     ResponseWriter      writer) throws IOException
   {
     String mType = getImageMapType(bean);
-    if (CoreObjectImage.IMAGE_MAP_TYPE_SERVER.equals(mType))
+    if (CoreImage.IMAGE_MAP_TYPE_SERVER.equals(mType))
       writer.writeAttribute("ismap", Boolean.TRUE, "imageMapType");
   }
 

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectIcon.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectIcon.xml&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectIcon.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml Sat Jul 29 14:14:55 2006
@@ -1,6 +1,6 @@
 <test xmlns="http://myfaces.apache.org/trinidad/test"
        xmlns:tr="http://myfaces.apache.org/trinidad">
-  <base-component tr:type="org.apache.myfaces.trinidad.CoreObjectIcon" name="required"/>
+  <base-component tr:type="org.apache.myfaces.trinidad.CoreIcon" name="required"/>
   <attribute-test name="name" value="info"/>
   <attribute-test name="name" value="warning"/>
   <attribute-test name="name" value="error"/>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/image.xml (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectImage.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/image.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/image.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectImage.xml&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectImage.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/image.xml Sat Jul 29 14:14:55 2006
@@ -1,6 +1,6 @@
 <test xmlns="http://myfaces.apache.org/trinidad/test"
        xmlns:tr="http://myfaces.apache.org/trinidad">
-  <base-component tr:type="org.apache.myfaces.trinidad.CoreObjectImage" source="/bogus/image/uri"/>  
+  <base-component tr:type="org.apache.myfaces.trinidad.CoreImage" source="/bogus/image/uri"/>  
   <attribute-test name="imageMapType" value="server"/>
   <attribute-test name="imageMapType" value="none" matchesBase="true"/>
   <attribute-test name="longDescURL" value="/bogus/longdesc/uri"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/page-facets.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/page-facets.xml?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/page-facets.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/page-facets.xml Sat Jul 29 14:14:55 2006
@@ -53,10 +53,10 @@
              <component tr:type="org.apache.myfaces.trinidad.CoreCommandNavigationItem"
                         text="choice3"/>
     </component>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="branding"
                 source="/foo/foo.gif"/>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="brandingApp"
                 source="/foo/bar.gif"/>
      <component tr:type="org.apache.myfaces.trinidad.CoreOutputFormatted"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontal-separator.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontal-separator.xml?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontal-separator.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontal-separator.xml Sat Jul 29 14:14:55 2006
@@ -4,7 +4,7 @@
     <component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="1"/>
     <component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="2"/>
     <component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="3"/>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="separator"
             source="/foo/bar.gif"/>
   </base-component>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets.xml?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets.xml Sat Jul 29 14:14:55 2006
@@ -77,7 +77,7 @@
            <component tr:type="org.apache.myfaces.trinidad.CoreCommandNavigationItem"
                       text="button3"/>
     </component>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="branding"
                 source="/foo/foo.gif"/>
      <component tr:type="org.apache.myfaces.trinidad.CoreOutputFormatted"

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader-chromeType.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader-chromeType.xml?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader-chromeType.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader-chromeType.xml Sat Jul 29 14:14:55 2006
@@ -2,10 +2,10 @@
        xmlns:tr="http://myfaces.apache.org/trinidad">
   <base-component tr:type="org.apache.myfaces.trinidad.CorePanelPageHeader">
      
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="branding"
                 source="/foo/foo.gif"/>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="brandingApp"
                 source="/foo/bar.gif"/>
    

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader.xml?rev=426839&r1=426838&r2=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader.xml Sat Jul 29 14:14:55 2006
@@ -37,10 +37,10 @@
              <component tr:type="org.apache.myfaces.trinidad.CoreCommandNavigationItem"
                         text="choice3"/>
     </component>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="branding"
                 source="/foo/foo.gif"/>
-    <component tr:type="org.apache.myfaces.trinidad.CoreObjectImage"
+    <component tr:type="org.apache.myfaces.trinidad.CoreImage"
                 tr:facet="brandingApp"
                 source="/foo/bar.gif"/>
      <component tr:type="org.apache.myfaces.trinidad.CoreOutputFormatted"

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/separator.xml (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSeparator.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/separator.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/separator.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSeparator.xml&r1=426705&r2=426839&rev=426839&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSeparator.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/separator.xml Sat Jul 29 14:14:55 2006
@@ -1,6 +1,6 @@
 <test xmlns="http://myfaces.apache.org/trinidad/test"
        xmlns:tr="http://myfaces.apache.org/trinidad">
-  <base-component tr:type="org.apache.myfaces.trinidad.CoreObjectSeparator"/>
+  <base-component tr:type="org.apache.myfaces.trinidad.CoreSeparator"/>
   
   <!-- Core attribute tests -->
   <attribute-test name="id"/>