You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/02/13 14:29:15 UTC
svn commit: r1445588 - in /myfaces/tobago/trunk: ./ tobago-assembly/
tobago-core/ tobago-core/src/main/java/org/apache/myfaces/tobago/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/compat/
tobago-core/src/main/java/org/apache/myfaces/...
Author: lofwyr
Date: Wed Feb 13 13:29:12 2013
New Revision: 1445588
URL: http://svn.apache.org/r1445588
Log:
TOBAGO-1221: Remove JSF 1.1 and JDK 1.4 support
- removing MethodBinding stuff
- remove the tobago-jsf-compat module (no longer needed, because it was created for JSF 1.1/1.2 differences)
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/InvokeOnComponent.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/InvokeOnComponent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
- copied, changed from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
- copied unchanged from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
Removed:
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/InvokeOnComponent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest2.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource2.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/util/FindComponentUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Feb 13 13:29:12 2013
@@ -1005,7 +1005,6 @@
<modules>
<module>tobago-tool</module>
- <module>tobago-jsf-compat</module>
<module>tobago-core</module>
<module>tobago-theme</module>
<module>tobago-extension</module>
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Wed Feb 13 13:29:12 2013
@@ -145,12 +145,6 @@
<version>${project.version}</version>
<classifier>javadoc</classifier>
</artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-jsf-compat</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/javadoc
</outputDirectory>
@@ -270,12 +264,6 @@
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
- <artifactId>tobago-jsf-compat</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
<artifactId>tobago-deprecation</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Wed Feb 13 13:29:12 2013
@@ -188,11 +188,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-jsf-compat</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
@@ -204,6 +199,12 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>maven-taglib</groupId>
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java Wed Feb 13 13:29:12 2013
@@ -27,17 +27,17 @@ package org.apache.myfaces.tobago.applic
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.el.MethodExpression;
+import javax.faces.FacesException;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
import javax.faces.application.NavigationHandler;
-import javax.faces.component.ActionSource;
+import javax.faces.component.ActionSource2;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
-import javax.faces.FacesException;
public class ActionListenerImpl implements ActionListener {
@@ -71,13 +71,13 @@ public class ActionListenerImpl implemen
facesContext.addMessage(null, facesMessage);
}
UIComponent source = event.getComponent();
- ActionSource actionSource = (ActionSource) source;
+ ActionSource2 actionSource = (ActionSource2) source;
Application application = facesContext.getApplication();
- MethodBinding binding = actionSource.getAction();
+ MethodExpression expression = actionSource.getActionExpression();
// Retrieve the NavigationHandler instance..
NavigationHandler navHandler = application.getNavigationHandler();
// Invoke nav handling..
- String navBinding = (null != binding) ? binding.getExpressionString() : null;
+ String navBinding = (null != expression) ? expression.getExpressionString() : null;
navHandler.handleNavigation(facesContext, navBinding, errorOutcome);
// Trigger a switch to Render Response if needed
facesContext.renderResponse();
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java Wed Feb 13 13:29:12 2013
@@ -27,7 +27,10 @@ import javax.faces.el.ValueBinding;
import javax.faces.webapp.UIComponentTag;
import java.util.Locale;
-@SuppressWarnings("deprecation")
+/**
+ * @deprecated since 1.6.0. Please use LabelValueExpressionFacesMessage
+ */
+@Deprecated
public class LabelValueBindingFacesMessage extends FacesMessage {
private Locale locale;
private Object[] args;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java Wed Feb 13 13:29:12 2013
@@ -24,8 +24,16 @@ import javax.faces.component.NamingConta
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public class FacesInvokeOnComponent12 {
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
public static boolean invokeOnComponent(
FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
String thisClientId = component.getClientId(context);
@@ -53,6 +61,10 @@ public class FacesInvokeOnComponent12 {
return false;
}
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
private static boolean invokeOnComponentFacetsAndChildren(
FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
for (java.util.Iterator<UIComponent> it = component.getFacetsAndChildren(); it.hasNext();) {
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/compat/FacesUtilsEL.java Wed Feb 13 13:29:12 2013
@@ -87,6 +87,10 @@ public class FacesUtilsEL {
return false;
}
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
public static void invokeMethodBinding(FacesContext facesContext, MethodBinding methodBinding, FacesEvent event) {
if (methodBinding != null && event != null) {
try {
@@ -170,19 +174,25 @@ public class FacesUtilsEL {
return null;
}
+ /**
+ * @deprecated Since 1.6.0, please use createValueExpression()
+ */
+ @Deprecated
public static Object createExpressionOrBinding(String string) {
+ return createValueExpression(string);
+ }
+
+ public static ValueExpression createValueExpression(String string) {
FacesContext facesContext = FacesContext.getCurrentInstance();
ExpressionFactory expressionFactory = facesContext.getApplication().getExpressionFactory();
- ValueExpression valueExpression =
- expressionFactory.createValueExpression(facesContext.getELContext(), string, Object.class);
- return valueExpression;
+ return expressionFactory.createValueExpression(facesContext.getELContext(), string, Object.class);
}
public static void setValidator(EditableValueHolder editableValueHolder, Object validator) {
if (validator instanceof MethodExpression) {
editableValueHolder.addValidator(new MethodExpressionValidator((MethodExpression) validator));
} else {
- LOG.error("Unknow instance for validator: " + (validator != null ? validator.getClass().getName() : validator));
+ LOG.error("Unknown instance for validator: " + (validator != null ? validator.getClass().getName() : validator));
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/InputSuggest.java Wed Feb 13 13:29:12 2013
@@ -21,12 +21,16 @@ package org.apache.myfaces.tobago.compon
import javax.faces.el.MethodBinding;
-/*
- * Date: 05.03.2008
- * Time: 20:14:15
- */
public interface InputSuggest {
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
MethodBinding getSuggestMethod();
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
void setSuggestMethod(MethodBinding suggestMethod);
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodBindingToMethodExpression.java Wed Feb 13 13:29:12 2013
@@ -30,7 +30,10 @@ import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
-@SuppressWarnings("deprecation")
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public class MethodBindingToMethodExpression extends MethodExpression implements StateHolder {
private MethodBinding methodBinding;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/MethodExpressionToMethodBinding.java Wed Feb 13 13:29:12 2013
@@ -27,7 +27,10 @@ import javax.faces.el.EvaluationExceptio
import javax.faces.el.MethodBinding;
import javax.faces.el.MethodNotFoundException;
-@SuppressWarnings("deprecation")
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public class MethodExpressionToMethodBinding extends MethodBinding implements StateHolder {
private MethodExpression methodExpression;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java Wed Feb 13 13:29:12 2013
@@ -23,11 +23,6 @@ import javax.faces.component.UIComponent
import javax.faces.event.FacesListener;
import javax.faces.event.ActionEvent;
-/*
- * User: weber
- * Date: 13.12.2004
- * Time: 16:25:03
- */
public class SheetStateChangeEvent extends ActionEvent {
private static final long serialVersionUID = 2875570768774425451L;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java Wed Feb 13 13:29:12 2013
@@ -21,10 +21,6 @@ package org.apache.myfaces.tobago.event;
import javax.faces.event.FacesListener;
-/*
- * Date: 18.12.2005
- * Time: 14:13:38
- */
public interface SheetStateChangeListener extends FacesListener {
void processSheetStateChange(SheetStateChangeEvent sheetStateChangeEvent);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java Wed Feb 13 13:29:12 2013
@@ -19,14 +19,18 @@
package org.apache.myfaces.tobago.event;
-/*
- * Date: 18.12.2005
- * Time: 13:56:59
- */
public interface SheetStateChangeSource {
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
javax.faces.el.MethodBinding getStateChangeListener();
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
void setStateChangeListener(javax.faces.el.MethodBinding actionListener);
void addStateChangeListener(SheetStateChangeListener listener);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java Wed Feb 13 13:29:12 2013
@@ -21,13 +21,17 @@ package org.apache.myfaces.tobago.event;
import javax.faces.el.MethodBinding;
-/*
- * Date: 14.04.2006
- * Time: 10:42:38
- */
public interface SortActionSource {
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
MethodBinding getSortActionListener();
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
void setSortActionListener(MethodBinding actionListener);
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java Wed Feb 13 13:29:12 2013
@@ -23,11 +23,6 @@ import javax.faces.component.UIComponent
import javax.faces.event.ActionEvent;
import javax.faces.event.FacesListener;
-/*
- * User: weber
- * Date: 13.12.2004
- * Time: 16:25:03
- */
public class TabChangeEvent extends ActionEvent {
private static final long serialVersionUID = 422186716954088729L;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java Wed Feb 13 13:29:12 2013
@@ -21,11 +21,6 @@ package org.apache.myfaces.tobago.event;
import javax.faces.event.FacesListener;
-/*
- * User: weber
- * Date: 13.12.2004
- * Time: 16:21:54
- */
public interface TabChangeListener extends FacesListener {
void processTabChange(TabChangeEvent tabChangeEvent);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java Wed Feb 13 13:29:12 2013
@@ -19,14 +19,18 @@
package org.apache.myfaces.tobago.event;
-/*
- * Date: 22.12.2005
- * Time: 23:01:03
- */
public interface TabChangeSource {
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
javax.faces.el.MethodBinding getTabChangeListener();
+ /**
+ * @deprecated since 1.6.0
+ */
+ @Deprecated
void setTabChangeListener(javax.faces.el.MethodBinding actionListener);
void addTabChangeListener(TabChangeListener listener);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java Wed Feb 13 13:29:12 2013
@@ -62,10 +62,6 @@ public class TreeMarkedEvent extends Fac
@Override
public String toString() {
- return new StringBuilder()
- .append(super.toString())
- .append("marked=")
- .append(newMarked)
- .toString();
+ return super.toString() + "marked=" + newMarked;
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java Wed Feb 13 13:29:12 2013
@@ -30,6 +30,10 @@ import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.event.ActionEvent;
+/**
+ * @deprecated Since 1.6.0, please use ValueExpressionPopupActionListener
+ */
+@Deprecated
public class ValueBindingPopupActionListener extends AbstractPopupActionListener implements StateHolder {
private static final Logger LOG = LoggerFactory.getLogger(ValueBindingPopupActionListener.class);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java Wed Feb 13 13:29:12 2013
@@ -33,6 +33,10 @@ import javax.faces.el.ValueBinding;
import javax.faces.event.ActionEvent;
+/**
+ * @deprecated Since 1.6.0, please use ValueExpressionResetInputActionListener
+ */
+@Deprecated
public class ValueBindingResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
private static final Logger LOG = LoggerFactory.getLogger(ValueBindingResetInputActionListener.class);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java Wed Feb 13 13:29:12 2013
@@ -27,12 +27,10 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-/*
- * Date: Jan 9, 2007
- * Time: 8:08:01 PM
+/**
+ * @deprecated Since 1.6.0, please use ValueExpressionTabChangeListener
*/
-
-@SuppressWarnings("deprecation")
+@Deprecated
public class ValueBindingTabChangeListener implements TabChangeListener, StateHolder {
private static final Logger LOG = LoggerFactory.getLogger(ValueBindingTabChangeListener.class);
private String type;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java Wed Feb 13 13:29:12 2013
@@ -37,6 +37,14 @@ public class ValueExpressionPopupActionL
private ValueExpression popupIdExpression;
+ public ValueExpressionPopupActionListener(ValueExpression expression) {
+ popupIdExpression = expression;
+ }
+
+ /**
+ * @deprecated Since 1.6.0, please use the other constructor with explicit type
+ */
+ @Deprecated
public ValueExpressionPopupActionListener(Object expression) {
popupIdExpression = (ValueExpression) expression;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java Wed Feb 13 13:29:12 2013
@@ -21,15 +21,10 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.OnComponentCreated;
-import org.apache.myfaces.tobago.component.OnComponentPopulated;
-import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
-import org.apache.myfaces.tobago.util.FacesVersion;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
import javax.faces.webapp.UIComponentTag;
import javax.servlet.jsp.JspException;
-import java.io.IOException;
public abstract class TobagoTag extends UIComponentTag {
@@ -45,35 +40,6 @@ public abstract class TobagoTag extends
return result;
}
- @Override
- protected void encodeBegin() throws IOException {
- // in jsf 1.1 the method component.encodeBegin is called in doEndTag ensure a LayoutManager for UIPage
- if (getComponentInstance() instanceof AbstractUIPage && !FacesVersion.supports12()) {
- onComponentPopulated(getComponentInstance());
- }
- super.encodeBegin();
- }
-
- @Override
- public int doEndTag() throws JspException {
- UIComponent component = getComponentInstance();
- int result = super.doEndTag();
- // in jsf 1.1 the method component.encodeBegin is called in doEndTag ensure a LayoutManager for UIPage
- if (!(component instanceof AbstractUIPage && !FacesVersion.supports12())) {
- onComponentPopulated(component);
- }
- return result;
- }
-
- private void onComponentPopulated(UIComponent component) {
- if (component instanceof OnComponentPopulated
- && component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
- component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ((OnComponentPopulated) component).onComponentPopulated(facesContext, component.getParent());
- }
- }
-
public String[] splitList(String renderers) {
return StringUtils.split(renderers, ", ");
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java Wed Feb 13 13:29:12 2013
@@ -54,7 +54,7 @@ import javax.faces.component.UIInput;
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.IN,
allowedChildComponenents = "NONE",
- interfaces = {"org.apache.myfaces.tobago.component.InputSuggest"},
+ interfaces = {"org.apache.myfaces.tobago.component.InputSuggest2"},
facets = {
@Facet(name = Facets.CHANGE,
description =
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java Wed Feb 13 13:29:12 2013
@@ -48,7 +48,7 @@ import javax.faces.component.UIData;
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISheet",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISheet",
- interfaces = "org.apache.myfaces.tobago.event.SortActionSource",
+ interfaces = "org.apache.myfaces.tobago.event.SortActionSource2",
uiComponentFacesClass = "javax.faces.component.UIData",
componentFamily = UIData.COMPONENT_FAMILY,
rendererType = RendererTypes.SHEET,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java Wed Feb 13 13:29:12 2013
@@ -50,7 +50,7 @@ import javax.faces.component.UIPanel;
uiComponentFacesClass = "javax.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.TAB_GROUP,
- interfaces = "javax.faces.component.ActionSource",
+ interfaces = "javax.faces.component.ActionSource2",
allowedChildComponenents = "org.apache.myfaces.tobago.Tab")
public interface TabGroupTagDeclaration
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java Wed Feb 13 13:29:12 2013
@@ -26,12 +26,10 @@ import java.util.Comparator;
public abstract class ComparatorBase implements Comparator {
-
private Comparator comparator;
private boolean reverse;
-
protected ComparatorBase() {
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java Wed Feb 13 13:29:12 2013
@@ -122,6 +122,13 @@ public class MessageUtils {
try {
Class clazz = Class.forName("org.apache.myfaces.tobago.context.TobagoResourceBundle");
Object bundle = ConstructorUtils.invokeConstructor(clazz, new Object[0]);
+ LOG.error("*********************************************************************************************");
+ LOG.error("*********************************************************************************************");
+ LOG.error("*********************************************************************************************");
+ LOG.error("just created: " + bundle + " " + System.identityHashCode(bundle));
+ LOG.error("*********************************************************************************************");
+ LOG.error("*********************************************************************************************");
+ LOG.error("*********************************************************************************************");
return (ResourceBundle) bundle;
} catch (Exception e) {
LOG.error("Can't create TobagoResourceBundle, but it should be in the core.", e);
@@ -158,6 +165,10 @@ public class MessageUtils {
return component.getClientId(facesContext);
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static String getFormatedMessage(String message, Locale locale, Object... args) {
if (args != null && args.length > 0 && message != null) {
MessageFormat format = new MessageFormat(message, locale);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java Wed Feb 13 13:29:12 2013
@@ -27,10 +27,6 @@ import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
-/*
- * Date: 03.07.2006
- * Time: 21:19:38
- */
public class RequestUtils {
private static final Logger LOG = LoggerFactory.getLogger(RequestUtils.class);
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java (from r1445496, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java&p1=myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java&r1=1445496&r2=1445588&rev=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java Wed Feb 13 13:29:12 2013
@@ -27,10 +27,10 @@ import javax.faces.el.ValueBinding;
import java.util.Comparator;
import java.util.Map;
-/*
- * Created: Mon Apr 15 15:56:44 2002
+/**
+ * @deprecated Since 1.6.0
*/
-@SuppressWarnings("deprecation")
+@Deprecated
public class ValueBindingComparator extends ComparatorBase {
private static final Logger LOG = LoggerFactory.getLogger(ValueBindingComparator.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Wed Feb 13 13:29:12 2013
@@ -134,7 +134,7 @@ public class SelectBooleanCheckboxExtens
if (itemLabel != null) {
selectBooleanCheckboxTag.setItemLabel(itemLabel);
} else {
- selectBooleanCheckboxTag.setItemLabel((ValueExpression) FacesUtilsEL.createExpressionOrBinding(""));
+ selectBooleanCheckboxTag.setItemLabel((ValueExpression) FacesUtilsEL.createValueExpression(""));
}
if (markup != null) {
selectBooleanCheckboxTag.setMarkup(markup);
Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Wed Feb 13 13:29:12 2013
@@ -81,11 +81,5 @@
<groupId>maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Wed Feb 13 13:29:12 2013
@@ -37,12 +37,10 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.layout.LayoutContext;
import org.apache.myfaces.tobago.internal.util.AccessKeyMap;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
-import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import org.apache.myfaces.tobago.internal.util.ResponseUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
-import org.apache.myfaces.tobago.renderkit.TobagoResponseStateManager;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -51,7 +49,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.apache.myfaces.tobago.util.FacesVersion;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.apache.myfaces.tobago.webapp.Secret;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -511,33 +508,7 @@ public class PageRenderer extends PageRe
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "jsf-state-container");
writer.flush();
if (!FacesContextUtils.isAjax(facesContext)) {
- if (FacesVersion.supports12()) {
viewHandler.writeState(facesContext);
- } else {
- // catch the next written stuff into a string and look if it is empty (TOBAGO-909)
- FastStringWriter buffer = new FastStringWriter(40); // usually only the marker...
- TobagoResponseWriter originalWriter = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer = (TobagoResponseWriter) writer.cloneWithWriter(buffer);
- facesContext.setResponseWriter(writer);
- viewHandler.writeState(facesContext);
- final String stateContent = buffer.toString();
- writer = originalWriter;
- facesContext.setResponseWriter(writer);
-
- if (StringUtils.isBlank(stateContent)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Writing state will not happen! So we write the hidden field manually.");
- }
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
- writer.writeAttribute(HtmlAttributes.NAME, TobagoResponseStateManager.VIEW_STATE_PARAM, false);
- writer.writeAttribute(HtmlAttributes.ID, TobagoResponseStateManager.VIEW_STATE_PARAM, false);
- writer.writeAttribute(HtmlAttributes.VALUE, "workaround", false);
- writer.endElement(HtmlElements.INPUT);
- } else {
- writer.write(stateContent);
- }
- }
}
writer.endElement(HtmlElements.SPAN);
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java Wed Feb 13 13:29:12 2013
@@ -247,8 +247,25 @@ public class ClassesGenerator extends Ab
List<String> elMethods = new ArrayList<String>();
for (String interfaceName : interfaces) {
try {
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
+ info(interfaceName);
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("currently not working!!! ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
Class.forName(interfaceName);
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info(" 1 ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
Class interfaceClass2 = Class.forName(interfaceName + "2");
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info(" 2 ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
info.addInterface(interfaceClass2.getName());
for (Method method : interfaceClass2.getMethods()) {
Class[] parameter = method.getParameterTypes();
@@ -257,6 +274,11 @@ public class ClassesGenerator extends Ab
}
}
} catch (ClassNotFoundException e) {
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info(" X ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+ info("/////////////////////////////////////////////////////////////////////////////////////////////////////");
// ignore
}
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg Wed Feb 13 13:29:12 2013
@@ -42,8 +42,6 @@ package <componentInfo.packageName>;
<componentInfo.imports:import(); separator="\n">
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.myfaces.tobago.component.MethodBindingToMethodExpression;
-import org.apache.myfaces.tobago.component.MethodExpressionToMethodBinding;
import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.renderkit.MarginValues;
import org.apache.myfaces.tobago.renderkit.SpacingValues;
@@ -355,9 +353,12 @@ CharacterProperty(property) ::= <<
MethodBindingProperty(property) ::= <<
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public <property.type> get<property.upperCamelCaseName>() {
-<if(property.elAlternativeAvailable)>
- MethodExpression expression = get<property.upperCamelCaseName>Expression();
+ javax.el.MethodExpression expression = get<property.upperCamelCaseName>Expression();
if (expression instanceof MethodBindingToMethodExpression) {
return ((MethodBindingToMethodExpression)expression).getMethodBinding();
}
@@ -365,35 +366,28 @@ public <property.type> get<property.uppe
return new MethodExpressionToMethodBinding(expression);
}
return null;
-<else>
- return <property.propertyName>;
-<endif>
-
}
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
-<if(property.elAlternativeAvailable)>
if (<property.propertyName> != null) {
set<property.upperCamelCaseName>Expression(new MethodBindingToMethodExpression(<property.propertyName>));
} else {
set<property.upperCamelCaseName>Expression(null);
}
-<else>
- this.<property.propertyName> = <property.propertyName>;
-<endif>
-
}
->>
-
-MethodExpressionProperty(property) ::= <<
-public <property.type> get<property.upperCamelCaseName>() {
- return <property.propertyName>;
+public javax.el.MethodExpression get<property.upperCamelCaseName>Expression() {
+ return (javax.el.MethodExpression) getStateHelper().eval(PropertyKeys.<property.propertyName>);
}
-public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
- this.<property.propertyName> = <property.propertyName>;
+public void set<property.upperCamelCaseName>Expression(javax.el.MethodExpression <property.propertyName>) {
+ getStateHelper().put(PropertyKeys.<property.propertyName>, <property.propertyName>);
}
+
>>
NormalProperty(property) ::= <<
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg?rev=1445588&r1=1445587&r2=1445588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg Wed Feb 13 13:29:12 2013
@@ -42,8 +42,6 @@ package <componentInfo.packageName>;
<componentInfo.imports:import(); separator="\n">
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.myfaces.tobago.component.MethodBindingToMethodExpression;
-import org.apache.myfaces.tobago.component.MethodExpressionToMethodBinding;
import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.renderkit.MarginValues;
import org.apache.myfaces.tobago.renderkit.SpacingValues;
@@ -343,8 +341,11 @@ CharacterProperty(property) ::= <<
MethodBindingProperty(property) ::= <<
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public <property.type> get<property.upperCamelCaseName>() {
-<if(property.elAlternativeAvailable)>
javax.el.MethodExpression expression = get<property.upperCamelCaseName>Expression();
if (expression instanceof MethodBindingToMethodExpression) {
return ((MethodBindingToMethodExpression)expression).getMethodBinding();
@@ -353,35 +354,28 @@ public <property.type> get<property.uppe
return new MethodExpressionToMethodBinding(expression);
}
return null;
-<else>
- return (<property.type>) getStateHelper().eval(PropertyKeys.<property.propertyName>);
-<endif>
-
}
+/**
+ * @deprecated since 1.6.0
+ */
+@Deprecated
public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
-<if(property.elAlternativeAvailable)>
if (<property.propertyName> != null) {
set<property.upperCamelCaseName>Expression(new MethodBindingToMethodExpression(<property.propertyName>));
} else {
set<property.upperCamelCaseName>Expression(null);
}
-<else>
- getStateHelper().put(PropertyKeys.<property.propertyName>, <property.propertyName>);
-<endif>
-
}
->>
-MethodExpressionProperty(property) ::= <<
-
-public <property.type> get<property.upperCamelCaseName>() {
- return (<property.type>) getStateHelper().eval(PropertyKeys.<property.propertyName>);
+public javax.el.MethodExpression get<property.upperCamelCaseName>Expression() {
+ return (javax.el.MethodExpression) getStateHelper().eval(PropertyKeys.<property.propertyName>);
}
-public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
+public void set<property.upperCamelCaseName>Expression(javax.el.MethodExpression <property.propertyName>) {
getStateHelper().put(PropertyKeys.<property.propertyName>, <property.propertyName>);
}
+
>>
NormalProperty(property) ::= <<