myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arobinso...@apache.org
Subject svn commit: r891522 [1/28] - in /myfaces/trinidad/branches/trinidad-2.0.x: ./ trinidad-api/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/ap...
Date Thu, 17 Dec 2009 02:33:11 GMT
Author: arobinson74
Date: Thu Dec 17 02:33:05 2009
New Revision: 891522

URL: http://svn.apache.org/viewvc?rev=891522&view=rev
Log:
TRINIDAD-1597
Added support for client behaviors on Trinidad components

Added:
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/
      - copied from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/InvokeFunctionBehavior.java
      - copied unchanged from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/InvokeFunctionBehavior.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/
      - copied from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/InvokeFunctionBehaviorRenderer.java
      - copied unchanged from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/InvokeFunctionBehaviorRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/tr-demo.taglib.xml
      - copied unchanged from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/tr-demo.taglib.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/clientBehaviorHolder.xhtml
      - copied unchanged from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-examples/trinidad-demo/src/main/webapp/demos/clientBehaviorHolder.xhtml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/MVisitContextFactory.java
      - copied unchanged from r891464, myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/MVisitContextFactory.java
Modified:
    myfaces/trinidad/branches/trinidad-2.0.x/   (props changed)
    myfaces/trinidad/branches/trinidad-2.0.x/pom.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/pom.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreBreadCrumbs.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandButton.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandLink.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandNavigationItem.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreDocument.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreForm.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoButton.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImage.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessages.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelRadio.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTip.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProcessChoiceBar.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanCheckbox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/demos.jspx
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/pom.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaCommandLinkRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaMessageBoxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaNavigationPaneRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImportScriptRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputNumberSpinboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelAccordionRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBorderLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelButtonBarRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelCaptionGroupRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanCheckboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanRadioRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyCheckboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyListboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneChoiceRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneListboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneRadioRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimal-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIE-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIERtl-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalInacc-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalSaf-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalScrRdr-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/   (props changed)
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/   (props changed)

Propchange: myfaces/trinidad/branches/trinidad-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 02:33:05 2009
@@ -1,5 +1,8 @@
 /myfaces/trinidad/branches/1.2.11.3-branch:770843-770856,771372,785365
 /myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch:888969
 /myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
 /myfaces/trinidad/branches/TRINIDAD-1402:745675
+/myfaces/trinidad/branches/ar_clientBehaviors:881469-891464
 /myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/trunk:888973

Modified: myfaces/trinidad/branches/trinidad-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/pom.xml?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/pom.xml Thu Dec 17 02:33:05 2009
@@ -61,7 +61,7 @@
     <!-- Plugins -->
     <trinidad-plugins.version>2.0.0-SNAPSHOT</trinidad-plugins.version>
     <wagon-plugin.version>1.0.6</wagon-plugin.version>
-    <jetty-plugin.version>6.1.16</jetty-plugin.version>
+    <jetty-plugin.version>6.1.21</jetty-plugin.version>
     <pluto.version>1.1.6</pluto.version>
     <pluto.package>org.apache.pluto</pluto.package>
     

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/pom.xml?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/pom.xml Thu Dec 17 02:33:05 2009
@@ -106,6 +106,12 @@
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-jdev-plugin</artifactId>
+        <configuration>
+          <projectHasTests>true</projectHasTests>
+          <testSourceRoots>
+            <file>${project.basedir}/src/test</file>
+          </testSourceRoots>
+        </configuration>
       </plugin>
 
       <plugin>

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java Thu Dec 17 02:33:05 2009
@@ -6,9 +6,9 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,13 +29,16 @@
 
 import javax.el.ValueExpression;
 
