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 15:33:30 UTC

svn commit: r1445625 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/ tobago-extension/tobago-taglib-extension/sr...

Author: lofwyr
Date: Wed Feb 13 14:33:29 2013
New Revision: 1445625

URL: http://svn.apache.org/r1445625
Log:
TOBAGO-1221: Remove JSF 1.1 and JDK 1.4 support
 - MethodBinding -> MethodExpression

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.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-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasState.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.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-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.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/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -53,6 +53,6 @@ public interface CalendarTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute(
       type = {"java.util.Calendar", "java.util.Date"},
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -75,6 +75,6 @@ public interface FileTagDeclaration
   @TagAttribute()
   @UIComponentTagAttribute(
       type = { "org.apache.commons.fileupload.FileItem" },
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -91,7 +91,7 @@ public interface PageTagDeclaration
   @Deprecated
   @TagAttribute
   @UIComponentTagAttribute(
-      type = "java.lang.Object", expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      type = "java.lang.Object", expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setState(String state);
 
   // XXX LAYOUT_GENERATE

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -61,6 +61,6 @@ public interface ProgressTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute(
       type = { "javax.swing.BoundedRangeModel" },
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -77,7 +77,7 @@ public interface SelectItemTagDeclaratio
   @TagAttribute
   @UIComponentTagAttribute(
       type = "javax.faces.model.SelectItem",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 
   /**

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -49,7 +49,7 @@ public interface SelectItemsTagDeclarati
   @TagAttribute
   @UIComponentTagAttribute(
       type = "javax.faces.model.SelectItem[]",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 
 }

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -102,7 +102,7 @@ public interface SheetTagDeclaration 
   @TagAttribute
   @UIComponentTagAttribute(type = {"java.lang.Object[]", "java.util.List", "javax.servlet.jsp.jstl.sql.Result",
       "java.sql.ResultSet", "java.lang.Object", "javax.faces.model.DataModel"},
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setValue(String value);
 
   /**
@@ -187,7 +187,7 @@ public interface SheetTagDeclaration 
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.model.SheetState",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED,
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED,
       generate = false)
   void setState(String state);
 
@@ -199,7 +199,7 @@ public interface SheetTagDeclaration 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ActionEvent")
   void setStateChangeListener(String stateChangeListener);
 

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -104,7 +104,7 @@ public interface TabGroupTagDeclaration
   @TagAttribute  
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "org.apache.myfaces.tobago.event.TabChangeEvent")
   void setTabChangeListener(String listener);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -79,7 +79,7 @@ public interface TreeListboxTagDeclarati
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.model.TreeState",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED,
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED,
       generate = false)
   void setState(String state);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -64,7 +64,7 @@ public interface TreeMenuTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.model.TreeState",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED,
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED,
       generate = false)
   void setState(String state);
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -88,7 +88,7 @@ public interface
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       generate = false,
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "org.apache.myfaces.tobago.event.TreeExpansionEvent")
   void setTreeExpansionListener(String treeExpansionListener);
 
@@ -98,7 +98,7 @@ public interface
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       generate = false,
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "org.apache.myfaces.tobago.event.TreeMarkedEvent")
   void setTreeMarkedListener(String treeMarkedListener);
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -83,7 +83,7 @@ public interface TreeTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute(
       type = "org.apache.myfaces.tobago.model.TreeState",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED,
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED,
       generate = false)
   void setState(String state);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java Wed Feb 13 14:33:29 2013
@@ -52,7 +52,7 @@ public interface WizardTagDeclaration 
 
   @TagAttribute(required = true)
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard",
-      expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setController(String controller);
 
   /**

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java Wed Feb 13 14:33:29 2013
@@ -36,7 +36,7 @@ public interface HasAction {
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodReturnType = "java.lang.Object")
   void setAction(String action);
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java Wed Feb 13 14:33:29 2013
@@ -33,7 +33,7 @@ public interface HasActionListener {
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ActionEvent")
   void setActionListener(String actionListener);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java Wed Feb 13 14:33:29 2013
@@ -36,6 +36,6 @@ public interface HasConverter {
   @TagAttribute
   @UIComponentTagAttribute(
       type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   void setConverter(String converter);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasState.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasState.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasState.java Wed Feb 13 14:33:29 2013
@@ -31,6 +31,6 @@ public interface HasState {
   // TODO is Object right?
   @TagAttribute
   @UIComponentTagAttribute(
-      type = "java.lang.Object", expression = DynamicExpression.VALUE_BINDING_REQUIRED)
+      type = "java.lang.Object", expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
   void setState(String state);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java Wed Feb 13 14:33:29 2013
@@ -34,7 +34,7 @@ public interface HasSuggestMethod {
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.component.UIInput",
       methodReturnType = "java.lang.Object")
   void setSuggestMethod(String suggestMethod);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java Wed Feb 13 14:33:29 2013
@@ -32,7 +32,7 @@ public interface HasValidator {
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   void setValidator(String validator);
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java Wed Feb 13 14:33:29 2013
@@ -35,7 +35,7 @@ public interface HasValueChangeListener 
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ValueChangeEvent")
   void setValueChangeListener(String valueChangeListener);
 }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.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/DateExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -258,7 +258,7 @@ public class DateExtensionTag extends To
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -323,7 +323,7 @@ public class DateExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }
@@ -336,7 +336,7 @@ public class DateExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.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/FileExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -207,7 +207,7 @@ public class FileExtensionTag extends To
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -250,7 +250,7 @@ public class FileExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.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/InExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -251,7 +251,7 @@ public class InExtensionTag extends Toba
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -307,7 +307,7 @@ public class InExtensionTag extends Toba
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(ValueExpression converter) {
     this.converter = converter;
   }
@@ -330,7 +330,7 @@ public class InExtensionTag extends Toba
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "java.lang.String")
   public void setSuggestMethod(MethodExpression suggestMethod) {
     this.suggestMethod = suggestMethod;
@@ -366,7 +366,7 @@ public class InExtensionTag extends Toba
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(MethodExpression validator) {
     this.validator = validator;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.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/MenuCheckboxExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -189,7 +189,7 @@ public class MenuCheckboxExtensionTag ex
    * The String is directly passed to the Navigationhandler.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_BINDING,
+  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
       methodReturnType = "java.lang.Object")
   public void setAction(javax.el.MethodExpression action) {
     this.action = action;
@@ -202,7 +202,7 @@ public class MenuCheckboxExtensionTag ex
    * parameter, with a return type of void.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ActionEvent")
   public void setActionListener(javax.el.MethodExpression actionListener) {
     this.actionListener = actionListener;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.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/MenuRadioExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -199,7 +199,7 @@ public class MenuRadioExtensionTag exten
    * The String is directly passed to the Navigationhandler.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_BINDING,
+  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION,
       methodReturnType = "java.lang.Object")
   public void setAction(javax.el.MethodExpression action) {
     this.action = action;
@@ -212,7 +212,7 @@ public class MenuRadioExtensionTag exten
    * parameter, with a return type of void.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+  @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ActionEvent")
   public void setActionListener(javax.el.MethodExpression actionListener) {
     this.actionListener = actionListener;
@@ -323,7 +323,7 @@ public class MenuRadioExtensionTag exten
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -213,7 +213,7 @@ public class SelectBooleanCheckboxExtens
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -274,7 +274,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -291,7 +291,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.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/SelectManyCheckboxExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -221,13 +221,11 @@ public class SelectManyCheckboxExtension
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -291,7 +289,7 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -308,7 +306,7 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.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/SelectManyListboxExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -217,7 +217,7 @@ public class SelectManyListboxExtensionT
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -279,7 +279,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -296,7 +296,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.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/SelectManyShuttleExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -223,7 +223,7 @@ public class SelectManyShuttleExtensionT
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
-      expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -292,7 +292,7 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -309,7 +309,7 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.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/SelectOneChoiceExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -217,7 +217,7 @@ public class SelectOneChoiceExtensionTag
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -231,7 +231,7 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -275,7 +275,7 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.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/SelectOneListboxExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -216,7 +216,7 @@ public class SelectOneListboxExtensionTa
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -267,7 +267,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -284,7 +284,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.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/SelectOneRadioExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -224,7 +224,7 @@ public class SelectOneRadioExtensionTag 
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -238,7 +238,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;
@@ -282,7 +282,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.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/TextareaExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -216,7 +216,7 @@ public class TextareaExtensionTag extend
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -272,7 +272,7 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }
@@ -285,7 +285,7 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.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/TimeExtensionTag.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Wed Feb 13 14:33:29 2013
@@ -229,7 +229,7 @@ public class TimeExtensionTag extends To
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
-          expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
   public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
     this.valueChangeListener = valueChangeListener;
@@ -285,7 +285,7 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
-      expression = DynamicExpression.VALUE_BINDING)
+      expression = DynamicExpression.VALUE_EXPRESSION)
   public void setConverter(javax.el.ValueExpression converter) {
     this.converter = converter;
   }
@@ -298,7 +298,7 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = {},
-      expression = DynamicExpression.METHOD_BINDING,
+      expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
   public void setValidator(javax.el.MethodExpression validator) {
     this.validator = validator;

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/DynamicExpression.java Wed Feb 13 14:33:29 2013
@@ -19,15 +19,25 @@
 
 package org.apache.myfaces.tobago.apt.annotation;
 
-/*
- * Created: Apr 27, 2005 5:08:45 PM
- * $Id$
- */
 public enum DynamicExpression {
 
-  VALUE_BINDING(false, true, false), VALUE_BINDING_REQUIRED(true, true, false),
-  METHOD_BINDING(false, false, true), METHOD_BINDING_REQUIRED(true, false, true),
-  PROHIBITED(false, false, false);
+  VALUE_EXPRESSION(false, true, false),
+  VALUE_EXPRESSION_REQUIRED(true, true, false),
+  METHOD_EXPRESSION(false, false, true),
+  METHOD_EXPRESSION_REQUIRED(true, false, true),
+  PROHIBITED(false, false, false),
+  /** @deprecated since 1.6.0 */
+  @Deprecated
+  VALUE_BINDING(false, true, false),
+  /** @deprecated since 1.6.0 */
+  @Deprecated
+  VALUE_BINDING_REQUIRED(true, true, false),
+  /** @deprecated since 1.6.0 */
+  @Deprecated
+  METHOD_BINDING(false, false, true),
+  /** @deprecated since 1.6.0 */
+  @Deprecated
+  METHOD_BINDING_REQUIRED(true, false, true);
 
   private boolean required;
   private boolean valueExpression;
@@ -53,12 +63,16 @@ public enum DynamicExpression {
 
   public String toMetaDataString() {
     switch (this) {
+      case VALUE_EXPRESSION:
       case VALUE_BINDING:
         return "ALLOWED";
+      case METHOD_EXPRESSION:
       case METHOD_BINDING:
         return "ALLOWED";
+      case VALUE_EXPRESSION_REQUIRED:
       case VALUE_BINDING_REQUIRED:
         return "REQUIRED";
+      case METHOD_EXPRESSION_REQUIRED:
       case METHOD_BINDING_REQUIRED:
         return "REQUIRED";
       case PROHIBITED:
@@ -70,12 +84,16 @@ public enum DynamicExpression {
 
   public String toString() {
     switch (this) {
+      case VALUE_EXPRESSION:
       case VALUE_BINDING:
         return "VB";
+      case VALUE_EXPRESSION_REQUIRED:
       case VALUE_BINDING_REQUIRED:
         return "VB";
+      case METHOD_EXPRESSION:
       case METHOD_BINDING:
         return "MB";
+      case METHOD_EXPRESSION_REQUIRED:
       case METHOD_BINDING_REQUIRED:
         return "MB";
       case PROHIBITED:

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java Wed Feb 13 14:33:29 2013
@@ -40,7 +40,7 @@ public @interface UIComponentTagAttribut
   String[] allowedValues() default { };
 
   /** allow faces expression language, e.g. #{bean}  */
-  DynamicExpression expression() default DynamicExpression.VALUE_BINDING;
+  DynamicExpression expression() default DynamicExpression.VALUE_EXPRESSION;
 
   String[] methodSignature() default { };
 

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java?rev=1445625&r1=1445624&r2=1445625&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java Wed Feb 13 14:33:29 2013
@@ -65,7 +65,7 @@ public class PropertyInfo {
     if (valueExpressionRequired) {
       return "ValueExpression";
     }
-    if (isMethodBinding()) {
+    if (isMethodExpression()) {
       return getUpperCamelCaseName();
     }
     return getShortTypeProperty();
@@ -99,8 +99,8 @@ public class PropertyInfo {
     this.type = type;
   }
 
-  public boolean isMethodBinding() {
-    return "javax.faces.el.MethodBinding".equals(type);
+  public boolean isMethodExpression() {
+    return "javax.el.MethodExpression".equals(type);
   }
 
   public String getShortType() {

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -413,9 +413,9 @@ public class ClassesGenerator extends Ab
         final String type;
         if (uiComponentTagAttribute.expression().isMethodExpression()) {
           propertyInfo.setMethodExpressionRequired(true);
-          type = "javax.faces.el.MethodBinding";
+          type = "javax.el.MethodExpression";
         } else {
-          if (uiComponentTagAttribute.expression() == DynamicExpression.VALUE_BINDING_REQUIRED) {
+          if (uiComponentTagAttribute.expression() == DynamicExpression.VALUE_EXPRESSION_REQUIRED) {
             propertyInfo.setValueExpressionRequired(true);
           } else if (uiComponentTagAttribute.expression() == DynamicExpression.PROHIBITED) {
             propertyInfo.setLiteralOnly(true);

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -351,7 +351,7 @@ CharacterProperty(property) ::= <<
 <NormalProperty(property)>
 >>
 
-MethodBindingProperty(property) ::= <<
+MethodExpressionProperty(property) ::= <<
 
 /**
  * @deprecated since 1.6.0

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=1445625&r1=1445624&r2=1445625&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 14:33:29 2013
@@ -339,13 +339,13 @@ CharacterProperty(property) ::= <<
 <NormalProperty(property)>
 >>
 
-MethodBindingProperty(property) ::= <<
+MethodExpressionProperty(property) ::= <<
 
 /**
  * @deprecated since 1.6.0
  */
 @Deprecated
-public <property.type> get<property.upperCamelCaseName>() {
+public javax.faces.el.MethodBinding get<property.upperCamelCaseName>() {
   javax.el.MethodExpression expression = get<property.upperCamelCaseName>Expression();
   if (expression instanceof MethodBindingToMethodExpression) {
     return ((MethodBindingToMethodExpression)expression).getMethodBinding();
@@ -360,7 +360,7 @@ public <property.type> get<property.uppe
  * @deprecated since 1.6.0
  */
 @Deprecated
-public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
+public void set<property.upperCamelCaseName>(javax.faces.el.MethodBinding <property.propertyName>) {
   if (<property.propertyName> != null) {
     set<property.upperCamelCaseName>Expression(new MethodBindingToMethodExpression(<property.propertyName>));
   } else {
@@ -368,11 +368,11 @@ public void set<property.upperCamelCaseN
   }
 }
 
-public javax.el.MethodExpression get<property.upperCamelCaseName>Expression() {
-  return (javax.el.MethodExpression) getStateHelper().eval(PropertyKeys.<property.propertyName>);
+public <property.type> get<property.upperCamelCaseName>Expression() {
+  return (<property.type>) getStateHelper().eval(PropertyKeys.<property.propertyName>);
 }
 
-public void set<property.upperCamelCaseName>Expression(javax.el.MethodExpression <property.propertyName>) {
+public void set<property.upperCamelCaseName>Expression(<property.type> <property.propertyName>) {
   getStateHelper().put(PropertyKeys.<property.propertyName>, <property.propertyName>);
 }