You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/10/07 19:35:01 UTC
svn commit: r582656 [1/39] - in /myfaces/trinidad/branches/1.2.3-branch: ./
trinidad-api/
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/
trinidad-api/src/main/jav...
Author: awiner
Date: Sun Oct 7 10:34:29 2007
New Revision: 582656
URL: http://svn.apache.org/viewvc?rev=582656&view=rev
Log:
Merge in 1.2 code, fix conflicts, and verify it builds... branch has not yet been tested
Added:
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodExpressionMethodBinding.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodExpressionMethodBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELContext.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELResolver.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELResolver.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ActionUploadRequestWrapper.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ActionUploadRequestWrapper.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadELResolver.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadELResolver.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueExpressionBoundValue.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueExpressionBoundValue.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MELResolver.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MELResolver.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ValueBindingValueExpression.java
- copied unchanged from r582649, myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ValueBindingValueExpression.java
Removed:
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/site/xdoc/tagdoc/tr_attribute.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/site/xdoc/tagdoc/tr_validator.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/ValueBindingAdapter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ValidatorTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java
Modified:
myfaces/trinidad/branches/1.2.3-branch/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/SetActionListener.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ProcessMenuModel.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ProcessUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/SortableModel.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/site/xdoc/tagdoc/tr_forEach.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/TestValueBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIXInputTest.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-assembly/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-examples/trinidad-example-assembly/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/pom.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/conf/META-INF/tr-base.tld
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/conf/META-INF/trh-base.tld
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/xmlHttp/XmlHttpConfigurator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AccessKeyPropertyTagRule.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/FileDownloadActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/IndentingResponseWriter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/ResponseWriterDecorator.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ItemNode.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/FacetRefTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/UIXCollectionTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/FileDownloadActionListener.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/FileDownloadActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ResetActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalPPC-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimal-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalIE-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalIERtl-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalInacc-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalSaf-golden.xml
myfaces/trinidad/branches/1.2.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/branches/1.2.3-branch/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/pom.xml?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.3-branch/pom.xml Sun Oct 7 10:34:29 2007
@@ -33,9 +33,9 @@
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
<packaging>pom</packaging>
- <name>Apache MyFaces Trinidad</name>
- <version>1.0.3-SNAPSHOT</version>
- <description>Apache MyFaces Trinidad</description>
+ <name>Apache MyFaces Trinidad 1.2</name>
+ <version>1.2.3-SNAPSHOT</version>
+ <description>JSF 1.2 branch of Apache MyFaces Trinidad</description>
<issueManagement>
<system>jira</system>
@@ -174,12 +174,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk/trinidad/
+ scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.1-branch/trinidad/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk/trinidad/
+ scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/branches/1.2.1-branch/trinidad/
</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/trunk/trinidad</url>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/branches/1.2.1-branch/trinidad</url>
</scm>
<build>
@@ -236,8 +236,10 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
+<!--
<showWarnings>true</showWarnings>
- <compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>
+ <compilerArgument>-Xlint:all,-serial,-fallthrough,-deprecation</compilerArgument>
+-->
</configuration>
</plugin>
@@ -404,24 +406,39 @@
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.5</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.5</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
<scope>test</scope>
+
</dependency>
<dependency>
@@ -441,20 +458,20 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-build</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${pom.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -462,7 +479,7 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
@@ -474,6 +491,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -509,7 +533,7 @@
<site>
<id>apache-site</id>
<name>Apache Website</name>
- <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/trinidad</url>
+ <url>scpexe://minotaur.apache.org/www/incubator.apache.org/trinidad-1_2</url>
</site>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
@@ -533,7 +557,6 @@
</snapshotRepository>
-->
</distributionManagement>
-
<profiles>
<profile>
<id>generate-assembly</id>
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/pom.xml?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/pom.xml Sun Oct 7 10:34:29 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -100,6 +100,7 @@
<configuration>
<typePrefix>org.apache</typePrefix>
<packageContains>org.apache</packageContains>
+ <jsfVersion>1.2</jsfVersion>
<!--suppressListenerMethods>true</suppressListenerMethods-->
<force>true</force>
</configuration>
@@ -164,6 +165,13 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
<scope>test</scope>
</dependency>
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -42,7 +44,7 @@
* @param event
* @throws javax.faces.event.AbortProcessingException
*/
- @Override
+ @Override
public void broadcast(FacesEvent event)
throws AbortProcessingException
{
@@ -50,7 +52,7 @@
// Deliver to the default ChartDrillDownEvent
if (event instanceof ChartDrillDownEvent)
{
- broadcastToMethodBinding(event, getChartDrillDownListener());
+ broadcastToMethodExpression(event, getChartDrillDownListener());
}
super.broadcast(event);
}
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,7 +18,10 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.ActionSource;
+import javax.faces.component.ActionSource2;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -37,12 +40,48 @@
* @version $Name: $ ($Revision$) $Date$
*/
abstract public class UIXCommandTemplate extends UIXComponentBase
- implements ActionSource, DialogSource
+ implements ActionSource, ActionSource2, DialogSource
{
/**/ // Abstract methods implemented by code gen
+/**/ abstract public MethodExpression getActionExpression();
+/**/ abstract public MethodExpression setActionExpression();
+/**/ abstract public MethodExpression getLaunchListener();
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
-/**/ abstract public MethodBinding getLaunchListener();
+/**/ abstract public MethodExpression getReturnListener();
+/**/ abstract public MethodExpression getLaunchListener();
+
+ @Deprecated
+ public void setLaunchListener(MethodBinding binding)
+ {
+ setLaunchListener(adaptMethodBinding(binding));
+ }
+
+ @Deprecated
+ public void setReturnListener(MethodBinding binding)
+ {
+ setReturnListener(adaptMethodBinding(binding));
+ }
+
+
+ public MethodBinding getAction()
+ {
+ MethodExpression me = getActionExpression();
+ if (me == null)
+ return null;
+
+ if (me instanceof MethodBindingMethodExpression)
+ return ((MethodBindingMethodExpression) me).getMethodBinding();
+
+ return new MethodExpressionMethodBinding(me);
+ }
+
+ public void setAction(MethodBinding binding)
+ {
+ if (binding instanceof MethodExpressionMethodBinding)
+ setActionExpression(((MethodExpressionMethodBinding) binding).getMethodExpression());
+ else
+ setActionExpression(new MethodBindingMethodExpression(binding));
+ }
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for the
@@ -109,7 +148,7 @@
if (event instanceof LaunchEvent)
{
- broadcastToMethodBinding(event, getLaunchListener());
+ broadcastToMethodExpression(event, getLaunchListener());
boolean useWindow =
Boolean.TRUE.equals(getAttributes().get("useWindow"));
@@ -117,7 +156,7 @@
}
else if (event instanceof ReturnEvent)
{
- broadcastToMethodBinding(event, getReturnListener());
+ broadcastToMethodExpression(event, getReturnListener());
// =-=AEW: always jump to render response??? Seems the safest
// option, because we don't want to immediately update a model
// or really perform any validation.
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.faces.context.FacesContext;
import javax.faces.component.NamingContainer;
/**
@@ -63,9 +64,9 @@
* @return the local clientId
*/
@Override
- protected final String getLocalClientId()
+ public final String getContainerClientId(FacesContext context)
{
- String id = super.getLocalClientId();
+ String id = getClientId(context);
String key = getCurrencyString();
if (key != null)
{
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java Sun Oct 7 10:34:29 2007
@@ -20,6 +20,8 @@
import java.util.Iterator;
+import javax.el.ValueExpression;
+
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
import javax.faces.component.EditableValueHolder;
@@ -28,7 +30,6 @@
import javax.faces.convert.ConverterException;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.ValueChangeEvent;
@@ -113,6 +114,7 @@
// Submitted value == null means "the component was not submitted
// at all"; validation should not continue
+
Object submittedValue = getSubmittedValue();
if (submittedValue == null)
return;
@@ -238,21 +240,21 @@
if (!isValid() || !isLocalValueSet())
return;
- ValueBinding binding = getFacesBean().getValueBinding(VALUE_KEY);
- if (binding == null)
+ ValueExpression expression = getFacesBean().getValueExpression(VALUE_KEY);
+ if (expression == null)
return;
try
{
Object localValue = getLocalValue();
- binding.setValue(context, localValue);
+ expression.setValue(context.getELContext(), localValue);
setValue(null);
setLocalValueSet(false);
if (_LOG.isFiner())
{
_LOG.finer("Wrote value {0} to model {1} in component {2}",
new Object[]{localValue,
- binding.getExpressionString(),
+ expression.getExpressionString(),
this});
}
}
@@ -262,8 +264,8 @@
// bean attribute level validation:
if (_LOG.isFine())
{
- _LOG.fine("Error updating binding ({0})",
- binding.getExpressionString());
+ _LOG.fine("Error updating expression ({0})",
+ expression.getExpressionString());
_LOG.fine(e);
}
@@ -380,7 +382,6 @@
{
newValue = renderer.getConvertedValue(context, this,
submittedValue);
-
if (_LOG.isFine())
{
_LOG.fine("Renderer " + renderer + " returned value " + newValue + "(" +
@@ -465,7 +466,7 @@
{
Object o = getAttributes().get("label");
if (o == null)
- o = getValueBinding("label");
+ o = getValueExpression("label");
return o;
}
@@ -474,7 +475,7 @@
{
Object o = getAttributes().get("requiredMessageDetail");
if (o == null)
- o = getValueBinding("requiredMessageDetail");
+ o = getValueExpression("requiredMessageDetail");
return o;
}
@@ -526,13 +527,13 @@
return converter;
}
- ValueBinding valueBinding = getValueBinding("value");
- if (valueBinding == null)
+ ValueExpression valueExpression = getValueExpression("value");
+ if (valueExpression == null)
{
return null;
}
- Class<?> converterType = valueBinding.getType(context);
+ Class<?> converterType = valueExpression.getType(context.getELContext());
// if converterType is null, String, or Object, assume
// no conversion is needed
if (converterType == null ||
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
@@ -34,7 +36,13 @@
/**/ // Abstract methods implemented by code gen
/**/ abstract public boolean isImmediate();
-/**/ abstract public MethodBinding getPollListener();
+/**/ abstract public MethodExpression getPollListener();
+
+ @Deprecated
+ public void setPollListener(MethodBinding binding)
+ {
+ setPollListener(adaptMethodBinding(binding));
+ }
//
// Abstract methods implemented by subclass.
@@ -47,7 +55,7 @@
// Notify the specified Poll listener method (if any)
if (event instanceof PollEvent)
{
- broadcastToMethodBinding(event, getPollListener());
+ broadcastToMethodExpression(event, getPollListener());
}
}
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,7 +18,10 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
+
import javax.faces.component.ActionSource;
+import javax.faces.component.ActionSource2;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -38,12 +41,40 @@
* @version $Name: $ ($Revision$) $Date$
*/
abstract public class UIXSelectInputTemplate extends UIXEditableValue
- implements ActionSource
+ implements ActionSource, ActionSource2
{
/**/ // Abstract methods implemented by code gen
+/**/ abstract public MethodExpression getActionExpression();
+/**/ abstract public MethodExpression setActionExpression();
/**/ abstract public MethodBinding getActionListener();
-/**/ abstract public MethodBinding getReturnListener();
+/**/ abstract public MethodExpression getReturnListener();
+
+ @Deprecated
+ public void setReturnListener(MethodBinding binding)
+ {
+ setReturnListener(adaptMethodBinding(binding));
+ }
+
+ public MethodBinding getAction()
+ {
+ MethodExpression me = getActionExpression();
+ if (me == null)
+ return null;
+
+ if (me instanceof MethodBindingMethodExpression)
+ return ((MethodBindingMethodExpression) me).getMethodBinding();
+
+ return new MethodExpressionMethodBinding(me);
+ }
+
+ public void setAction(MethodBinding binding)
+ {
+ if (binding instanceof MethodExpressionMethodBinding)
+ setActionExpression(((MethodExpressionMethodBinding) binding).getMethodExpression());
+ else
+ setActionExpression(new MethodBindingMethodExpression(binding));
+ }
/**
* <p>Intercept <code>queueEvent</code> and mark the phaseId for any
@@ -115,7 +146,7 @@
{
super.broadcast(event);
- broadcastToMethodBinding(event, getReturnListener());
+ broadcastToMethodExpression(event, getReturnListener());
Object returnValue = ((ReturnEvent) event).getReturnValue();
if (returnValue != null)
{
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java Sun Oct 7 10:34:29 2007
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidad.component;
import java.io.IOException;
+import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -38,11 +39,17 @@
public abstract class UIXSelectRangeTemplate extends UIXComponentBase
{
/**/ // Abstract methods implemented by code gen
-/**/ abstract public MethodBinding getRangeChangeListener();
+/**/ abstract public MethodExpression getRangeChangeListener();
/**/ abstract public void setFirst(int first);
/**/ abstract public boolean isImmediate();
/**/ abstract public Object getValue();
+ @Deprecated
+ public void setRangeChangeListener(MethodBinding binding)
+ {
+ setRangeChangeListener(adaptMethodBinding(binding));
+ }
+
@Override
public void encodeBegin(FacesContext context) throws IOException
{
@@ -60,7 +67,7 @@
// update first when the event is delivered
setFirst(gtEvent.getNewStart());
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
// Perform standard superclass processing
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java Sun Oct 7 10:34:29 2007
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.trinidad.component;
+import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
@@ -38,7 +39,13 @@
/**/ abstract public boolean isDisclosed();
/**/ abstract public void setDisclosed(boolean setDisclosed);
/**/ abstract public boolean isImmediate();
-/**/ abstract public MethodBinding getDisclosureListener();
+/**/ abstract public MethodExpression getDisclosureListener();
+
+ @Deprecated
+ public void setDisclosureListener(MethodBinding binding)
+ {
+ setDisclosureListener(adaptMethodBinding(binding));
+ }
@Override
public void processDecodes(FacesContext context)
@@ -98,7 +105,7 @@
getFacesContext().renderResponse();
// Notify the specified disclosure listener method (if any)
- broadcastToMethodBinding(event, getDisclosureListener());
+ broadcastToMethodExpression(event, getDisclosureListener());
}
}
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Sun Oct 7 10:34:29 2007
@@ -21,9 +21,10 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import java.util.Set;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -129,7 +130,7 @@
// since the range is now different we can clear the currency cache:
clearCurrencyStringCache();
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
else if (event instanceof RowDisclosureEvent)
{
@@ -137,20 +138,20 @@
RowKeySet set = getDisclosedRowKeys();
set.addAll(eEvent.getAddedSet());
set.removeAll(eEvent.getRemovedSet());
- broadcastToMethodBinding(event, getRowDisclosureListener());
+ broadcastToMethodExpression(event, getRowDisclosureListener());
}
else if (event instanceof SortEvent)
{
SortEvent sEvent = (SortEvent) event;
setSortCriteria(sEvent.getSortCriteria());
- broadcastToMethodBinding(event, getSortListener());
+ broadcastToMethodExpression(event, getSortListener());
}
else if (event instanceof SelectionEvent)
{
//pu: Implicitly record a Change for 'selectionState' attribute
addAttributeChange("selectedRowKeys",
getSelectedRowKeys());
- broadcastToMethodBinding(event, getSelectionListener());
+ broadcastToMethodExpression(event, getSelectionListener());
}
super.broadcast(event);
@@ -165,11 +166,35 @@
/**/ abstract public void setShowAll(boolean showAll);
/**/ abstract public boolean isShowAll();
/**/ abstract public UIComponent getDetailStamp();
-/**/ public abstract MethodBinding getRangeChangeListener();
-/**/ public abstract MethodBinding getSortListener();
-/**/ public abstract MethodBinding getRowDisclosureListener();
-/**/ public abstract MethodBinding getSelectionListener();
+/**/ public abstract MethodExpression getRangeChangeListener();
+/**/ public abstract MethodExpression getSortListener();
+/**/ public abstract MethodExpression getRowDisclosureListener();
+/**/ public abstract MethodExpression getSelectionListener();
/**/ public abstract boolean isImmediate();
+
+ @Deprecated
+ public void setRangeChangeListener(MethodBinding binding)
+ {
+ setRangeChangeListener(adaptMethodBinding(binding));
+ }
+
+ @Deprecated
+ public void setSortListener(MethodBinding binding)
+ {
+ setSortListener(adaptMethodBinding(binding));
+ }
+
+ @Deprecated
+ public void setRowDisclosureListener(MethodBinding binding)
+ {
+ setRowDisclosureListener(adaptMethodBinding(binding));
+ }
+
+ @Deprecated
+ public void setSelectionListener(MethodBinding binding)
+ {
+ setSelectionListener(adaptMethodBinding(binding));
+ }
@Override
@SuppressWarnings("unchecked")
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Sun Oct 7 10:34:29 2007
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -45,7 +47,13 @@
abstract public class UIXTreeTableTemplate extends UIXTree
{
/**/ public abstract int[] getRowsByDepth();
-/**/ abstract public MethodBinding getRangeChangeListener();
+/**/ abstract public MethodExpression getRangeChangeListener();
+
+ @Deprecated
+ public void setRangeChangeListener(MethodBinding binding)
+ {
+ setRangeChangeListener(adaptMethodBinding(binding));
+ }
/**
* Gets the maximum number of rows to show.
@@ -181,7 +189,7 @@
// it is nice to expand the focused item:
getDisclosedRowKeys().add();
- broadcastToMethodBinding(event, getFocusListener());
+ broadcastToMethodExpression(event, getFocusListener());
}
else if (event instanceof RangeChangeEvent)
{
@@ -191,7 +199,7 @@
//=-=pu: This ain't getting restored. Check with Arj or file a bug.
addAttributeChange("first",
Integer.valueOf(rce.getNewStart()));
- broadcastToMethodBinding(event, getRangeChangeListener());
+ broadcastToMethodExpression(event, getRangeChangeListener());
}
// Perform standard superclass processing
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Sun Oct 7 10:34:29 2007
@@ -22,6 +22,8 @@
import java.util.Set;
+import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -45,8 +47,20 @@
/**/ public abstract void setDisclosedRowKeys(RowKeySet keys);
/**/ public abstract RowKeySet getSelectedRowKeys();
/**/ public abstract void setSelectedRowKeys(RowKeySet keys);
-/**/ public abstract MethodBinding getRowDisclosureListener();
+/**/ public abstract MethodExpression getRowDisclosureListener();
/**/ public abstract UIComponent getNodeStamp();
+
+ @Deprecated
+ public void setRowDisclosureListener(MethodBinding binding)
+ {
+ setRowDisclosureListener(adaptMethodBinding(binding));
+ }
+
+ @Deprecated
+ public void setSelectionListener(MethodBinding binding)
+ {
+ setSelectionListener(adaptMethodBinding(binding));
+ }
/**
* Sets the phaseID of UI events depending on the "immediate" property.
@@ -96,7 +110,7 @@
//=-=pu: This ain't getting restored. Check with Arj or file a bug.
addAttributeChange("selectedRowKeys",
getSelectedRowKeys());
- broadcastToMethodBinding(event, getSelectionListener());
+ broadcastToMethodExpression(event, getSelectionListener());
}
HierarchyUtils.__handleBroadcast(this,
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java Sun Oct 7 10:34:29 2007
@@ -24,6 +24,8 @@
import java.util.Map;
import java.util.Set;
+import javax.el.ValueExpression;
+
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -62,19 +64,27 @@
* @exception IllegalArgumentException if key is a list key
*/
public Object getLocalProperty(PropertyKey key);
-
+
+ /**
+ * Return the value expression for a key.
+ * @exception IllegalArgumentException if the property does
+ * not support value bindings.
+ */
+ public ValueExpression getValueExpression(PropertyKey key);
+
/**
* Return the value binding for a key.
* @exception IllegalArgumentException if the property does
* not support value bindings.
+ * @deprecated
*/
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 bindings, the
- * method will look for a binding with the specified key and return it
+ * 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>
@@ -97,21 +107,30 @@
* @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>ValueBinding</code> object if the specified key
- * supports bindings and a binding was specified for that
+ * <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)
*/
public Object getRawProperty(PropertyKey key);
/**
+ * Set the value expression for a key.
+ * @exception IllegalArgumentException if the property does
+ * not support value expressions.
+ */
+ public void setValueExpression(PropertyKey key, ValueExpression expression);
+
+ /**
* Set the value binding for a key.
* @exception IllegalArgumentException if the property does
* not support value bindings.
+ * @deprecated
*/
public void setValueBinding(PropertyKey key, ValueBinding binding);
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java Sun Oct 7 10:34:29 2007
@@ -26,6 +26,8 @@
import java.util.List;
import java.util.Set;
+import javax.el.ValueExpression;
+
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
@@ -61,11 +63,11 @@
// Look for a binding if and only if the key supports bindings
if (key.getSupportsBinding())
{
- ValueBinding binding = getValueBinding(key);
- if (binding != null)
+ ValueExpression expression = getValueExpression(key);
+ if (expression != null)
{
FacesContext context = FacesContext.getCurrentInstance();
- return binding.getValue(context);
+ return expression.getValue(context.getELContext());
}
}
@@ -86,7 +88,7 @@
return local;
// Look for a binding if and only if the key supports bindings
- return key.getSupportsBinding() ? getValueBinding(key) : null;
+ return key.getSupportsBinding() ? getValueExpression(key) : null;
}
@@ -107,18 +109,19 @@
return getLocalPropertyImpl(key);
}
- final public ValueBinding getValueBinding(PropertyKey key)
+ final public ValueExpression getValueExpression(PropertyKey key)
{
_checkNotListKey(key);
- PropertyMap map = _getBindingsMap(false);
+ PropertyMap map = _getExpressionsMap(false);
if (map == null)
return null;
- return (ValueBinding) map.get(key);
+ return (ValueExpression) map.get(key);
}
- final public void setValueBinding(PropertyKey key, ValueBinding binding)
+ final public void setValueExpression(PropertyKey key,
+ ValueExpression expression)
{
_checkNotListKey(key);
@@ -128,18 +131,46 @@
"CANNOT_FIND_PROPERTY", key.getName()));
}
- if (binding == null)
+ if (expression == null)
{
- PropertyMap map = _getBindingsMap(false);
+ PropertyMap map = _getExpressionsMap(false);
if (map != null)
map.remove(key);
}
else
{
- _getBindingsMap(true).put(key, binding);
+ _getExpressionsMap(true).put(key, expression);
}
}
+
+ final public ValueBinding getValueBinding(PropertyKey key)
+ {
+ ValueExpression ve = getValueExpression(key);
+ if (ve == null)
+ return null;
+
+ if (ve instanceof ValueBindingValueExpression)
+ return ((ValueBindingValueExpression) ve).getValueBinding();
+
+ return new ValueExpressionValueBinding(ve);
+ }
+
+ final public void setValueBinding(PropertyKey key, ValueBinding binding)
+ {
+ ValueExpression ve;
+
+ if (binding == null)
+ {
+ ve = null;
+ }
+ else
+ {
+ ve = new ValueBindingValueExpression(binding);
+ }
+
+ setValueExpression(key, ve);
+ }
@SuppressWarnings("unchecked")
@@ -280,10 +311,10 @@
@SuppressWarnings("unchecked")
final public Set<PropertyKey> bindingKeySet()
{
- if (_bindings == null)
+ if (_expressions == null)
return Collections.emptySet();
- return _bindings.keySet();
+ return _expressions.keySet();
}
@@ -294,8 +325,8 @@
if (_properties != null)
_properties.markInitialState();
- if (_bindings != null)
- _bindings.markInitialState();
+ if (_expressions != null)
+ _expressions.markInitialState();
}
public void restoreState(FacesContext context, Object state)
@@ -313,7 +344,7 @@
Object propertyState = asArray[0];
Object bindingsState = asArray[1];
_getPropertyMap().restoreState(context, getType(), propertyState);
- _getBindingsMap(true).restoreState(context, getType(), bindingsState);
+ _getExpressionsMap(true).restoreState(context, getType(), bindingsState);
return;
}
else if (asArray.length == 1)
@@ -338,9 +369,9 @@
Object propertyState = (_properties == null)
? null
: _properties.saveState(context);
- Object bindingsState = (_bindings == null)
+ Object bindingsState = (_expressions == null)
? null
- : _bindings.saveState(context);
+ : _expressions.saveState(context);
if (bindingsState != null)
{
@@ -389,11 +420,9 @@
return new FlaggedPropertyMap();
}
- protected PropertyMap createBindingsMap()
+ protected PropertyMap createExpressionsMap()
{
- FlaggedPropertyMap bindings = new FlaggedPropertyMap();
- bindings.setUseStateHolder(true);
- return bindings;
+ return new FlaggedPropertyMap();
}
// "listKey" is unused, but it seems plausible that
@@ -444,17 +473,17 @@
return _properties;
}
- private PropertyMap _getBindingsMap(boolean createIfNew)
+ private PropertyMap _getExpressionsMap(boolean createIfNew)
{
- if (_bindings == null)
+ if (_expressions == null)
{
if (createIfNew)
{
- _bindings = createBindingsMap();
+ _expressions = createExpressionsMap();
}
}
- return _bindings;
+ return _expressions;
}
@@ -475,7 +504,7 @@
}
private PropertyMap _properties;
- private PropertyMap _bindings;
+ private PropertyMap _expressions;
private transient boolean _initialStateMarked;
static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FacesBeanImpl.class);
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java Sun Oct 7 10:34:29 2007
@@ -20,7 +20,7 @@
import javax.faces.component.ActionSource;
-import javax.faces.el.MethodBinding;
+import javax.el.MethodExpression;
import org.apache.myfaces.trinidad.event.LaunchListener;
import org.apache.myfaces.trinidad.event.ReturnListener;
@@ -37,12 +37,12 @@
public void addReturnListener(ReturnListener listener);
public void removeReturnListener(ReturnListener listener);
public ReturnListener[] getReturnListeners();
- public void setReturnListener(MethodBinding returnListener);
- public MethodBinding getReturnListener();
+ public void setReturnListener(MethodExpression returnListener);
+ public MethodExpression getReturnListener();
public void addLaunchListener(LaunchListener listener);
public void removeLaunchListener(LaunchListener listener);
public LaunchListener[] getLaunchListeners();
- public void setLaunchListener(MethodBinding launchListener);
- public MethodBinding getLaunchListener();
+ public void setLaunchListener(MethodExpression launchListener);
+ public MethodExpression getLaunchListener();
}
Modified: myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java?rev=582656&r1=582655&r2=582656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java (original)
+++ myfaces/trinidad/branches/1.2.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java Sun Oct 7 10:34:29 2007
@@ -20,9 +20,9 @@
import java.util.ArrayList;
import java.util.List;
+import javax.el.MethodExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
@@ -38,10 +38,10 @@
UIXHierarchy comp,
FacesEvent event,
RowKeySet state,
- MethodBinding disclosureListener) throws AbortProcessingException
+ MethodExpression method) throws AbortProcessingException
{
- // Notify the specified disclosure listener method (if any)
+ // Notify the specified disclosure listener method (if any)
if (event instanceof RowDisclosureEvent)
{
RowDisclosureEvent dEvent = (RowDisclosureEvent) event;
@@ -71,7 +71,7 @@
}
//pu: Implicitly record a Change for 'disclosedRowKeys' attribute
comp.addAttributeChange("disclosedRowKeys", state);
- comp.broadcastToMethodBinding(event, disclosureListener);
+ comp.broadcastToMethodExpression(event, method);
}
}