+import javax.faces.component.behavior.ClientBehavior;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
+
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
+
 /**
  * Base interface for FacesBean storage objects.
- * 
+ *
  */
 public interface FacesBean
 {
@@ -48,7 +51,7 @@
    * Returns a property.  If the property has not been explicitly
    * set, and the key supports bindings, and a ValueBinding has
    * been set for this key, that ValueBinding will be evaluated.
-   * 
+   *
    * @param key the property key
    * @exception IllegalArgumentException if key is a list key
    */
@@ -63,7 +66,7 @@
 
   /**
    * Return a property, ignoring any value bindings.
-   * 
+   *
    * @exception IllegalArgumentException if key is a list key
    */
   public Object getLocalProperty(PropertyKey key);
@@ -84,38 +87,38 @@
   public ValueBinding getValueBinding(PropertyKey key);
 
   /**
-   * Gets the current unevaluated value for the specified property key. 
-   * <p>The method will first look for a local value. If it exists, it will 
-   * be returned. If it does not and the bean supports value expressions, the 
-   * method will look for an expression with the specified key and return it 
+   * Gets the current unevaluated value for the specified property key.
+   * <p>The method will first look for a local value. If it exists, it will
+   * be returned. If it does not and the bean supports value expressions, the
+   * method will look for an expression with the specified key and return it
    * directly if it exists without evaluatig its value.</p>
    * <p>This method is mainly used when:</p>
    * <ul>
-   *   <li>The caller cannot ensure that FacesContext exists at the time 
+   *   <li>The caller cannot ensure that FacesContext exists at the time
    *   of the call</li>
    *   <li>The FacesContext does not yet contains the managed bean
    *   referenced by the value binding</li>
-   *   <li>The managed bean referenced by the value binding is not yet 
+   *   <li>The managed bean referenced by the value binding is not yet
    *   in a coherent state to evaluate the expression</li>
    * </ul>
-   * <p>The most common use case of this method is for message attributes 
-   * set on converters and validators using a value binding referencing 
-   * a managed bean created by <code>&lt;f:loadBundle/&gt;<code>. Since 
-   * loadBundle only creates its bean during the render response phase 
-   * while converter and validators take action during process validation 
-   * phase, the message property's value binding must be stored in a 
-   * special <code>FacesMessage</code> implementation that will evaluate 
+   * <p>The most common use case of this method is for message attributes
+   * set on converters and validators using a value binding referencing
+   * a managed bean created by <code>&lt;f:loadBundle/&gt;<code>. Since
+   * loadBundle only creates its bean during the render response phase
+   * while converter and validators take action during process validation
+   * phase, the message property's value binding must be stored in a
+   * special <code>FacesMessage</code> implementation that will evaluate
    * the binding only during render response.</p>
-   * 
+   *
    * @param key the parameter key of the raw property value to get.
-   * 
-   * @return the local value of the specified key if it exists, a 
-   *         <code>ValueExpression</code> object if the specified key 
-   *         supports expressions and an expression was specified for that 
+   *
+   * @return the local value of the specified key if it exists, a
+   *         <code>ValueExpression</code> object if the specified key
+   *         supports expressions and an expression was specified for that
    *         property, <code>null</code> otherwise.
-   * 
+   *
    * @throws IllegalArgumentException if the specified key is a list key.
-   * 
+   *
    * @see #getLocalProperty(PropertyKey)
    * @see #getValueBinding(PropertyKey)
    * @see #getValueExpression(PropertyKey)
@@ -138,6 +141,21 @@
   public void setValueBinding(PropertyKey key, ValueBinding binding);
 
   /**
+   * Add a client behavior for a bean of a component that is a
+   * {@link javax.faces.component.behavior.ClientBehaviorHolder}
+   * @param eventName the event name
+   * @param behavior the behavior
+   */
+  public void addClientBehavior(String eventName, ClientBehavior behavior);
+
+  /**
+   * Get a map of event name to list of client behaviors for a bean of a component that is a
+   * {@link javax.faces.component.behavior.ClientBehaviorHolder}
+   * @return Non-null map of client behaviors (will return an empty map if none are present)
+   */
+  public Map<String, List<ClientBehavior>> getClientBehaviors();
+
+  /**
    * Add an entry to a list.  The same value may be added
    * repeatedly;  null is also a legal value.  (Consumers of
    * this API can apply more stringent rules to specific keys
@@ -153,7 +171,7 @@
   public void removeEntry(PropertyKey listKey, Object value);
 
   /**
-   * Return as an array all elements of this key that 
+   * Return as an array all elements of this key that
    * are instances of the specified class.
    * @return an array whose instance type is the class
    * @exception IllegalArgumentException if the key is not a list key.
@@ -203,15 +221,15 @@
    */
   public void markInitialState();
 
-  /** 
+  /**
    * @return true if delta state changes are being tracked, otherwise false
    */
   public boolean initialStateMarked();
 
-  /** 
+  /**
    * Reset to a non-delta tracking state.
    */
-  public void clearInitialState();     
+  public void clearInitialState();
 
   /**
    * Saves the state of a FacesBean.
@@ -270,7 +288,7 @@
     {
       if ((index < 0) || (index >= _keyList.size()))
         return null;
-      
+
       return _keyList.get(index);
     }
 
@@ -343,14 +361,14 @@
     public PropertyKey registerAlias(PropertyKey key, String alias)
     {
       _checkLocked();
-      
+
       if (findKey(alias) != null)
         throw new IllegalStateException();
 
       _keyMap.put(alias, key);
       return key;
     }
-    
+
 
     /**
      * Register a new key with a set of capabilities.
@@ -358,7 +376,7 @@
      *    or the key already exists.
      */
     public PropertyKey registerKey(
-      String   name, 
+      String   name,
       Class<?> type,
       Object   defaultValue,
       int      capabilities)
@@ -374,8 +392,8 @@
       addKey(key);
       return key;
     }
