incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r426842 - 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/trinidad/co...
Date Sat, 29 Jul 2006 22:00:19 GMT
Author: matzew
Date: Sat Jul 29 15:00:16 2006
New Revision: 426842

URL: http://svn.apache.org/viewvc?rev=426842&view=rev
Log:
two more components renamed

Added:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java
      - copied, changed from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreObjectSpacerTest.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx
      - copied, changed from r426839, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectMedia.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx
      - copied, changed from r426839, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSpacer.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java
      - copied, changed from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimal-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimal-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalIE-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalIE-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalIERtl-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalIERtl-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalInacc-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalInacc-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalPPC-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalPPC-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalSaf-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalSaf-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalScrRdr-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalScrRdr-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimal-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimal-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalIE-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalIE-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalIERtl-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalIERtl-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalInacc-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalInacc-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalPPC-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalPPC-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalSaf-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalSaf-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/spacer-minimalScrRdr-golden.xml
      - copied unchanged from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalScrRdr-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/media.xml
      - copied, changed from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectMedia.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/spacer.xml
      - copied, changed from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSpacer.xml
Removed:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreObjectSpacerTest.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectMedia.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSpacer.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimal-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalIE-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalIERtl-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalInacc-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalPPC-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalSaf-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectMedia-minimalScrRdr-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimal-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalIE-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalIERtl-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalInacc-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalPPC-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalSaf-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/objectSpacer-minimalScrRdr-golden.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectMedia.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSpacer.xml
Modified:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroup.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontal.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSpacer.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Media.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Spacer.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/outputLabel.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/pageContent_include.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelForm.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/poll.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Explicit.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelGroup.xml

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreObjectSpacerTest.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreObjectSpacerTest.java&r1=426705&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreObjectSpacerTest.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/output/CoreSpacerTest.java Sat Jul 29 15:00:16 2006
@@ -21,18 +21,18 @@
 import org.apache.myfaces.trinidad.component.UIXObject;
 
 /**
- * Unit tests for CoreObjectSpacer.
+ * Unit tests for CoreSpacer.
  *
  * @author John Fallows
  */
