Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Wed Aug 2 11:34:29 2006 @@ -31,7 +31,7 @@ /** * Context class for all per-request and per-webapp information - * required by ADF Faces. A <code>RequestContext</code> object can be + * required by Trinidad. A <code>RequestContext</code> object can be * retrieved with the static [EMAIL PROTECTED] #getCurrentInstance} method. * There is one and only one <code>RequestContext</code> object * active in any one thread.
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml Wed Aug 2 11:34:29 2006 @@ -248,7 +248,7 @@ customColorData="#{myBean.listOfColors}"> <!-- A chooseColor that is associated with a selectInputColor --> -<tr:selectInputColor id="sic1" chooseId="cc2"/> +<tr:inputColor id="sic1" chooseId="cc2"/> <tr:chooseColor id="cc2" width="18" colorData="#{requestContext.colorPalette.web216}"/>]]> </mfp:source-code> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml Wed Aug 2 11:34:29 2006 @@ -230,7 +230,7 @@ </html:p>]]> </mfp:long-description> <mfp:example> - <mfp:source-code><![CDATA[<tr:selectInputDate chooseId="cd1"/> + <mfp:source-code><![CDATA[<tr:inputDate chooseId="cd1"/> <tr:chooseDate id="cd1" minValue="2004-07-01" maxValue="2014-12-31"/>]]> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGroup.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGroup.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGroup.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGroup.xml Wed Aug 2 11:34:29 2006 @@ -20,7 +20,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude";> <component> <description><![CDATA[The group component is an invisible control that aggregates semantically-related children. -The children of the group will not be displayed unless the parent of the group has specific support for displaying the grouped children, e.g. the panelForm.]]> +The children of the group will not be displayed unless the parent of the group has specific support for displaying the grouped children, e.g. the panelFormLayout.]]> </description> <icon> <small-icon>/org/apache/myfaces/trinidad/metadata/icons/group.png</small-icon> @@ -34,11 +34,11 @@ <mfp:tag-name>tr:group</mfp:tag-name> <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.CoreGroupTag</mfp:tag-class> <mfp:long-description><![CDATA[The group component is an invisible control that aggregates semantically-related children. -The children of the group will not be displayed unless the parent of the group has specific support for displaying the grouped children, e.g. the rich panelForm.]]> +The children of the group will not be displayed unless the parent of the group has specific support for displaying the grouped children, e.g. the rich panelFormLayout.]]> </mfp:long-description> <mfp:example> <mfp:source-code><![CDATA[ - <tr:panelForm labelWidth="33%" fieldWidth="67%"> + <tr:panelFormLayout labelWidth="33%" fieldWidth="67%"> <tr:inputText label="non-group item 1"/> <tr:group> <tr:inputText label="group item 1"/> @@ -46,7 +46,7 @@ <tr:inputText label="group item 3"/> </tr:group> <tr:inputText label="non-group item 2"/> -</tr:panelForm>]]> +</tr:panelFormLayout>]]> </mfp:source-code> </mfp:example> <mfp:author>ADF Faces</mfp:author> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml Wed Aug 2 11:34:29 2006 @@ -44,7 +44,7 @@ <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:objectImage tr:objectSeparator</mfp:preferred-children> + <mfp:preferred-children>tr:image tr:separator</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml Wed Aug 2 11:34:29 2006 @@ -43,7 +43,7 @@ <facet-name>contextSwitcher</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:rowLayout tr:panelGroup</mfp:preferred-children> + <mfp:preferred-children>tr:rowLayout tr:panelGroupLayout</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -59,26 +59,26 @@ </facet> <facet> <description><![CDATA[The corporate or organization branding region of the page. This section typically - contains a medium size objectImage of the logo of the organization + contains a medium size image of the logo of the organization owning the page.]]> </description> <facet-name>branding</facet-name> <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:objectImage</mfp:preferred-children> + <mfp:preferred-children>tr:image</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> <facet> <description><![CDATA[The application, module, or product branding region of the page. - This section typically contains a objectImage of the application logo.]]> + This section typically contains a image of the application logo.]]> </description> <facet-name>brandingApp</facet-name> <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:objectImage</mfp:preferred-children> + <mfp:preferred-children>tr:image</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -116,7 +116,7 @@ <facet-name>location</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:processTrain tr:navigationPath</mfp:preferred-children> + <mfp:preferred-children>tr:train tr:breadCrumbs</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -201,7 +201,7 @@ <facet-name>infoUser</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -213,7 +213,7 @@ <facet-name>infoFootnote</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -228,7 +228,7 @@ <facet-name>infoStatus</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -398,10 +398,10 @@ <tr:commandNavigationItem text="#{foo.label}" action="#{foo.action}"/> </f:facet> <f:facet name="branding"> - <tr:panelGroup layout="horizontal"> - <tr:objectImage source="/components/images/corporateBrand.gif"/> - <tr:objectImage source="/components/images/applicationBrand.gif"/> - </tr:panelGroup> + <tr:panelGroupLayout layout="horizontal"> + <tr:image source="/components/images/corporateBrand.gif"/> + <tr:image source="/components/images/applicationBrand.gif"/> + </tr:panelGroupLayout> </f:facet> <f:facet name="appCopyright"> <tr:outputText value="copyright facet"/> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml Wed Aug 2 11:34:29 2006 @@ -140,13 +140,13 @@ contentStyle="background:blue;" icon="/images/info.gif" inlineStyle = "width: 25%;" > - <tr:panelGroup layout="vertical"> + <tr:panelGroupLayout layout="vertical"> <tr:goLink text="point 1" destination="http://myfaces.apache.org"/> <tr:goLink text="point 2" destination="http://myfaces.apache.org"/> <tr:goLink text="point 3" destination="http://myfaces.apache.org"/> <tr:goLink text="point 4" destination="http://myfaces.apache.org"/> <tr:goLink text="point 5" destination="http://myfaces.apache.org"/> - </tr:panelGroup> + </tr:panelGroupLayout> </tr:panelBox>]]> </mfp:source-code> </mfp:example> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml Wed Aug 2 11:34:29 2006 @@ -149,7 +149,7 @@ <f:facet name="help"> <tr:outputText value="Pick a date"/> </f:facet> - <tr:selectInputDate id="selectDate" simple="true"/> + <tr:inputDate id="selectDate" simple="true"/> </tr:panelLabelAndMessage>]]> </mfp:source-code> </mfp:example> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml Wed Aug 2 11:34:29 2006 @@ -70,14 +70,14 @@ </facet> <facet> <description><![CDATA[The branding region of the page. This section typically - contains a horizontal panelGroup for an objectImage of a logo and an + contains a horizontal panelGroup for an image of a logo and an outputText for a title.]]> </description> <facet-name>branding</facet-name> <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:panelGroup tr:objectImage tr:outputText</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:image tr:outputText</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -102,7 +102,7 @@ <facet-name>infoFootnote</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -126,7 +126,7 @@ <facet-name>infoStatus</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -137,7 +137,7 @@ <facet-name>infoUser</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup tr:outputFormatted</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout tr:outputFormatted</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -152,7 +152,7 @@ <facet-name>location</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:processTrain tr:navigationPath</mfp:preferred-children> + <mfp:preferred-children>tr:train tr:breadCrumbs</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -162,7 +162,7 @@ <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children> + <mfp:preferred-children>tr:navigationPane</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -171,7 +171,7 @@ <facet-name>navigation2</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children> + <mfp:preferred-children>tr:navigationPane</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -180,7 +180,7 @@ <facet-name>navigation3</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:navigationLevel tr:navigationTree</mfp:preferred-children> + <mfp:preferred-children>tr:navigationPane tr:navigationTree</mfp:preferred-children> </mfp:facet-metadata> <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents> </facet-extension> @@ -191,7 +191,7 @@ <facet-extension> <mfp:facet-metadata> <mfp:preferred>true</mfp:preferred> - <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children> + <mfp:preferred-children>tr:navigationPane</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -273,21 +273,21 @@ <mfp:example> <mfp:source-code><![CDATA[<tr:panelPage> <f:facet name="branding"> - <tr:panelGroup layout="horizontal"> - <tr:objectImage source="/images/corporateBrand.gif"/> + <tr:panelGroupLayout layout="horizontal"> + <tr:image source="/images/corporateBrand.gif"/> <tr:outputText value="My Company"/> - </tr:panelGroup> + </tr:panelGroupLayout> </f:facet> <f:facet name="location"> - <tr:navigationPath> + <tr:breadCrumbs> <tr:commandNavigationItem text="crumb 1" action="guide.navigationLevel"/> <tr:commandNavigationItem text="crumb 2" action="guide.navigationLevel"/> <tr:commandNavigationItem text="crumb 3" action="guide.navigationLevel"/> <tr:commandNavigationItem text="crumb 4" action="guide.navigationLevel"/> - </tr:navigationPath> + </tr:breadCrumbs> </f:facet> <f:facet name="navigation1"> - <tr:navigationLevel> + <tr:navigationPane> <tr:commandNavigationItem text="tab 1" action="guide.navigationLevel"/> <tr:commandNavigationItem text="tab 2" action="guide.navigationLevel" selected="true"/> @@ -296,31 +296,31 @@ <tr:commandNavigationItem text="tab 5" action="guide.navigationLevel"/> <tr:commandNavigationItem text="tab 6" action="guide.navigationLevel" disabled="true"/> - </tr:navigationLevel> + </tr:navigationPane> </f:facet> <f:facet name="navigation2"> - <tr:navigationLevel> + <tr:navigationPane> <tr:commandNavigationItem text="item 1" action="guide.navigationLevel" selected="true"/> <tr:commandNavigationItem text="item 2" action="guide.navigationLevel" disabled="true"/> <tr:commandNavigationItem text="item 3" action="guide.navigationLevel"/> <tr:commandNavigationItem text="item 4" action="guide.navigationLevel"/> - </tr:navigationLevel> + </tr:navigationPane> </f:facet> <f:facet name="navigation3"> - <tr:navigationLevel> + <tr:navigationPane> <tr:commandNavigationItem text="item 1" action="guide.navigationLevel"/> <tr:commandNavigationItem text="item 2" action="guide.navigationLevel"/> <tr:commandNavigationItem text="item 3" action="guide.navigationLevel"/> - </tr:navigationLevel> + </tr:navigationPane> </f:facet> <f:facet name="navigationGlobal"> - <tr:navigationLevel> + <tr:navigationPane> <tr:commandNavigationItem text="Home" action="guide.navigationLevel"/> <tr:commandNavigationItem text="Help" action="guide.navigationLevel"/> <tr:commandNavigationItem text="Sign Out" action="guide.navigationLevel"/> - </tr:navigationLevel> + </tr:navigationPane> </f:facet> <tr:outputText value="Content here"/> </tr:panelPage>]]> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml Wed Aug 2 11:34:29 2006 @@ -66,24 +66,24 @@ </facet> <facet> <description><![CDATA[The corporate or organization branding region of the page. This section typically - contains a medium size objectImage of the logo of the organization + contains a medium size image of the logo of the organization owning the page.]]> </description> <facet-name>branding</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:objectImage</mfp:preferred-children> + <mfp:preferred-children>tr:image</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> <facet> <description><![CDATA[The application, module, or product branding region of the page. - This section typically contains a objectImage of the application logo.]]> + This section typically contains a image of the application logo.]]> </description> <facet-name>brandingApp</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:objectImage</mfp:preferred-children> + <mfp:preferred-children>tr:image</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -272,12 +272,12 @@ <mfp:example> <mfp:source-code><![CDATA[<tr:panelPageHeader> <f:facet name="branding"> - <tr:panelGroup layout="horizontal"> - <tr:objectImage source="/components/images/corporateBrand.gif"/> - <tr:objectImage source="/components/images/applicationBrand.gif"/> + <tr:panelGroupLayout layout="horizontal"> + <tr:image source="/components/images/corporateBrand.gif"/> + <tr:image source="/components/images/applicationBrand.gif"/> <tr:outputFormatted value="Customer <b>Contextual Application Branding - Menlo Park</b>" styleUsage="inContextBranding"/> - </tr:panelGroup> + </tr:panelGroupLayout> </f:facet> <f:facet name="navigationGlobal"> <tr:menuButtons> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml Wed Aug 2 11:34:29 2006 @@ -241,13 +241,13 @@ <mfp:example> <xhtml:p/> <mfp:source-code><![CDATA[<h:form> - <tr:panelGroup type="horizontal"> + <tr:panelGroupLayout type="horizontal"> <tr:panelHeader text="Reset Elements." /> <tr:selectBooleanCheckbox text="Box1" /> <tr:selectBooleanCheckbox text="Box2" selected="true"/> <tr:selectBooleanCheckbox text="Box3" /> <tr:resetButton textAndAccessKey="&Reset"/> - </tr:panelGroup> + </tr:panelGroupLayout> </h:form>]]> </mfp:source-code> </mfp:example> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml Wed Aug 2 11:34:29 2006 @@ -43,7 +43,7 @@ <facet-name>leadingFooter</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -52,7 +52,7 @@ <facet-name>trailingFooter</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml Wed Aug 2 11:34:29 2006 @@ -43,7 +43,7 @@ <facet-name>leadingFooter</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> @@ -52,7 +52,7 @@ <facet-name>trailingFooter</facet-name> <facet-extension> <mfp:facet-metadata> - <mfp:preferred-children>tr:panelGroup</mfp:preferred-children> + <mfp:preferred-children>tr:panelGroupLayout</mfp:preferred-children> </mfp:facet-metadata> </facet-extension> </facet> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml Wed Aug 2 11:34:29 2006 @@ -150,10 +150,10 @@ <mfp:example> <xhtml:p>Two showDetailItems, the first of which is "disclosed":</xhtml:p> <mfp:source-code> - <![CDATA[<tr:showOneTab> + <![CDATA[<tr:panelTabbed> <tr:showDetailItem text="First" disclosed="true"/> <tr:showDetailItem text="Second"/> - </tr:showOneTab>]]> + </tr:panelTabbed>]]> </mfp:source-code> </mfp:example> <mfp:author>Prakash Udupa</mfp:author> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml Wed Aug 2 11:34:29 2006 @@ -265,10 +265,10 @@ <trh:cellFormat valign="bottom"> SecondColumn </trh:cellFormat> - <tr:panelGroup laytou="horizontal"> + <tr:panelGroupLayout laytou="horizontal"> Third Column - <tr:objectSpacer height="100" width="1"/> - </tr:panelGroup> + <tr:spacer height="100" width="1"/> + </tr:panelGroupLayout> </trh:rowLayout> <trh:rowLayout> <tr:panelHeader text="ADF Faces Components"/> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml Wed Aug 2 11:34:29 2006 @@ -218,10 +218,10 @@ <trh:cellFormat valign="bottom"> SecondColumn </trh:cellFormat> - <tr:panelGroup layout="horizontal"> + <tr:panelGroupLayout layout="horizontal"> Third Column - <tr:objectSpacer height="100" width="1"/> - </tr:panelGroup> + <tr:spacer height="100" width="1"/> + </tr:panelGroupLayout> </trh:rowLayout> <trh:rowLayout> <tr:panelHeader text="ADF Faces Components"/> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml Wed Aug 2 11:34:29 2006 @@ -233,10 +233,10 @@ SecondColumn </trh:cellFormat> - <tr:panelGroup layout="horizontal"> + <tr:panelGroupLayout layout="horizontal"> Third Column - <tr:objectSpacer height="100" width="1"/> - </tr:panelGroup> + <tr:spacer height="100" width="1"/> + </tr:panelGroupLayout> </trh:rowLayout> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml Wed Aug 2 11:34:29 2006 @@ -94,11 +94,11 @@ <mfp:example> <mfp:source-code> <![CDATA[ -<tr:selectInputColor id="sicConv" chooseId="cpConv" +<tr:inputColor id="sicConv" chooseId="cpConv" label="Enter or select color from palette below" value="#{color.colorValue1}"> <tr:convertColor patterns="rrr-ggg-bbb #RRGGBB" transparentAllowed="false" /> -</tr:selectInputColor> +</tr:inputColor> <tr:chooseColor id="cpConv" colorData="#{requestContext.colorPalette.default49}"/> ]]> Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml Wed Aug 2 11:34:29 2006 @@ -151,12 +151,12 @@ Validate that the date entered is within a given range. </html:p>]]></mfp:long-description> <mfp:example> - <mfp:source-code><![CDATA[<tr:selectInputDate id="mdf3" value="#{date.date3}" + <mfp:source-code><![CDATA[<tr:inputDate id="mdf3" value="#{date.date3}" label="max validator"> <tr:validateDateTimeRange maximum="#{date.maxDate}"/> -</tr:selectInputDate> +</tr:inputDate> -<tr:selectInputDate id="mdf3" value="2004-11-25" +<tr:inputDate id="mdf3" value="2004-11-25" tip="min=2004-11-16 max=2004-12-16" label="Submission period"> <tr:convertDateTime pattern="yyyy-MM-dd"/> @@ -166,7 +166,7 @@ minimum="2004-11-16" maximum="2004-12-16" notInRangeMessageDetail="Date "{1}" does not fall within the range {2} : {3}"/> -</tr:selectInputDate>]]> +</tr:inputDate>]]> </mfp:source-code> </mfp:example> <mfp:author>Gabrielle Crawford</mfp:author> Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java?rev=428081&r1=428080&r2=428081&view=diff ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java Wed Aug 2 11:34:29 2006 @@ -45,7 +45,7 @@ import org.apache.myfaces.trinidad.change.ReorderChildrenComponentChange; import org.apache.myfaces.trinidad.component.core.nav.CoreCommandButton; -import org.apache.myfaces.trinidad.component.core.output.CoreObjectImage; +import org.apache.myfaces.trinidad.component.core.output.CoreImage; import org.apache.myfaces.trinidad.component.core.output.CoreOutputFormatted; import org.apache.myfaces.trinidad.context.RequestContext; @@ -62,7 +62,7 @@ public class ChangeBean { /** - * Picks up an image randomly from a list and changes it on the objectImage. + * Picks up an image randomly from a list and changes it on the image. */ public void modifyObjectImage(ActionEvent event) { @@ -116,7 +116,7 @@ } /** - * Appends an objectImage child to the panelGroup in the underlying JSP document + * Appends an image child to the panelGroup in the underlying JSP document */ public void appendChildToDocument(ActionEvent event) { @@ -142,7 +142,7 @@ } /** - * Appends an objectImage child to the panelGroup. + * Appends an image child to the panelGroup. */ public void appendChild(ActionEvent event) { @@ -152,9 +152,9 @@ return; FacesContext fc = FacesContext.getCurrentInstance(); - CoreObjectImage newChild = - (CoreObjectImage) fc.getApplication().createComponent( - "org.apache.myfaces.trinidad.CoreObjectImage"); + CoreImage newChild = + (CoreImage) fc.getApplication().createComponent( + "org.apache.myfaces.trinidad.CoreImage"); newChild.setId("oi2"); newChild.setInlineStyle("height: 100px, width: 120px"); newChild.setSource( @@ -385,7 +385,7 @@ // markup to use for image added to document private static final String _IMAGE_MARK_UP = - "<tr:objectImage id='oi3' inlineStyle='height: 100px; width: 120px;' " + + "<tr:Image id='oi3' inlineStyle='height: 100px; width: 120px;' " + "source='http://homepage.mac.com/awiner/.Pictures/WindyHill/PaleSwallowtail.jpg' " + "xmlns:af='http://myfaces.apache.org/adf/faces/EA17'/>";