-    
-    
+
+
     /**
      * Locks the type object, preventing further changes.
      */
@@ -407,12 +425,12 @@
     {
       return propertyKeys().iterator();
     }
-    
+
     /**
      * Returns an unmodifiable <code>Collection</code> of registered property keys,
      * excluding aliases.
-     * 
-     * @return unmodifiable <code>Collection</code> with registered 
+     *
+     * @return unmodifiable <code>Collection</code> with registered
      */
     public Collection<PropertyKey> propertyKeys()
     {
@@ -454,7 +472,7 @@
     protected void addKey(PropertyKey key)
     {
       _checkLocked();
-      
+
       // Restore the old key
       PropertyKey oldValue = _keyMap.put(key.getName(), key);
       if (oldValue != null)
@@ -463,7 +481,7 @@
         throw new IllegalStateException(_LOG.getMessage(
           "NAME_ALREADY_REGISTERED", key.getName()));
       }
-      
+
       int index = key.getIndex();
       if (index >= 0)
       {
@@ -476,12 +494,12 @@
               "INDEX_ALREADY_REGISTERED", index));
           }
       }
-      
+
       // Set the backpointer
       key.__setOwner(this);
     }
-     
-    
+
+
     static private void _expandListToIndex(ArrayList<PropertyKey> list, int count)
     {
       list.ensureCapacity(count + 1);
@@ -514,6 +532,6 @@
     private boolean   _isLocked;
     private int       _index;
     private final Type _superType;
-    static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(Type.class); 
+    static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(Type.class);
   }
 }

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java Thu Dec 17 02:33:05 2009
@@ -6,9 +6,9 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,20 +22,25 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.el.ValueExpression;
 
+import javax.faces.component.PartialStateHolder;
+import javax.faces.component.StateHolder;
+import javax.faces.component.behavior.ClientBehavior;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-
-
 import org.apache.myfaces.trinidad.bean.util.FlaggedPropertyMap;
+import org.apache.myfaces.trinidad.bean.util.StateUtils;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
+
 /**
  * Base implementation of FacesBean.
  *
@@ -72,8 +77,6 @@
     return null;
   }
 
-
-  
   /**
    * {@inheritDoc}
    */
@@ -87,7 +90,6 @@
     return key.getSupportsBinding() ? getValueExpression(key) : null;
   }
 
-
   // TODO Need *good* way of hooking property-sets;  it's
   // currently not called from state restoring, so really, it shouldn't
   // be used as a hook, but EditableValueBase currently
@@ -113,7 +115,7 @@
     if (map == null)
       return null;
 
-    return (ValueExpression) map.get(key);    
+    return (ValueExpression) map.get(key);
   }
 
   final public void setValueExpression(PropertyKey key,
@@ -139,7 +141,7 @@
     }
 
   }