-public class CoreObjectSpacerTest extends UIXObjectTestCase
+public class CoreSpacerTest extends UIXObjectTestCase
 {
   /**
-   * Creates a new CoreObjectSpacerTest.
+   * Creates a new CoreSpacerTest.
    *
    * @param testName  the unit test name
    */
-  public CoreObjectSpacerTest(
+  public CoreSpacerTest(
     String testName)
   {
     super(testName);
@@ -50,7 +50,7 @@
   
   public static Test suite()
   {
-    return new TestSuite(CoreObjectSpacerTest.class);
+    return new TestSuite(CoreSpacerTest.class);
   }
 
   /**
@@ -58,7 +58,7 @@
    */
   public void testInitialAttributeValues()
   {
-    CoreObjectSpacer component = new CoreObjectSpacer();
+    CoreSpacer component = new CoreSpacer();
     assertEquals(true, component.isRendered());
   }
 
@@ -69,7 +69,7 @@
    */
   public void testAttributeTransparency()
   {
-    CoreObjectSpacer component = new CoreObjectSpacer();
+    CoreSpacer component = new CoreSpacer();
     doTestAttributeTransparency(component, "width",
                                 "50%", "100%");
     doTestAttributeTransparency(component, "height",
@@ -88,6 +88,6 @@
 
   protected UIXObject createTestComponent()
   {
-    return new CoreObjectSpacer();
+    return new CoreSpacer();
   }
 }

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml Sat Jul 29 15:00:16 2006
@@ -20,14 +20,14 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The objectMedia component displays media content, such as audio, video,
+    <description><![CDATA[The media component displays media content, such as audio, video,
           or image in a player embedded in the user agent.]]>
     </description>
     <icon>
-      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/objectMedia.png</small-icon>
+      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/media.png</small-icon>
     </icon>
-    <component-type>org.apache.myfaces.trinidad.CoreObjectMedia</component-type>
-    <component-class>org.apache.myfaces.trinidad.component.core.output.CoreObjectMedia</component-class>
+    <component-type>org.apache.myfaces.trinidad.CoreMedia</component-type>
+    <component-class>org.apache.myfaces.trinidad.component.core.output.CoreMedia</component-class>
     <property>
       <description><![CDATA[<html> width in pixels to reserve for the media player plus its content.
             As the extra width needed for the media player controls can vary
@@ -431,20 +431,20 @@
     <component-extension>
       <mfp:component-supertype>org.apache.myfaces.trinidad.Object</mfp:component-supertype>
       <mfp:renderer-type>org.apache.myfaces.trinidad.Media</mfp:renderer-type>
-      <mfp:tag-name>tr:objectMedia</mfp:tag-name>
-      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreObjectMediaTag</mfp:tag-class>
+      <mfp:tag-name>tr:media</mfp:tag-name>
+      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreMediaTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-            The objectMedia component displays media content, such as audio, video,
+            The media component displays media content, such as audio, video,
             or image in a player embedded in the user agent.
-            The objectMedia control displays the media specified by the &quot;source&quot;
+            The media control displays the media specified by the &quot;source&quot;
             attribute in the appropriate media player.  If a particular
             media player is desired, it can be specified using the &quot;player&quot;
-            attribute.  The objectMedia control attempts to intelligently handle
+            attribute.  The media control attempts to intelligently handle
             two tricky aspects of cross-platform media display--determining
             the best player to display the media, and sizing the media player.
           </html:p>
           <html:p>
-            The objectMedia control attempts to pick the appropriate media player
+            The media control attempts to pick the appropriate media player
             using the following steps:
             <html:ol>
               <html:li>
@@ -471,7 +471,7 @@
             </html:ol>
           </html:p>
           <html:p>
-            The objectMedia component supports two approaches to 
+            The media component supports two approaches to 
             sizing the media control
             setting the &quot;width&quot; and &quot;height&quot; attributes, which specify the
             amount of space reserved on the user agent for the media control,
@@ -491,12 +491,12 @@
           </html:p>]]>
       </mfp:long-description>
       <mfp:example>
-        <xhtml:p>This sample builds an objectMedia control, for playing a house music
+        <xhtml:p>This sample builds an media control, for playing a house music
             Windows Media file.  The typical set of controls is displayed,
             and the control is sized just large enough to display the controls,
             since the default inner size of audio files is 0 by 0 pixels.
         </xhtml:p>
-        <mfp:source-code>&lt;tr:objectMedia source="house.wma" /&gt;</mfp:source-code>
+        <mfp:source-code>&lt;tr:media source="house.wma" /&gt;</mfp:source-code>
       </mfp:example>
       <mfp:author>Blake Sullivan</mfp:author>
       <mfp:component-metadata>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroup.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroup.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroup.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroup.xml Sat Jul 29 15:00:16 2006
@@ -60,7 +60,7 @@
       <mfp:example>
         <mfp:source-code><![CDATA[<tr:panelGroup layout="horizontal">
   <f:facet name="separator">
-    <tr:objectSpacer width="10" height="1"/>
+    <tr:spacer width="10" height="1"/>
   </f:facet>
   <tr:goLink text="ADF Faces 1"
         destination="http://myfaces.apache.org"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontal.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontal.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontal.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontal.xml Sat Jul 29 15:00:16 2006
@@ -206,7 +206,7 @@
       <mfp:example>
         <mfp:source-code><![CDATA[<tr:panelHorizontal valign="top"> halign="end"
   <f:facet name="separator">
-    <tr:objectSpacer width="10" height="1"/>
+    <tr:spacer width="10" height="1"/>
   </f:facet>
   <tr:goLink text="ADF Faces 1"
         destination="http://myfaces.apache.org"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSpacer.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSpacer.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSpacer.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSpacer.xml Sat Jul 29 15:00:16 2006
@@ -20,15 +20,15 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[objectSpacers occupy a fixed amount of
+    <description><![CDATA[spacers occupy a fixed amount of
           space in a layout.]]></description>
     <icon>
-      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/objectSpacer.png</small-icon>
+      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/spacer.png</small-icon>
     </icon>
-    <component-type>org.apache.myfaces.trinidad.CoreObjectSpacer</component-type>
-    <component-class>org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer</component-class>
+    <component-type>org.apache.myfaces.trinidad.CoreSpacer</component-type>
+    <component-class>org.apache.myfaces.trinidad.component.core.output.CoreSpacer</component-class>
     <property>
-      <description><![CDATA[the width of the objectSpacer item.]]></description>
+      <description><![CDATA[the width of the spacer item.]]></description>
       <property-name>width</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
@@ -41,7 +41,7 @@
       </property-extension>
     </property>
     <property>
-      <description><![CDATA[the height of the objectSpacer item.]]></description>
+      <description><![CDATA[the height of the spacer item.]]></description>
       <property-name>height</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
@@ -77,9 +77,9 @@
     <component-extension>
       <mfp:component-supertype>org.apache.myfaces.trinidad.Object</mfp:component-supertype>
       <mfp:renderer-type>org.apache.myfaces.trinidad.Spacer</mfp:renderer-type>
-      <mfp:tag-name>tr:objectSpacer</mfp:tag-name>
-      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreObjectSpacerTag</mfp:tag-class>
-      <mfp:long-description><![CDATA[objectSpacer occupies a fixed amount of space in a layout, specified by
+      <mfp:tag-name>tr:spacer</mfp:tag-name>
+      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreSpacerTag</mfp:tag-class>
+      <mfp:long-description><![CDATA[spacer occupies a fixed amount of space in a layout, specified by
           its width and height attributes. If the width is not specified, but
           height specified, a block level HTML element is rendered, thereby
           introducing a new line effect. If width is specified, then,
@@ -90,7 +90,7 @@
       <mfp:example>
         <mfp:source-code><![CDATA[<tr:panelGroup type="horizontal">
   <f:facet name="separator">
-    <tr:objectSpacer width="10" height="1"/>
+    <tr:spacer width="10" height="1"/>
   </f:facet>
   <tr:goLink text="First Link"
         destination="http://myfaces.apache.org"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml Sat Jul 29 15:00:16 2006
@@ -267,7 +267,7 @@
     </trh:cellFormat>
     <tr:panelGroup laytou="horizontal">
       Third Column
-      <tr:objectSpacer height="100" width="1"/>
+      <tr:spacer height="100" width="1"/>
     </tr:panelGroup>
   </trh:rowLayout>
   <trh:rowLayout>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml Sat Jul 29 15:00:16 2006
@@ -220,7 +220,7 @@
     </trh:cellFormat>
     <tr:panelGroup layout="horizontal">
       Third Column
-      <tr:objectSpacer height="100" width="1"/>
+      <tr:spacer height="100" width="1"/>
     </tr:panelGroup>
   </trh:rowLayout>
   <trh:rowLayout>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml Sat Jul 29 15:00:16 2006
@@ -235,7 +235,7 @@
 
     <tr:panelGroup layout="horizontal">
       Third Column
-      <tr:objectSpacer height="100" width="1"/>
+      <tr:spacer height="100" width="1"/>
     </tr:panelGroup>
 
   </trh:rowLayout>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Media.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Media.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Media.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Media.xml Sat Jul 29 15:00:16 2006
@@ -23,7 +23,7 @@
       <renderer-type>org.apache.myfaces.trinidad.Media</renderer-type>
       <renderer-class>org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase</renderer-class>
       <renderer-extension>
-        <mfp:component-type>org.apache.myfaces.trinidad.CoreObjectMedia</mfp:component-type>
+        <mfp:component-type>org.apache.myfaces.trinidad.CoreMedia</mfp:component-type>
       </renderer-extension>
     </renderer>
   </render-kit>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Spacer.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Spacer.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Spacer.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Spacer.xml Sat Jul 29 15:00:16 2006
@@ -21,9 +21,9 @@
     <renderer>
       <component-family>org.apache.myfaces.trinidad.Object</component-family>
       <renderer-type>org.apache.myfaces.trinidad.Spacer</renderer-type>
-      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ObjectSpacerRenderer</renderer-class>
+      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SpacerRenderer</renderer-class>
       <renderer-extension>
-        <mfp:component-type>org.apache.myfaces.trinidad.CoreObjectSpacer</mfp:component-type>
+        <mfp:component-type>org.apache.myfaces.trinidad.CoreSpacer</mfp:component-type>
       </renderer-extension>
     </renderer>
   </render-kit>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Sat Jul 29 15:00:16 2006
@@ -774,9 +774,9 @@
         <value>icon.jspx</value>
         <value>image.jspx</value>
         <value>objectLegend.jspx</value>
-        <value>objectMedia.jspx</value>
+        <value>media.jspx</value>
         <value>separator.jspx</value>
-        <value>objectSpacer.jspx</value>
+        <value>spacer.jspx</value>
         <value>outputDocument.jspx</value>
         <value>outputFormatted.jspx</value>
         <value>outputLabel.jspx</value>
@@ -2082,8 +2082,8 @@
     </navigation-case>
 
     <navigation-case>
-      <from-outcome>guide.objectMedia</from-outcome>
-      <to-view-id>/components/objectMedia.jspx</to-view-id>
+      <from-outcome>guide.media</from-outcome>
+      <to-view-id>/components/media.jspx</to-view-id>
       <redirect/>
     </navigation-case>
 
@@ -2395,8 +2395,8 @@
     </navigation-case>
 
     <navigation-case>
-      <from-outcome>guide.objectSpacer</from-outcome>
-      <to-view-id>/components/objectSpacer.jspx</to-view-id>
+      <from-outcome>guide.spacer</from-outcome>
+      <to-view-id>/components/spacer.jspx</to-view-id>
       <redirect/>
     </navigation-case>
 

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx (from r426839, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectMedia.jspx)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectMedia.jspx&r1=426839&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectMedia.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx Sat Jul 29 15:00:16 2006
@@ -30,7 +30,7 @@
             <tr:commandLink immediate="true" text="Component Guide"
                 action="guide"/>            
             <tr:outputFormatted styleUsage="instruction" value="&lt;b>Simple objectMedia demo &lt;/b>"/>
-            <tr:objectMedia source="/components/images/seattle.wmv" innerWidth="160"
+            <tr:media source="/components/images/seattle.wmv" innerWidth="160"
                        innerHeight="112" autostart="true" controls="all"
                        shortDesc="Visit Seattle" binding="#{editor.component}"/>
             

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/outputLabel.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/outputLabel.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/outputLabel.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/outputLabel.jspx Sat Jul 29 15:00:16 2006
@@ -32,7 +32,7 @@
             <tr:outputFormatted styleUsage="instruction" value="&lt;b>outputLabel&lt;/b>"/>
             <tr:panelGroup>
               <tr:outputLabel binding="#{editor.component}" accessKey="S" value="Some text" for="inputId"/>
-              <tr:objectSpacer width="5"/>
+              <tr:spacer width="5"/>
               <tr:inputText simple="true" id="inputId"/>
             </tr:panelGroup>
             

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/pageContent_include.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/pageContent_include.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/pageContent_include.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/pageContent_include.jspx Sat Jul 29 15:00:16 2006
@@ -20,7 +20,7 @@
           xmlns:trh="http://myfaces.apache.org/trinidad/html"
           xmlns:tr="http://myfaces.apache.org/trinidad">
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <tr:objectSpacer height="5px"/>    
+  <tr:spacer height="5px"/>    
   <tr:outputFormatted styleUsage="instruction"
                       value="In both cases most of the content of the page is in a jsp include, so as you navigate around the content of the pages does not change. This is just for demo purposes, in a real application each page would be defined separately but bind to the same model."/>
   <tr:panelHeader text="Model Attached to Tree Component">

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelForm.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelForm.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelForm.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelForm.jspx Sat Jul 29 15:00:16 2006
@@ -94,7 +94,7 @@
                 </tr:group>
                 <tr:panelHorizontal>
                   <f:facet name="separator">
-                    <tr:objectSpacer width="10"/>
+                    <tr:spacer width="10"/>
                   </f:facet>
                   <tr:commandButton text="Page 1" partialSubmit="true"/>
                   <tr:commandButton text="Page 2" partialSubmit="true"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/poll.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/poll.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/poll.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/poll.jspx Sat Jul 29 15:00:16 2006
@@ -56,7 +56,7 @@
               <tr:panelHeader text="When modal dialogs are launched from the
                 following components, poll pauses until the dialog is dismissed"/>
               <f:facet name="separator">
-                <tr:objectSpacer height="5"/>
+                <tr:spacer height="5"/>
               </f:facet>
               <tr:selectInputColor id="sic3" label="The color picker dialog" 
                                    value="#{color.colorValue3}" compact="true"/>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx (from r426839, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSpacer.jspx)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSpacer.jspx&r1=426839&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/objectSpacer.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx Sat Jul 29 15:00:16 2006
@@ -31,10 +31,10 @@
                 action="guide"/>              
             <tr:panelGroup>
               <tr:outputText value="Hello"/>
-              <tr:objectSpacer width="300" height="10"/>
+              <tr:spacer width="300" height="10"/>
               <tr:outputText value="Over There"/>
               <tr:separator/>
-              <tr:objectSpacer height="300" width="10"/>
+              <tr:spacer height="300" width="10"/>
               <tr:outputText value="Big Gap Above Me"/>
             </tr:panelGroup>
           </tr:panelGroup>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx Sat Jul 29 15:00:16 2006
@@ -34,7 +34,7 @@
            <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:inputText value="#{clientValidation.integer}"
@@ -85,7 +85,7 @@
               </tr:selectInputDate>
             </tr:panelForm>
             <tr:panelHeader text="Client Validators"/>
-            <tr:objectSpacer height="10"/>
+            <tr:spacer height="10"/>
             <tr:panelForm>
               <tr:inputText value="#{clientValidation.long}"
                             label="long range validator">
@@ -110,12 +110,12 @@
               </tr:inputText>
             </tr:panelForm>
             <tr:panelHeader text="Required"/>
-            <tr:objectSpacer height="10"/>
+            <tr:spacer height="10"/>
             <tr:panelForm>
               <tr:inputText required="true" label="required field"/>
             </tr:panelForm>
             <tr:panelHeader text="Example of 3rd party Converter and Validator"/>
-            <tr:objectSpacer height="10"/>
+            <tr:spacer height="10"/>
             <tr:panelForm>
               <tr:inputText value="#{clientValidation.ssn}"
                             label="ssn converter">

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/carDemo.jspx Sat Jul 29 15:00:16 2006
@@ -58,7 +58,7 @@
                          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"

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=426842&r1=426841&r2=426842&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 15:00:16 2006
@@ -66,22 +66,22 @@
                 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" 

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=426842&r1=426841&r2=426842&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 15:00:16 2006
@@ -42,7 +42,7 @@
               <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}"/>
@@ -51,7 +51,7 @@
               <tr:panelBox 
                 id="pb1" 
                 text="PanelBoxText"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Change panelBox text" 
                 actionListener="#{change.modifyPanelBox}"/>
@@ -70,14 +70,14 @@
                   <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:inputText id="it1" label="Label One"/>
-              <tr:objectSpacer width="10"/>
+              <tr:spacer width="10"/>
               <tr:commandButton 
                 text="Change label" 
                 actionListener="#{change.modifyInputText}"/>

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=426842&r1=426841&r2=426842&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 15:00:16 2006
@@ -68,7 +68,7 @@
               <tr:panelGroup 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"/>
@@ -123,12 +123,12 @@
                     <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:spacer height="15px"/>
                   <tr:showOneTab>
                     <tr:showDetailItem text="Tab 1">
                       <tr:panelHeader text="Tab Header 1">
@@ -151,7 +151,7 @@
                                        styleClass="mainContentText"/>
                         <tr:panelGroup 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:panelHeader>
@@ -175,7 +175,7 @@
                 </tr:panelGroup>
                 <tr:panelGroup 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">

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/demos/pprDemos.jspx Sat Jul 29 15:00:16 2006
@@ -81,7 +81,7 @@
                                    valueChangeListener="#{partialDemoUtil.valueChanged}"/>
            </tr:panelGroup>
           </tr:panelGroup>
-          <tr:objectSpacer width="30" height="10"/>
+          <tr:spacer width="30" height="10"/>
           <tr:panelGroup layout="vertical">
            <tr:selectOneRadio id="sor1"
                               label="selectOneRadio buttons"
@@ -93,7 +93,7 @@
            </tr:selectOneRadio>
           </tr:panelGroup>
          </tr:panelGroup>
-         <tr:objectSpacer width="30" height="10"/>
+         <tr:spacer width="30" height="10"/>
          <tr:panelLabelAndMessage label="Selected: ">
           <tr:outputFormatted id="rbTarget"
                               partialTriggers="rb1 rb2 rb3 sor1"
@@ -136,7 +136,7 @@
           <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"
@@ -160,7 +160,7 @@
           <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"
@@ -183,7 +183,7 @@
                              partialTriggers="cb1"
                              styleUsage="instruction"
                              value="#{partialDemoUtil.status.checkBoxStateText}"/>
-         <tr:objectSpacer width="20"/>
+         <tr:spacer width="20"/>
          <tr:panelGroup id="pg1" partialTriggers="cbTarget">
           <tr:outputFormatted styleUsage="instruction"
                               rendered="#{partialDemoUtil.status.checkBoxUpdateCount > 0}"
@@ -208,14 +208,14 @@
                           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:spacer width="30" height="10"/>
          <tr:panelGroup>
           <tr:panelLabelAndMessage label="last link click: ">
            <tr:outputFormatted id="cmdTarget"
@@ -234,12 +234,12 @@
                          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"

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=426842&r1=426841&r2=426842&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 15:00:16 2006
@@ -53,7 +53,7 @@
             <!--Represents a check list-->
             <tr:panelHeader text="Progress steps as a check list"/>
             <tr:panelGroup layout="horizontal">
-              <tr:objectSpacer width="30"/>
+              <tr:spacer width="30"/>
               <tr:panelGroup layout="vertical" partialTriggers="pollid" id="pg1">
                 <tr:forEach 
                   var="progressStep" 
@@ -62,13 +62,13 @@
                   end="#{progressSteps.progressModel.maximum - 1}" 
                   items="#{progressSteps.progressSteps}">
                   <tr:panelGroup layout="horizontal">
-                    <tr:objectSpacer 
+                    <tr:spacer 
                       width="13"
                       rendered="#{vs.index > progressSteps.progressModel.value}"/>
                     <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"/>
@@ -80,7 +80,7 @@
             <!--Represents a growing list-->
             <tr:panelHeader text="Progress steps as a growing list"/>
             <tr:panelGroup layout="horizontal">
-              <tr:objectSpacer width="30"/>
+              <tr:spacer width="30"/>
               <tr:panelGroup layout="vertical" partialTriggers="pollid" id="pg2">
                 <tr:forEach 
                   var="progressStep" 
@@ -100,7 +100,7 @@
 
             <tr:panelHeader/>
             <tr:panelGroup layout="horizontal">
-              <tr:objectSpacer width="30"/>
+              <tr:spacer width="30"/>
               <tr:panelGroup layout="vertical">
                 <tr:inputText 
                   readOnly="true" 
@@ -110,7 +110,7 @@
                   <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" 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx Sat Jul 29 15:00:16 2006
@@ -37,7 +37,7 @@
           <tr:outputText value="Test your knowledge of California Driving Laws"
                           styleClass="AFInstructionText"/>
         
-          <tr:objectSpacer height="20"/>
+          <tr:spacer height="20"/>
           <tr:commandButton action="#{survey.start}" text="begin survey"/>
          </tr:panelHeader>
        </tr:panelPage>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.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/pages/CalendarDialogJSP.java?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Sat Jul 29 15:00:16 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelGroup;
 import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
+import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
 import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
 import org.apache.myfaces.trinidad.context.RequestContext;
@@ -92,7 +92,7 @@
     // Create a spacer
     //
     UIComponent spacerRow = _createRow(isDesktop, null);
-    CoreObjectSpacer cos = new CoreObjectSpacer();
+    CoreSpacer cos = new CoreSpacer();
     spacerRow.getChildren().add(cos);
     cos.setHeight("8");
 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.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/pages/ColorPickerJSP.java?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java Sat Jul 29 15:00:16 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputColor;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelButtonBar;
 import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
+import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
 import org.apache.myfaces.trinidad.component.html.HtmlCellFormat;
 import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlScript;
@@ -89,7 +89,7 @@
 
     HtmlRowLayout rl2 = new HtmlRowLayout();
     tl.getChildren().add(rl2);
-    CoreObjectSpacer spacer = new CoreObjectSpacer();
+    CoreSpacer spacer = new CoreSpacer();
     rl2.getChildren().add(spacer);
     spacer.setHeight("8");
     
@@ -106,7 +106,7 @@
     
     HtmlRowLayout rl4 = new HtmlRowLayout();
     tl.getChildren().add(rl4);
-    CoreObjectSpacer spacer2 = new CoreObjectSpacer();
+    CoreSpacer spacer2 = new CoreSpacer();
     rl4.getChildren().add(spacer2);
     spacer2.setHeight("8");
     

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.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/SpacerRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java&r1=426705&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java Sat Jul 29 15:00:16 2006
@@ -23,15 +23,15 @@
 import javax.faces.context.ResponseWriter;
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
+import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
-public class ObjectSpacerRenderer extends XhtmlRenderer
+public class SpacerRenderer extends XhtmlRenderer
 {
-  public ObjectSpacerRenderer()
+  public SpacerRenderer()
   {
-    super(CoreObjectSpacer.TYPE);
+    super(CoreSpacer.TYPE);
   }
   
   protected void findTypeConstants(FacesBean.Type type)
@@ -95,4 +95,4 @@
 
   private PropertyKey _heightKey;
   private PropertyKey _widthKey;
-}
+}
\ No newline at end of file

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/media.xml (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectMedia.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/media.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/media.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectMedia.xml&r1=426705&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectMedia.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/media.xml Sat Jul 29 15:00:16 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.CoreObjectMedia" source="/components/images/seattle.wmv"/>
+  <base-component tr:type="org.apache.myfaces.trinidad.CoreMedia" source="/components/images/seattle.wmv"/>
   
   <boolean-test name="autostart"/>
   <attribute-test name="contentType"/>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelGroup.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/panelGroup.xml?rev=426842&r1=426841&r2=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelGroup.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelGroup.xml Sat Jul 29 15:00:16 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:facet="separator" tr:type="org.apache.myfaces.trinidad.CoreObjectSpacer" width="10" height="1"/>
+    <component tr:facet="separator" tr:type="org.apache.myfaces.trinidad.CoreSpacer" width="10" height="1"/>
   </base-component>
   
   <enum-test name="layout" default="default"/>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/spacer.xml (from r426705, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSpacer.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/spacer.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/spacer.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSpacer.xml&r1=426705&r2=426842&rev=426842&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/objectSpacer.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/spacer.xml Sat Jul 29 15:00:16 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.CoreObjectSpacer"/>
+  <base-component tr:type="org.apache.myfaces.trinidad.CoreSpacer"/>
 
   <!--pu: generates a div tag if only height is specified -->
   <attribute-test name="height" value="0"/>



Mime
View raw message