You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/01/05 12:50:30 UTC
svn commit: r896009 [1/30] - in /myfaces/trinidad/branches/2.0.1-branch: ./
src/site/xdoc/devguide/ trinidad-api/
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ t...
Author: matzew
Date: Tue Jan 5 11:48:54 2010
New Revision: 896009
URL: http://svn.apache.org/viewvc?rev=896009&view=rev
Log:
some merge...
Added:
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/InvokeFunctionBehavior.java
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/InvokeFunctionBehavior.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/InvokeFunctionBehaviorRenderer.java
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/behaviors/render/InvokeFunctionBehaviorRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/tr-demo.taglib.xml
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/tr-demo.taglib.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/demos/clientBehaviorHolder.xhtml
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/clientBehaviorHolder.xhtml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/
- copied from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/mutableAttributes.jspx
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/mutableAttributes.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/partialAddComponent.jspx
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/partialAddComponent.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/partialStateSaving.jspx
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/partialStateSaving.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/setupStateSaving.jspx
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/test/stateSaving/setupStateSaving.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java
- copied unchanged from r895949, myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java
Removed:
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadFaceletViewHandler.java
Modified:
myfaces/trinidad/branches/2.0.1-branch/ (props changed)
myfaces/trinidad/branches/2.0.1-branch/pom.xml
myfaces/trinidad/branches/2.0.1-branch/src/site/xdoc/devguide/configuration.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/PropertyMap.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/FlaggedPropertyMap.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyArrayMap.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/PropertyHashMap.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacesBeanWrapper.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/FindComponentTest.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/FindRelativeComponentTest.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-assembly/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreBreadCrumbs.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandButton.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandLink.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreCommandNavigationItem.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreDocument.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreForm.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoButton.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImage.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessages.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputDocument.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputFormatted.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputLabel.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreOutputText.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePage.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBorderLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelBox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelCaptionGroup.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelList.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPageHeader.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelRadio.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTip.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProcessChoiceBar.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreResetButton.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanCheckbox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/ (props changed)
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-demo/src/main/webapp/demos/demos.jspx
myfaces/trinidad/branches/2.0.1-branch/trinidad-examples/trinidad-example-assembly/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/conf/META-INF/tr-base.tld
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/conf/META-INF/trh-base.tld
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AccessKeyPropertyTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/DatePropertyTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/FileDownloadActionListenerTag.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LocalePropertyTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ResetActionListenerTag.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadConverterHandler.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadValidatorHandler.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ValueExpressionTagRule.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/ResponseWriterDecorator.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PanelButtonBarRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaCommandLinkRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaMessageBoxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaNavigationPaneRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/XmlResponseWriter.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImportScriptRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputNumberSpinboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelAccordionRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBorderLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelButtonBarRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelCaptionGroupRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanCheckboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanRadioRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyCheckboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyListboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneChoiceRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneListboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneRadioRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOrderShuttleRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SingleStepButtonBarRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/PartialTriggersTest.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimal-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIE-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIERtl-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalInacc-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalSaf-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalScrRdr-golden.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-partial-lifecycle/pom.xml
myfaces/trinidad/branches/2.0.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/2.0.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/2.0.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 11:48:54 2010
@@ -2,5 +2,7 @@
/myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
/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:819601,819622,834147,886881,893043
+/myfaces/trinidad/branches/trinidad-2.0.x:823098-895949
+/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043
Modified: myfaces/trinidad/branches/2.0.1-branch/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.1-branch/pom.xml?rev=896009&r1=896008&r2=896009&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.1-branch/pom.xml (original)
+++ myfaces/trinidad/branches/2.0.1-branch/pom.xml Tue Jan 5 11:48:54 2010
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>Apache MyFaces Trinidad 1.2</name>
- <description>Apache MyFaces Trinidad for JSF 1.2</description>
+ <name>Apache MyFaces Trinidad 2.0</name>
+ <description>Apache MyFaces Trinidad for JSF 2.0</description>
<url>http://myfaces.apache.org/trinidad/trinidad-1_2</url>
<inceptionYear>2001</inceptionYear>
@@ -33,20 +33,22 @@
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>1.2.12.2-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<!-- Standards -->
- <jdk.version>1.5</jdk.version>
+ <jdk.version>1.6</jdk.version>
<servlet.version>2.5</servlet.version>
<portlet.version>2.0</portlet.version>
+ <validation.version>1.0.0.GA</validation.version>
<jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version>
- <jsf-spec.version>1.2</jsf-spec.version>
- <jsf-ri.version>1.2_09</jsf-ri.version>
- <jsf-myfaces.version>1.2.4</jsf-myfaces.version>
- <jsf-facelets.version>1.1.14</jsf-facelets.version>
+ <jsf-spec.version>2.0</jsf-spec.version>
+ <jsf-ri.version>2.0.1</jsf-ri.version>
+ <!--jsf-ri.version>2.0.0-b22</jsf-ri.version-->
+ <!--jsf-myfaces.version>1.2.4</jsf-myfaces.version>
+ <jsf-facelets.version>1.1.14</jsf-facelets.version-->
<portlet-bridge.version>1.0.0-beta</portlet-bridge.version>
<commons-lang.version>2.4</commons-lang.version>
<pluto-embedded.version>1.0.1</pluto-embedded.version>
@@ -57,9 +59,9 @@
<junit.version>4.4</junit.version>
<!-- Plugins -->
- <trinidad-plugins.version>1.2.11</trinidad-plugins.version>
+ <trinidad-plugins.version>2.0.0</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>
@@ -136,9 +138,9 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.2.12</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.2.12</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/tags/trinidad-1.2.12</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/trunk/</url>
</scm>
<repositories>
@@ -153,6 +155,13 @@
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
</repository>
+ <!-- needed for Bean Validation API -->
+ <repository>
+ <id>jboss releases</id>
+ <name>JBoss Releases</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <layout>default</layout>
+ </repository>
</repositories>
<pluginRepositories>
@@ -208,20 +217,28 @@
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${jsf-ri.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>${jsf-ri.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+<!-- for now we just use the RI, b/c nothing around for MyFaces 2.0 -->
+ <!--dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${jsf-myfaces.version}</version>
@@ -233,7 +250,7 @@
<artifactId>myfaces-impl</artifactId>
<version>${jsf-myfaces.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
@@ -250,12 +267,12 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>${jsf-facelets.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>commons-lang</groupId>
@@ -721,7 +738,7 @@
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${jsf-myfaces.version}</version>
@@ -733,7 +750,7 @@
<artifactId>myfaces-impl</artifactId>
<version>${jsf-myfaces.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
</dependencies>
</dependencyManagement>
</profile>
@@ -807,6 +824,5 @@
</profiles>
</settings>
-->
-
</profiles>
</project>
Modified: myfaces/trinidad/branches/2.0.1-branch/src/site/xdoc/devguide/configuration.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.1-branch/src/site/xdoc/devguide/configuration.xml?rev=896009&r1=896008&r2=896009&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.1-branch/src/site/xdoc/devguide/configuration.xml (original)
+++ myfaces/trinidad/branches/2.0.1-branch/src/site/xdoc/devguide/configuration.xml Tue Jan 5 11:48:54 2010
@@ -413,32 +413,25 @@
</ul>
</p>
</subsection>
-<subsection name="org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE">
-<p>
-This configuration option enables an optimized strategy for caching some
-view state at an application level, which significantly improves
-scalability. However, it makes it harder to develop (updates to
-pages will not be noticed until the server is restarted), and in
-some rare cases cannot be used for some pages. See below for
-more information about this option. The default is false.
-</p>
-</subsection>
<subsection name="org.apache.myfaces.trinidad.DEBUG_JAVASCRIPT">
<p>
-Apache Trinidad by default obfuscates the Javascript it delivers
-to the client, as well as stripping comments and whitespace.
-This dramatically reduces the size of our Javascript download,
-but also makes it tricky to debug the Javascript. This
-flag can be set to true to turn off the obfuscation.
+For applications that run in ProjectStage.Production, Apache Trinidad by default
+obfuscates the Javascript it delivers to the client, as well as stripping
+comments and whitespace. This dramatically reduces the size of our Javascript
+download, but also makes it tricky to debug the Javascript. In other stages the
+default value is TRUE. However, a user can override the ProjectStage behavior
+by using this flag.
</p>
</subsection>
<subsection name="org.apache.myfaces.trinidad.DISABLE_CONTENT_COMPRESSION">
<p>
-Apache Trinidad by default compresses the style class names inside the css that
-is generated on the server. However, when developing custom Trinidad skins, it
-is much easier to work with the non-compressed style class names, which much more
-directly relate to those used in the skin css file. This flag can be set to turn
-off automatic compression of style class names.
+For applications that run in ProjectStage.Production, Apache Trinidad by default
+compresses the style class names inside the css that is generated on the server.
+However, when developing custom Trinidad skins, it is much easier to work with
+the non-compressed style class names, which much more directly relate to those
+used in the skin css file. There for in all other stages (like Development) the
+compression is turned off. However, a user can override the ProjectStage
+behavior by using this flag.
</p>
</subsection>
<subsection name="org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION">
@@ -447,7 +440,9 @@
check the modification date of your JSPs and skinning CSS files, and discard saved
state when they change; this makes development easier,
but adds overhead that should be avoided when your application
-is deployed.
+is deployed. For applications that run in ProjectStage.Production, the value is
+"false" and all other stages use "true" as their default value. However, a user
+can override the ProjectStage behavior by using this flag.
</p>
</subsection>
<subsection name="org.apache.myfaces.trinidad.ENABLE_LIGHTWEIGHT_DIALOGS">
@@ -497,140 +492,6 @@
memory, so memory-limited servers may in some cases benefit from using
"all" client-side state saving.</p>
-<subsection name="The Application View Cache">
-<p>
- <font color="#FF0000">
- <strong>
-This feature is NOT supported.
- </strong>
-See <a href="https://issues.apache.org/jira/browse/TRINIDAD-1487" style="color:red">TRINIDAD-1487</a> for more.
- </font>
-</p>
-<p>
-Apache Trinidad supports a special Application View Cache feature
-that can increase scalability significantly. However, it
-can, in some unusual cases, break an otherwise functioning
-application, so it is important to understand how it works
-to understand whether it can be enabled for your pages.
-</p>
-<p>
-In conventional JSF state saving, a page's UI state is saved
-the same way every time it is used. It doesn't matter if
-state is being saved for an initial render of a page, or if
-state is being saved after a user has posted back to that page.
-No two postbacks are necessarily the same - the user may
-have entered entirely different data, navigated to
-a different set of rows in the table, etc. So, it is extremely
-difficult to share state among postback requests.</p>
-
-<p>However, most of the time, all initial renders of any
-one page have exactly the same view state. It doesn't matter
-if the page is showing different data, or responding to
-different query parameters, and so forth, because in JSF
-those are conventionally accessed using the JSF expression
-language (EL). In JSF, what state saving remembers isn't the
-result of evaluating an EL expression - it's the EL expression
-itself. So, when you see:
-<source><![CDATA[
- <tr:outputText value="#{mybean.value}"/>
-]]>
-</source>
-... all that's being saved is "#{mybean.value}", and that state is
-the same no matter what that expression evaluates to.
-</p>
-<p>
-The Application View Cache takes advantage of this, and caches
-the state for these initial renders at an application scope.
-Once the page has been viewed once, all users can reuse that
-same state coming and going, saving some CPU (the CPU cost
-of saving the state each time) and more importantly the
-memory overhead of keeping separate copies for each user.
-State saving for postback is still separated per user,
-but keep in mind that if the result of a postback is
-that you navigate to a new page, the Application View
-Cache is still in effect - it is only disabled when a postback
-remains on a page (for example, because of a validation
-failure).
-</p>
-<p>
-Perhaps even more importantly, the Application View Cache enables
-the use of web Proxy Caches in front of
-your application server. Token-based client-side state saving
-defeats web proxy caches, because each user may have a different
-token for any one page, defeating cacheability. The Application
-View Cache uses the same token across all users.
-</p>
-<p>All this should raise the question of why anyone would ever
-not use the Application View Cache. First, the technology
-currently does not invalidate itself if the page is modified;
-it requires a server restart. This makes it difficult to use
-during development. Beyond this, however, there are some
-JSF coding techniques that break the core assumption of
-the Application View Cache - the assumption that the initial
-view state of any one page is always the same, no matter who
-views it:
-<ol>
-<li>Conditional tags that may not evaluate identically for each user</li>
-<li>JSF components that pull EL results into page state</li>
-</ol>
-</p>
-<p>
-The following JSP includes two potential examples of the first problem:
-<source><![CDATA[
- <c:if test="${user.locale.language='en'}">
- <h:outputText value="You're in an English locale"/>
- </c:if>
-
- <tr:selectOneListbox value="#{someValue}">
- <tr:forEach var="item" items="#{model.listOfItems}">
- <tr:selectItem value="#{item.value}" text="#{item.text}"/>
- </tr:forEach>
- </tr:selectOneListbox>
-]]>
-</source>
-The <c:if> will show "You're in an English locale" if the locale's
-language is English. This means that in English, a user's version of
-the page will have an extra component over users who aren't
-using English; the state will vary accordingly. This sort of
-problem can cleanly be resolved by using "rendered" instead of <c:if>,
-which is always a recommended JSF best-practice:
-<source><![CDATA[
- <h:outputText value="You're in an English locale"
- rendered="#{user.locale.language == 'en'}"/>
-]]>
-</source>
-The example using <tr:forEach> is less clear-cut, and
-less easily resolved. If "model.listOfItems" always has the
-same <em>number</em> of items when a page gets shown at first,
-then there are no issues with this particular code sample. But
-if the number of items does vary from one user to another,
-then the page, as written, cannot support the Application View Cache.
-In this particular case, there's also a simple workaround:
-<source><![CDATA[
- <tr:selectOneListbox value="#{someValue}">
- <f:selectItems value="#{model.listOfSelectItems}"/>
- </tr:selectOneListbox>
-]]>
-</source>
-</p>
-<p>
-In addition to problems with non-JSF tags that manipulate the
-page, you can run into problems with some JSF tags that
-directly manipulate page state. A particular example of this
-is the MyFaces <x:save_state> tag. This tag will
-evaluate an EL expression and save it directly as part
-of the page's view state. This is very nice functionality,
-but it does directly and necessarily conflict with the
-technique of the Application View Cache.
-</p>
-
-
-<p>At the moment, the Application View Cache can only
-be enabled or disabled globally. We are considering
-adding support for disabling (or enabling) the view cache
-on a page-by-page basis.</p>
-
-</subsection>
</section>
<section name="RequestContext">
Modified: myfaces/trinidad/branches/2.0.1-branch/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.1-branch/trinidad-api/pom.xml?rev=896009&r1=896008&r2=896009&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.1-branch/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/2.0.1-branch/trinidad-api/pom.xml Tue Jan 5 11:48:54 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>1.2.12.2-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>trinidad-api</artifactId>
@@ -56,14 +56,26 @@
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
<artifactId>portlet-bridge-api</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <scope>provided</scope> <!-- force provided scope here -->
+ <scope>provided</scope>
+ </dependency-->
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- "test" scope dependencies -->
Modified: myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java?rev=896009&r1=896008&r2=896009&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java (original)
+++ myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java Tue Jan 5 11:48:54 2010
@@ -22,9 +22,13 @@
import javax.el.ValueExpression;
+import javax.faces.FacesException;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
@@ -32,14 +36,19 @@
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PostValidateEvent;
+import javax.faces.event.PreValidateEvent;
import javax.faces.event.ValueChangeEvent;
import javax.faces.render.Renderer;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
+import javax.validation.Validation;
+import javax.validation.ValidationException;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidad.util.MessageFactory;
import org.apache.myfaces.trinidad.util.LabeledFacesMessage;
@@ -62,8 +71,10 @@
"org.apache.myfaces.trinidad.UIXEditableValue.REQUIRED";
static public final String CONVERSION_MESSAGE_ID =
"org.apache.myfaces.trinidad.UIXEditableValue.CONVERSION";
-
-
+ static public final String TRINIDAD_BEAN_VALIDATION_AVAILABLE =
+ "org.apache.myfaces.trinidad.UIXEditableValue.BEAN_VALIDATION_AVAILABLE";
+ static public final String VALIDATE_EMPTY_FIELDS_PARAM_NAME =
+ "org.apache.myfaces.trinidad.UIXEditableValue.VALIDATE_EMPTY_FIELDS";
/**
* Convenience method to reset this component's value to an
@@ -284,18 +295,17 @@
if (!isValid())
return;
- // If our value is empty, only check the required property
- if (isEmpty(newValue))
+ // If our value is empty, check the required property
+ boolean isEmpty = isEmpty(newValue);
+ if (isEmpty && isRequired())
{
- if (isRequired())
- {
- FacesMessage message = _getRequiredFacesMessage(context);
- context.addMessage(getClientId(context), message);
- setValid(false);
- }
+ FacesMessage message = _getRequiredFacesMessage(context);
+ context.addMessage(getClientId(context), message);
+ setValid(false);
}
- // If our value is not empty, call all validators
- else
+
+ // If our value is not empty, OR we should do empty field validation, call all validators
+ if (!isEmpty || _shouldValidateEmptyFields(context))
{
Iterator<Validator> validators = (Iterator<Validator>)getFacesBean().entries(VALIDATORS_KEY);
while (validators.hasNext())
@@ -453,12 +463,110 @@
(((String) value).trim().length() == 0));
}
+ /**
+ * Checks if the <code>validateValue()</code> should handle
+ * empty field validation (part of BeanValidation and JSF 2.0).
+ *
+ * @return a (cached) boolean to identify empty field validation
+ */
+ private boolean _shouldValidateEmptyFields(FacesContext context)
+ {
+ ExternalContext ec = context.getExternalContext();
+ Boolean shouldValidateEmptyFields = (Boolean)ec.getApplicationMap().get(VALIDATE_EMPTY_FIELDS_PARAM_NAME);
+
+ if (shouldValidateEmptyFields == null)
+ {
+ // From the JSF 2.0 specification:
+ // The implementation must obtain the init parameter Map from the ExternalContext and inspect the value
+ // for the key given by the value of the symbolic constant VALIDATE_EMPTY_FIELDS_PARAM_NAME.
+ String param = ec.getInitParameter(UIInput.VALIDATE_EMPTY_FIELDS_PARAM_NAME);
+
+ // If there is no value under that key, use the same key and look in the
+ // application map from the ExternalContext.
+ if (param == null)
+ {
+ param = (String) ec.getApplicationMap().get(UIInput.VALIDATE_EMPTY_FIELDS_PARAM_NAME);
+ }
+
+ // null means the same as auto (see SPEC on page 11-5)
+ if (param == null)
+ {
+ param = "auto";
+ }
+ else
+ {
+ // The environment variables are case insensitive...
+ param = param.toLowerCase();
+ }
+
+ if (param.equals("auto") && _isBeanValidationAvailable(context))
+ {
+ shouldValidateEmptyFields = Boolean.TRUE;
+ }
+ else
+ {
+ shouldValidateEmptyFields = Boolean.valueOf(param);
+ }
+
+ ec.getApplicationMap().put(VALIDATE_EMPTY_FIELDS_PARAM_NAME, shouldValidateEmptyFields);
+ }
+
+ return shouldValidateEmptyFields;
+ }
+
+ /**
+ * This boolean indicates if Bean Validation is present.
+ *
+ * @return a (cached) boolean to identify if bean validation is present
+ */
+ private boolean _isBeanValidationAvailable(FacesContext context)
+ {
+ ExternalContext ec = context.getExternalContext();
+ Boolean couldLoadBeanValidationAPI = (Boolean) ec.getApplicationMap().get(TRINIDAD_BEAN_VALIDATION_AVAILABLE);
+
+ if (couldLoadBeanValidationAPI == null)
+ {
+ try
+ {
+ couldLoadBeanValidationAPI = Boolean.valueOf(ClassLoaderUtils.loadClass("javax.validation.Validation") != null);
+
+ if (couldLoadBeanValidationAPI)
+ {
+ try
+ {
+ // Trial-error approach to check for Bean Validation impl existence.
+ Validation.buildDefaultValidatorFactory().getValidator();
+ }
+ catch (ValidationException ve)
+ {
+ // SPEC section 3.5.6.2:
+ // TODO do a i18n version of the error msg
+ throw new FacesException("A ValidatorFactory can not be retrieved", ve);
+ }
+ }
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ // SPEC section 3.5.6.2:
+ // if a Bean Validation provider is not present, bean validation is disabled
+ // TODO need a better warning here, which has more information
+ _LOG.warning(cnfe);
+ couldLoadBeanValidationAPI = Boolean.FALSE;
+ }
+
+ ec.getApplicationMap().put(TRINIDAD_BEAN_VALIDATION_AVAILABLE, couldLoadBeanValidationAPI);
+ }
+
+ return couldLoadBeanValidationAPI;
+ }
/**
* Executes validation logic.
*/
private void _executeValidate(FacesContext context)
{
+ Application application = context.getApplication();
+ application.publishEvent(context, PreValidateEvent.class, UIComponent.class, this);
try
{
validate(context);
@@ -468,6 +576,10 @@
context.renderResponse();
throw e;
}
+ finally
+ {
+ application.publishEvent(context, PostValidateEvent.class, UIComponent.class, this);
+ }
if (!isValid())
{
Modified: myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java?rev=896009&r1=896008&r2=896009&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java (original)
+++ myfaces/trinidad/branches/2.0.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java Tue Jan 5 11:48:54 2010
@@ -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><f:loadBundle/><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><f:loadBundle/><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.
@@ -198,9 +216,22 @@
*/
public Set<PropertyKey> bindingKeySet();
+ /**
+ * use a delta tracking state going forward
+ */
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();
+
+ /**
* Saves the state of a FacesBean.
*/
public Object saveState(FacesContext context);
@@ -257,7 +288,7 @@
{
if ((index < 0) || (index >= _keyList.size()))
return null;
-
+
return _keyList.get(index);
}
@@ -330,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.
@@ -345,7 +376,7 @@
* or the key already exists.
*/
public PropertyKey registerKey(
- String name,
+ String name,
Class<?> type,
Object defaultValue,
int capabilities)
@@ -361,8 +392,8 @@
addKey(key);
return key;
}
-
-
+
+
/**
* Locks the type object, preventing further changes.
*/
@@ -394,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()
{
@@ -441,7 +472,7 @@
protected void addKey(PropertyKey key)
{
_checkLocked();
-
+
// Restore the old key
PropertyKey oldValue = _keyMap.put(key.getName(), key);
if (oldValue != null)
@@ -450,7 +481,7 @@
throw new IllegalStateException(_LOG.getMessage(
"NAME_ALREADY_REGISTERED", key.getName()));
}
-
+
int index = key.getIndex();
if (index >= 0)
{
@@ -463,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);
@@ -501,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);
}
}