-  
+
   @SuppressWarnings("deprecation")
   final public ValueBinding getValueBinding(PropertyKey key)
   {
@@ -160,7 +162,7 @@
   final public void setValueBinding(PropertyKey key, ValueBinding binding)
   {
     ValueExpression ve;
-    
+
     if (binding == null)
     {
       ve = null;
@@ -173,6 +175,50 @@
     setValueExpression(key, ve);
   }
 
+  final public void addClientBehavior(
+    String         eventName,
+    ClientBehavior behavior)
+  {
+    if (_behaviors != null)
+    {
+      if (_behaviors.initialStateMarked())
+      {
+        // Resest the state of the behaviors so that their full state is saved when the
+        // behaviors of this component have been changed
+        _behaviors.clearInitialState();
+      }
+    }
+    else
+    {
+      _behaviors = new BehaviorMap();
+      _behaviorsReadOnly = null;
+    }
+
+    List<ClientBehavior> list = _behaviors.get(eventName);
+    if (list == null)
+    {
+      // Use a small number here as it will not be likely to have many behaviors for a component
+      // per event (probably 1)
+      list = new ArrayList<ClientBehavior>(5);
+      _behaviors.put(eventName, list);
+    }
+    list.add(behavior);
+  }
+
+  public Map<String, List<ClientBehavior>> getClientBehaviors()
+  {
+    if (_behaviors == null)
+    {
+      // never return null, per the spec.
+      return Collections.emptyMap();
+    }
+
+    if (_behaviorsReadOnly == null)
+    {
+      _behaviorsReadOnly = Collections.unmodifiableMap(_behaviors);
+    }
+    return _behaviorsReadOnly;
+  }
 
   @SuppressWarnings("unchecked")
   final public void addEntry(PropertyKey listKey, Object value)
@@ -318,7 +364,6 @@
     return _expressions.keySet();
   }
 
-
   public void markInitialState()
   {
     _initialStateMarked = true;
@@ -328,8 +373,10 @@
 
     if (_expressions != null)
       _expressions.markInitialState();
-  }
 
+    if (_behaviors != null)
+      _behaviors.markInitialState();
+  }
 
   public void clearInitialState()
   {
@@ -340,6 +387,9 @@
 
     if (_expressions != null)
       _expressions.clearInitialState();
+
+    if (_behaviors != null)
+      _behaviors.clearInitialState();
   }
 
   public boolean initialStateMarked()
@@ -357,7 +407,20 @@
     if (state instanceof Object[])
     {
       Object[] asArray = (Object[]) state;
-      if (asArray.length == 2)
+      if (asArray.length == 3)
+      {
+        Object propertyState = asArray[0];
+        Object bindingsState = asArray[1];
+        Object behaviorState = asArray[2];
+        _getPropertyMap().restoreState(context, getType(), propertyState);
+        if (bindingsState != null)
+        {
+          _getExpressionsMap(true).restoreState(context, getType(), bindingsState);
+        }
+        _getBehaviors(true).restoreState(context, behaviorState);
+        return;
+      }
+      else if (asArray.length == 2)
       {
         Object propertyState = asArray[0];
         Object bindingsState = asArray[1];
@@ -383,7 +446,6 @@
       _LOG.finer("Saving state of " + this);
     }
 
-
     Object propertyState = (_properties == null)
                             ? null
                             : _properties.saveState(context);
@@ -391,9 +453,15 @@
                             ? null
                             : _expressions.saveState(context);
 
+    Object behaviorState = _behaviors == null ? null : _behaviors.saveState(context);
+
+    if (behaviorState != null)
+    {
+      return new Object[] { propertyState, bindingsState, behaviorState };
+    }
     if (bindingsState != null)
     {
-      return new Object[]{propertyState, bindingsState};
+      return new Object[] { propertyState, bindingsState };
     }
 
     if (propertyState == null)
@@ -482,7 +550,6 @@
     return (fromKey.isList() == toKey.isList());
   }
 
-
   private PropertyMap _getPropertyMap()
   {
     if (_properties == null)
@@ -491,6 +558,17 @@
     return _properties;
   }
 
+  private BehaviorMap _getBehaviors(
+    boolean create)
+  {
+    if (_behaviors == null && create)
+    {
+      _behaviors = new BehaviorMap();
+    }
+
+    return _behaviors;
+  }
+
   private PropertyMap _getExpressionsMap(boolean createIfNew)
   {
     if (_expressions == null)
@@ -504,7 +582,6 @@
     return _expressions;
   }
 
-
   static private void _checkListKey(PropertyKey listKey)
     throws IllegalArgumentException
   {
@@ -521,10 +598,172 @@
         "KEY_IS_LIST_KEY", key));
   }
 
