You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/11/01 02:03:04 UTC
svn commit: r469750 [1/43] - in
/incubator/adffaces/branches/faces-1_2-061031: plugins/maven-faces-plugin/
plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
plugins/maven-faces-plugin/src/main/java/org/apache/myfac...
Author: awiner
Date: Tue Oct 31 18:02:55 2006
New Revision: 469750
URL: http://svn.apache.org/viewvc?view=rev&rev=469750
Log:
Merge back in JSF 1.2 code
Added:
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodExpressionMethodBinding.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodExpressionMethodBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELContext.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELContext.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELResolver.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockELResolver.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/demos/testPageFlowScope.jspx
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-demo/src/main/webapp/demos/testPageFlowScope.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueExpressionBoundValue.java
- copied unchanged from r469743, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueExpressionBoundValue.java
Removed:
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/site/xdoc/tagdoc/tr_attribute.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/site/xdoc/tagdoc/tr_validator.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/ValueBindingAdapter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ValidatorTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java
Modified:
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/pom.xml
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/pom.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/pom.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXChartTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBean.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/DialogSource.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ProcessMenuModel.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ProcessUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/site/xdoc/tagdoc/tr_forEach.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/FacesBeanImplTest.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/bean/TestValueBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/AttributeChangeTester.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/UIComponentTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/DateTimeConverterTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/pom.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Command.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ComponentBase.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/pom.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/pom.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/ResponseWriterDecorator.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/FacetRefTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ResetActionListenerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelRadio-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalPPC-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimal-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalIE-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalIERtl-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalInacc-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalSaf-golden.xml
incubator/adffaces/branches/faces-1_2-061031/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml
Modified: incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/pom.xml?view=diff&rev=469750&r1=469749&r2=469750
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/pom.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/pom.xml Tue Oct 31 18:02:55 2006
@@ -9,7 +9,7 @@
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>incubator-1.2-m1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Faces Plugin</name>
Modified: incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java?view=diff&rev=469750&r1=469749&r2=469750
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java (original)
+++ incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java Tue Oct 31 18:02:55 2006
@@ -159,7 +159,12 @@
Result mergedResult = new StreamResult(resultStream);
- URL xslURL = getClass().getResource("resources/transform.xsl");
+ URL xslURL;
+ if (_is12())
+ xslURL = getClass().getResource("resources/transform12.xsl");
+ else
+ xslURL = getClass().getResource("resources/transform.xsl");
+
InputStream xsl = xslURL.openStream();
StreamSource xslSource = new StreamSource(xsl);
Transformer transformer = transFactory.newTransformer(xslSource);
@@ -217,6 +222,12 @@
}
}
+ private boolean _is12()
+ {
+ return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
+ }
+
+
/**
* @parameter expression="${project}"
* @readonly
@@ -239,6 +250,7 @@
*/
private String packageContains = "";
+
/**
* @parameter expression="${project.build.directory}/maven-faces-plugin/main/resources"
* @required
@@ -268,4 +280,9 @@
* @parameter
*/
private String transformStylesheet;
+
+ /**
+ * @parameter
+ */
+ private String jsfVersion;
}