-  private PropertyMap  _properties;
-  private PropertyMap  _expressions;
-  private transient boolean  _initialStateMarked;
+  private static class BehaviorMap
+    extends HashMap<String, List<ClientBehavior>>
+    implements PartialStateHolder
+  {
+    BehaviorMap()
+    {
+      // We do not expect many event types to be present on the component and we will assume 5
+      // to avoid the overhead of actually checking the number by calling the component method
+      this(5);
+    }
+
+    BehaviorMap(int initialCapacity)
+    {
+      super(initialCapacity, 1.0f);
+    }
+
+    public void markInitialState()
+    {
+      for (Map.Entry<String, List<ClientBehavior>> e : this.entrySet())
+      {
+        for (ClientBehavior behavior : e.getValue())
+        {
+          if (behavior instanceof PartialStateHolder)
+          {
+            ((PartialStateHolder)behavior).markInitialState();
+          }
+        }
+      }
+      _initialStateMarked = true;
+    }
+
+    public void clearInitialState()
+    {
+      _initialStateMarked = false;
+      for (Map.Entry<String, List<ClientBehavior>> e : this.entrySet())
+      {
+        for (ClientBehavior behavior : e.getValue())
+        {
+          if (behavior instanceof PartialStateHolder)
+          {
+            ((PartialStateHolder)behavior).clearInitialState();
+          }
+        }
+      }
+    }
+
+    public boolean initialStateMarked()
+    {
+      return _initialStateMarked;
+    }
+
+    public Object saveState(
+      FacesContext facesContext)
+    {
+      Map<String, Object[]> state = new HashMap<String, Object[]>(this.size());
+      for (Map.Entry<String, List<ClientBehavior>> e : this.entrySet())
+      {
+        List<ClientBehavior> l = e.getValue();
+        Object[] entryState = new Object[l.size()];
+        boolean stateWasSaved = false;
+        for (int i = 0, size = entryState.length; i < size; ++i)
+        {
+          ClientBehavior behavior = l.get(i);
+          if (_initialStateMarked)
+          {
+            // JSF 2 state saving, only save the behavior's state if it is a state holder,
+            // otherwise the re-application of the template will handle the re-creation of the
+            // client behavior in the correct state
+            if (behavior instanceof StateHolder)
+            {
+              entryState[i] = ((StateHolder)behavior).saveState(facesContext);
+            }
+          }
+          else
+          {
+            // Use JSF <= 1.2 state saving method as the initial state was not marked
+            entryState[i] = StateUtils.saveStateHolder(facesContext, behavior);
+          }
+
+          stateWasSaved &= (entryState[i] != null);
+        }
+
+        if (stateWasSaved)
+        {
+          state.put(e.getKey(), entryState);
+        }
+      }
+      return state.isEmpty() ? null : state;
+    }
+
+    public void restoreState(
+      FacesContext facesContext,
+      Object       state)
+    {
+      @SuppressWarnings("unchecked")
+      Map<String, Object[]> savedState = (Map<String, Object[]>) state;
+
+      if (_initialStateMarked)
+      {
+        // In JSF 2 state saving, we only need to super impose the state onto the existing
+        // client behavior list of the current map as the behaviors will already be restored in
+        // the same order that they were in the previous request (if not there is an application
+        // bug).
+        for (Map.Entry<String, Object[]> e : savedState.entrySet())
+        {
+          // Assume that the behaviors were correctly re-attached to the component and we only
+          // need to restore the state onto the objects. The order must be maintained.
+          List<ClientBehavior> behaviors = get(e.getKey());
+          Object[] entryState = e.getValue();
+          for (int i = 0, size = entryState.length; i < size; ++i)
+          {
+            if (entryState[i] != null)
+            {
+              ClientBehavior behavior = behaviors.get(i);
+              if (behavior instanceof StateHolder)
+              {
+                ((StateHolder)behavior).restoreState(facesContext, entryState[i]);
+              }
+            }
+          }
+        }
+      }
+      else
+      {
+        // For JSF <= 1.2 style state saving, we should ensure that we are empty and then
+        // re-hydrate the behaviors directly from the state
+        this.clear();
+
+        for (Map.Entry<String, Object[]> e : savedState.entrySet())
+        {
+          Object[] entryState = e.getValue();
+          // Assume the list is not going to grow in this request, so only allocate the size
+          // of the list from the previous request
+          List<ClientBehavior> list = new ArrayList<ClientBehavior>(entryState.length);
+          for (int i = 0, size = entryState.length; i < size; ++i)
+          {
+            list.add((ClientBehavior)StateUtils.restoreStateHolder(facesContext, entryState[i]));
+          }
+
+          this.put(e.getKey(), list);
+        }
+      }
+    }
+
+    public boolean isTransient()
+    {
+      return _transient;
+    }
+
+    public void setTransient(
+      boolean newTransientValue)
+    {
+      _transient = newTransientValue;
+    }
+
+    private boolean _transient;
+    private boolean _initialStateMarked;
+  }
+
+  private PropertyMap _properties;
+  private PropertyMap _expressions;
+  private BehaviorMap _behaviors;
 
-  static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FacesBeanImpl.class);
+  private transient boolean                           _initialStateMarked;
+  private transient Map<String, List<ClientBehavior>> _behaviorsReadOnly;
 
+  static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(
+                                               FacesBeanImpl.class);
 }

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java Thu Dec 17 02:33:05 2009
@@ -6,9 +6,9 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,6 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
-
 import java.util.Set;
 
 import javax.faces.context.FacesContext;
@@ -32,6 +31,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.bean.PropertyMap;
 
+
 public class FlaggedPropertyMap extends AbstractMap<PropertyKey,Object>
                                 implements PropertyMap
 {
@@ -176,7 +176,6 @@
       map.markInitialState();
   }
 
-
   public void clearInitialState()
   {
     PropertyMap map = getPropertyMap(false);
@@ -187,10 +186,10 @@
   public boolean initialStateMarked()
   {
     PropertyMap map = getPropertyMap(false);
-    
+
     if (map != null)
       return map.initialStateMarked();
-    
+
     // TODO gcrawford - do something better?
     return false;
   }
@@ -213,7 +212,6 @@
     StateUtils.restoreState(this, context, type, state, getUseStateHolder());
   }
 
-
   public boolean getUseStateHolder()
   {
     return _useStateHolder;

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java Thu Dec 17 02:33:05 2009
@@ -6,9 +6,9 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,11 +21,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.bean.PropertyMap;
 
-import javax.faces.context.FacesContext;
 
 public class PropertyHashMap extends HashMap<PropertyKey,Object>
                              implements PropertyMap
@@ -77,7 +78,7 @@
     {
       if (!super.containsKey(key))
         return null;
-      
+
       // If this key is contained, it certainly must be a PropertyKey!
       assert(key instanceof PropertyKey);
       _deltas.put((PropertyKey) key, null);
@@ -118,7 +119,6 @@
     StateUtils.restoreState(this, context, type, state, getUseStateHolder());
   }
 
-
   protected PropertyMap createDeltaPropertyMap()
   {
     PropertyHashMap map = new PropertyHashMap(2);
@@ -126,7 +126,6 @@
     return map;
   }
 
-
   public boolean getUseStateHolder()
   {
     return _useStateHolder;
@@ -137,7 +136,6 @@
     _useStateHolder = useStateHolder;
   }
 
-
   // =-=AEW CLEAR?
 
   public void markInitialState()
@@ -167,7 +165,7 @@
 
       return true;
     }
-    
+
     return false;
   }
 

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java Thu Dec 17 02:33:05 2009
@@ -19,10 +19,13 @@
 package org.apache.myfaces.trinidad.component;
 
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.el.ValueExpression;
 
+import javax.faces.component.behavior.ClientBehavior;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
@@ -96,6 +99,16 @@
     _wrapped.setValueBinding(key, binding);
   }
 
+  public void addClientBehavior(String eventName, ClientBehavior behavior)
+  {
+    _wrapped.addClientBehavior(eventName, behavior);
+  }
+
+  public Map<String, List<ClientBehavior>> getClientBehaviors()
+  {
+    return _wrapped.getClientBehaviors();
+  }
+
   public void addEntry(PropertyKey listKey, Object value)
   {
     _wrapped.addEntry(listKey, value);
@@ -136,7 +149,6 @@
     return _wrapped.bindingKeySet();
   }
 
-
   public Object saveState(FacesContext context)
   {
     return _wrapped.saveState(context);
@@ -156,7 +168,7 @@
   {
     _wrapped.markInitialState();
   }
-  
+
   public boolean initialStateMarked()
   {
     return _wrapped.initialStateMarked();

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java?rev=891522&r1=891521&r2=891522&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java Thu Dec 17 02:33:05 2009
@@ -19,11 +19,13 @@
 package org.apache.myfaces.trinidad.component;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectOutputStream;
 
 import java.net.URL;
+
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +41,8 @@
 import javax.faces.component.ContextCallback;
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
+import javax.faces.component.behavior.ClientBehavior;
+import javax.faces.component.behavior.ClientBehaviorHolder;
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.MethodBinding;
@@ -66,6 +70,7 @@
 import org.apache.myfaces.trinidad.render.LifecycleRenderer;
 import org.apache.myfaces.trinidad.util.ThreadLocalUtils;
 
+
 /**
  * Base implementation of components for all of Trinidad.  UIXComponentBase
  * offers a number of features not supplied by the standard UIComponentBase
@@ -262,8 +267,6 @@
     }
   }
 
-
-
   /**
    */
   @Override
@@ -283,7 +286,6 @@
     return getFacesBean().getValueBinding(key);
   }
 
-
   @Override
   public void setValueBinding(String name, ValueBinding binding)
   {
@@ -294,7 +296,6 @@
     getFacesBean().setValueBinding(key, binding);
   }
 
-
   @Override
   public Map<String, Object> getAttributes()
   {
@@ -306,8 +307,6 @@
 
   // ------------------------------------------------------------- Properties
 
-
-
   @Override
   public String getClientId(FacesContext context)
   {
@@ -355,7 +354,6 @@
     return clientId;
   }
 
-
   /**
    * Gets the identifier for the component.
    */
@@ -365,7 +363,6 @@
     return (String) getProperty(ID_KEY);
   }
 
-
   /**
    * Sets the identifier for the component.  The identifier
    * must follow a subset of the syntax allowed in HTML:
@@ -389,19 +386,15 @@
     setProperty(ID_KEY, id);
   }
 
-
-
   @Override
   abstract public String getFamily();
 
-
   @Override
   public UIComponent getParent()
   {
     return _parent;
   }
 
-
   /**
    * <p>Set the parent <code>UIComponent</code> of this
    * <code>UIComponent</code>.</p>
@@ -441,7 +434,6 @@
     return getBooleanProperty(RENDERED_KEY, true);
   }
 
-
   @Override
   public void setRendered(boolean rendered)
   {
@@ -490,7 +482,6 @@
     setProperty(RENDERER_TYPE_KEY, rendererType);
   }
 
-
   @Override
   public boolean getRendersChildren()
   {
@@ -501,13 +492,8 @@
     return renderer.getRendersChildren();
   }
 
-
-
-
   // ------------------------------------------------ Tree Management Methods
 
-
-
   @Override
   public UIComponent findComponent(String id)
   {
@@ -578,8 +564,6 @@
     }
   }
 
-
-
   /**
    * <p>Create (if necessary) and return a List of the children associated
    * with this component.</p>
@@ -601,7 +585,6 @@
     return getChildren().size();
   }
 
-
   /**
    * <p>Create (if necessary) and return a Map of the facets associated
    * with this component.</p>
@@ -616,7 +599,6 @@
     return _facets;
   }
 
-
   @Override
   public UIComponent getFacet(String facetName)
   {
@@ -627,7 +609,6 @@
     return getFacets().get(facetName);
   }
 
-
   /**
    * Returns an Iterator over the names of all facets.
    * Unlike getFacets().keySet().iterator(), this does
@@ -700,10 +681,8 @@
     }
   }
 
-
   // ------------------------------------------- Lifecycle Processing Methods
 
-
   @Override
   public void decode(FacesContext context)
   {
@@ -1012,17 +991,18 @@
     return getFacesBean().initialStateMarked();
   }
 
-  public Object saveState(FacesContext context)
+  public Object saveState(FacesContext facesContext)
   {
-    return getFacesBean().saveState(context);
+    return getFacesBean().saveState(facesContext);
   }
 
-  public void restoreState(FacesContext context, Object stateObj)
+  public void restoreState(
+    FacesContext facesContext,
+    Object       stateObj)
   {
-    getFacesBean().restoreState(context, stateObj);
+    getFacesBean().restoreState(facesContext, stateObj);
   }
 
-
   @Override
   public String toString()
   {
@@ -1046,7 +1026,6 @@
     return FacesContext.getCurrentInstance();
   }
 
-
   /**
    * Delegates to LifecycleRenderer, if present,
    * otherwise calls decodeChildrenImpl.
@@ -1081,7 +1060,6 @@
     }
   }
 
-
   /**
    * Delegates to LifecycleRenderer, if present,
    * otherwise calls validateChildrenImpl.
@@ -1117,7 +1095,6 @@
     }
   }
 
-
   /**
    * Delegates to LifecycleRenderer, if present,
    * otherwise calls upateChildrenImpl.
@@ -1378,7 +1355,6 @@
     return n.intValue();
   }
 
-
   /**
    * Return the number of facets.  This is more efficient than
    * calling getFacets().size();
@@ -1392,7 +1368,6 @@
     return _facets.size();
   }
 
-
   /**
    * Broadcast an event to a MethodBinding.
    * This can be used to support MethodBindings such as the "actionListener"
@@ -1545,7 +1520,6 @@
     }
   }
 
-
   /**
    * Override to calls the hooks for setting up and tearing down the
    * context before the children are visited.
@@ -1589,7 +1563,82 @@
     }
   }
 
+  // ------------------------- Client behavior holder methods -------------------------
+
+  /**
+   * Utility method to assist sub-classes in the implementation of the
+   * {@link javax.faces.component.behavior.ClientBehaviorHolder} interface.
+   * <p>This method must only
+   * be called by classes that implement the interface, doing otherwise will result in an exception.
+   * </p>
+   * @param eventName The event name
+   * @param behavior The behavior to add
+   * @see javax.faces.component.behavior.ClientBehaviorHolder#addClientBehavior(String, ClientBehavior)
+   */
+  protected void addClientBehavior(
+    String         eventName,
+    ClientBehavior behavior)
+  {
+    // This will throw a class cast exception when illegally called by a class that does not
+    // implement ClientBehaviorHolder
+    Collection<String> events = ((ClientBehaviorHolder)this).getEventNames();
+
+    // This will throw a null pointer exception if the component author did not correctly implement
+    // the ClientBehaviorHolder contract which requires a non-empty collection to be returned from
+    // getEventNames
+    if (!events.contains(eventName))
+    {
+      return;
+    }
+
+    getFacesBean().addClientBehavior(eventName, behavior);
+  }
+
+  // Note, we do not need to provide a default implementation for the event names, as client
+  // behavior holder components must provide a non-empty list of event names. UIComponentBase
+  // decided to return a non-valid null in their code, but that is only confusing to the user, it
+  // is better to not implement the method and force the users to write the method upon interface
+  // implementation.
+  //protected Collection<String> getEventNames() {}
+
+  /**
+   * Utility method to assist sub-classes in the implementation of the
+   * {@link javax.faces.component.behavior.ClientBehaviorHolder} interface.
+   * <p>This method must only
+   * be called by classes that implement the interface, doing otherwise will result in an exception.
+   * </p>
+   * @see javax.faces.component.behavior.ClientBehaviorHolder#getClientBehaviors()
+   * @return Read-only map of the client behaviors for this component
+   */
+  protected Map<String, List<ClientBehavior>> getClientBehaviors()
+  {
+    return getFacesBean().getClientBehaviors();
+  }
+
+  /**
+   * Utility method to assist sub-classes in the implementation of the
+   * {@link javax.faces.component.behavior.ClientBehaviorHolder} interface.
+   * <p>This method must only
+   * be called by classes that implement the interface, doing otherwise will result in an exception.
+   * </p>
+   * @return null
+   * @see javax.faces.component.behavior.ClientBehaviorHolder#getDefaultEventName()
+   */
+  protected String getDefaultEventName()
+  {
+    _ensureClientBehaviorHolder();
+    return null;
+  }
 
+  private void _ensureClientBehaviorHolder()
+  {
+    if (!(this instanceof ClientBehaviorHolder))
+    {
+      throw new IllegalStateException("Component must implement ClientBehaviorHolder in order " +
+        "to make use of this method.");
+    }
+  }
+  // ------------------------- End of the client behavior holder methods -------------------------
 
   /**
    * <p>
@@ -1669,7 +1718,6 @@
     }
   }
 
-
   static private UIComponent _findInsideOf(
     UIComponent from,
     String id)
@@ -1772,7 +1820,6 @@
   private static final Iterator<UIComponent> _EMPTY_UICOMPONENT_ITERATOR =
     new EmptyIterator<UIComponent>();
 
-
   static private final ThreadLocal<StringBuilder> _STRING_BUILDER =
                                                           ThreadLocalUtils.newRequestThreadLocal();
 



Mime
View raw message