You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/20 04:16:04 UTC

svn commit: r882395 - in /myfaces/core/trunk/api/src/main/java/javax/faces: application/ component/ context/ convert/ el/ event/ render/ validator/ view/facelets/ webapp/

Author: lu4242
Date: Fri Nov 20 03:15:53 2009
New Revision: 882395

URL: http://svn.apache.org/viewvc?rev=882395&view=rev
Log:
MYFACES-2411 Update api to match latest signature

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/Resource.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandler.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/ActionSource.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/EditableValueHolder.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/convert/FacesConverter.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyResolver.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/ValueBinding.java
    myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java
    myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java
    myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenersFor.java
    myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/Validator.java
    myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java
    myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java
    myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetadataTarget.java
    myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
    myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ConverterTag.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
    myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java Fri Nov 20 03:15:53 2009
@@ -361,7 +361,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract UIComponent createComponent(ValueBinding componentBinding, FacesContext context,
                                                 String componentType) throws FacesException;
 
@@ -480,7 +479,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract MethodBinding createMethodBinding(String ref, Class<?>[] params) throws ReferenceSyntaxException;
 
     /**
@@ -507,7 +505,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract ValueBinding createValueBinding(String ref) throws ReferenceSyntaxException;
 
     /**
@@ -801,7 +798,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract PropertyResolver getPropertyResolver();
 
     /**
@@ -888,7 +884,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract VariableResolver getVariableResolver();
 
     /**
@@ -1078,7 +1073,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract void setPropertyResolver(PropertyResolver resolver);
 
     /**
@@ -1131,7 +1125,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract void setVariableResolver(VariableResolver resolver);
 
     /**

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java Fri Nov 20 03:15:53 2009
@@ -80,12 +80,12 @@
      * Immutable <code>Lis</code> of valid {@link FacesMessage.Severity}instances, in ascending order of their ordinal
      * value.
      */
-    public static final List<FacesMessage.Severity> VALUES;
+    public static final List VALUES;
 
     /**
      * Immutable <code>Map</code> of valid {@link FacesMessage.Severity}instances, keyed by name.
      */
-    public static final Map<String, FacesMessage.Severity> VALUES_MAP;
+    public static final Map VALUES_MAP;
 
     static
     {

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/Resource.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/Resource.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/Resource.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/Resource.java Fri Nov 20 03:15:53 2009
@@ -18,6 +18,7 @@
  */
 package javax.faces.application;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Map;
@@ -47,7 +48,7 @@
         return _contentType;
     }
     
-    public abstract InputStream getInputStream();
+    public abstract InputStream getInputStream() throws IOException;
 
     public String getLibraryName()
     {

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandler.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandler.java Fri Nov 20 03:15:53 2009
@@ -18,6 +18,8 @@
  */
 package javax.faces.application;
 
+import java.io.IOException;
+
 import javax.faces.context.FacesContext;
 
 /**
@@ -41,7 +43,7 @@
     
     public abstract String getRendererTypeForResourceName(String resourceName);
     
-    public abstract void handleResourceRequest(FacesContext context);
+    public abstract void handleResourceRequest(FacesContext context) throws IOException;
     
     public abstract boolean isResourceRequest(FacesContext context);
     

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java Fri Nov 20 03:15:53 2009
@@ -18,6 +18,8 @@
  */
 package javax.faces.application;
 
+import java.io.IOException;
+
 import javax.faces.FacesWrapper;
 import javax.faces.context.FacesContext;
 
@@ -55,7 +57,7 @@
     }
     
     @Override
-    public void handleResourceRequest(FacesContext context)
+    public void handleResourceRequest(FacesContext context) throws IOException
     {
         getWrapped().handleResourceRequest(context);
     }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java Fri Nov 20 03:15:53 2009
@@ -18,6 +18,7 @@
  */
 package javax.faces.application;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Map;
@@ -35,7 +36,7 @@
     implements FacesWrapper<Resource>
 {
     @Override
-    public InputStream getInputStream()
+    public InputStream getInputStream() throws IOException
     {
         return getWrapped().getInputStream();
     }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java Fri Nov 20 03:15:53 2009
@@ -92,7 +92,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public StateManager.SerializedView saveSerializedView(FacesContext context)
     {
         return null;
@@ -131,7 +130,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     protected Object getTreeStructureToSave(FacesContext context)
     {
         return null;
@@ -144,7 +142,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     protected Object getComponentStateToSave(FacesContext context)
     {
         return null;
@@ -167,7 +164,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public void writeState(FacesContext context, StateManager.SerializedView state)
         throws IOException
     {
@@ -219,7 +215,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     protected UIViewRoot restoreTreeStructure(FacesContext context, String viewId, String renderKitId)
     {
         return null;
@@ -228,7 +223,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     protected void restoreComponentState(FacesContext context, UIViewRoot viewRoot, String renderKitId)
     {
         // default impl does nothing as per JSF 1.2 javadoc
@@ -266,7 +260,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public class SerializedView
     {
         private Object _structure;
@@ -275,7 +268,6 @@
         /**
          * @deprecated
          */
-        @Deprecated
         public SerializedView(Object structure, Object state)
         {
             _structure = structure;
@@ -285,7 +277,6 @@
         /**
          * @deprecated
          */
-        @Deprecated
         public Object getStructure()
         {
             return _structure;
@@ -294,7 +285,6 @@
         /**
          * @deprecated
          */
-        @Deprecated
         public Object getState()
         {
             return _state;

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/ActionSource.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/ActionSource.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/ActionSource.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/ActionSource.java Fri Nov 20 03:15:53 2009
@@ -29,19 +29,16 @@
     /**
      * @deprecated Replaced by ActionSource2.getActionExpression
      */
-    @Deprecated
     public javax.faces.el.MethodBinding getAction();
 
     /**
      * @deprecated Replaced by ActionSource2.setActionExpression
      */
-    @Deprecated
     public void setAction(javax.faces.el.MethodBinding action);
 
     /**
      * @deprecated Replaced by getActionListeners
      */
-    @Deprecated
     public javax.faces.el.MethodBinding getActionListener();
 
     public void setActionListener(javax.faces.el.MethodBinding actionListener);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/EditableValueHolder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/EditableValueHolder.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/EditableValueHolder.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/EditableValueHolder.java Fri Nov 20 03:15:53 2009
@@ -137,13 +137,11 @@
      * 
      * @deprecated Use getValidators() instead.
      */
-    @Deprecated
     public MethodBinding getValidator();
 
     /**
      * @deprecated Use addValidator(MethodExpressionValidaotr) instead.
      */
-    @Deprecated
     public void setValidator(javax.faces.el.MethodBinding validatorBinding);
 
     /**
@@ -155,13 +153,11 @@
      * 
      * @deprecated Use getValueChangeLIsteners() instead.
      */
-    @Deprecated
     public MethodBinding getValueChangeListener();
 
     /**
      * @deprecated use addValueChangeListener(MethodExpressionValueChangeListener) instead.
      */
-    @Deprecated
     public void setValueChangeListener(MethodBinding valueChangeMethod);
 
     public void addValidator(Validator validator);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java Fri Nov 20 03:15:53 2009
@@ -62,6 +62,5 @@
     /**
      * @deprecated Use {@link UINamingContainer#getSeparatorChar(javax.faces.context.FacesContext)
      */
-    @Deprecated
     public static final char SEPARATOR_CHAR = ':';
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java Fri Nov 20 03:15:53 2009
@@ -131,6 +131,9 @@
     private static final String _COMPONENT_STACK = "componentStack:" + UIComponent.class.getName();
     Map<Class<? extends SystemEvent>, List<SystemEventListener>> _systemEventListenerClassMap;
     
+    /**
+     * @deprecated
+     */
     @Deprecated
     protected Map<String, ValueExpression> bindings;
     /**
@@ -277,7 +280,6 @@
     /**
      * @deprecated Replaced by setValueExpression
      */
-    @Deprecated
     public abstract void setValueBinding(String name, ValueBinding binding);
 
     public void setValueExpression(String name, ValueExpression expression) {
@@ -522,7 +524,6 @@
     /**
      * @deprecated Replaced by getValueExpression
      */
-    @Deprecated
     public abstract ValueBinding getValueBinding(String name);
 
     public ValueExpression getValueExpression(String name) {

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Fri Nov 20 03:15:53 2009
@@ -117,7 +117,6 @@
      * 
      * @deprecated Replaced by setValueExpression
      */
-    @Deprecated
     @Override
     public void setValueBinding(String name, ValueBinding binding)
     {
@@ -902,7 +901,6 @@
      * 
      * @deprecated Replaced by getValueExpression
      */
-    @Deprecated
     @Override
     public ValueBinding getValueBinding(String name)
     {

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java Fri Nov 20 03:15:53 2009
@@ -111,7 +111,7 @@
             getStateHelper().put(PropertyKeys.converterSet,Boolean.TRUE);
         }
         // The argument converter must be inspected for the presence of the ResourceDependency annotation.
-        _handleAnnotations(FacesContext.getCurrentInstance(), converter);
+        //_handleAnnotations(FacesContext.getCurrentInstance(), converter);
     }
     
     private boolean _isSetConverter()
@@ -223,6 +223,7 @@
         }         
     }
     
+    /*
     void _handleAnnotations(FacesContext context, Object inspected)
     {
         if (inspected == null) {
@@ -305,4 +306,5 @@
             }
         }
     }
+    */
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java Fri Nov 20 03:15:53 2009
@@ -70,7 +70,6 @@
      * @deprecated Use getValueExpression instead
      */
     @Override
-    @Deprecated
     public ValueBinding getValueBinding(String name)
     {
         if (name == null)
@@ -91,7 +90,6 @@
      * @deprecated Use setValueExpression instead
      */
     @Override
-    @Deprecated
     public void setValueBinding(String name, ValueBinding binding)
     {
         if (name == null)

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java Fri Nov 20 03:15:53 2009
@@ -81,7 +81,6 @@
     /**
      * @deprecated Use getValueExpression instead
      */
-    @Deprecated
     @Override
     public ValueBinding getValueBinding(String name)
     {
@@ -102,7 +101,6 @@
     /**
      * @deprecated Use setValueExpression instead
      */
-    @Deprecated
     @Override
     public void setValueBinding(String name, ValueBinding binding)
     {

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java Fri Nov 20 03:15:53 2009
@@ -94,11 +94,12 @@
         getWrapped().release();
     }
 
-    @Override
-    public void setPartialRequest(boolean isPartialRequest)
-    {
-        getWrapped().setPartialRequest(isPartialRequest);
-    }
+    // -= Leonardo Uribe=- This method breaks signature test!
+    //@Override
+    //public void setPartialRequest(boolean isPartialRequest)
+    //{
+    //    getWrapped().setPartialRequest(isPartialRequest);
+    //}
 
     @Override
     public void setRenderAll(boolean renderAll)

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/FacesConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/FacesConverter.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/FacesConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/FacesConverter.java Fri Nov 20 03:15:53 2009
@@ -40,7 +40,7 @@
      *
      * @return The class this converter must be registered for.
      */
-    public Class<?> forClass() default Object.class;
+    public Class forClass() default Object.class;
 
     /**
      * The converter id. Alternative for providing the &lt;converter-id&gt; element in XML.

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java Fri Nov 20 03:15:53 2009
@@ -27,7 +27,6 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public class EvaluationException extends FacesException
 {
     private static final long serialVersionUID = 4668524591042216006L;
@@ -38,7 +37,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public EvaluationException()
     {
         super();
@@ -47,7 +45,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public EvaluationException(String message)
     {
         super(message);
@@ -56,7 +53,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public EvaluationException(String message, Throwable cause)
     {
         super(message, cause);
@@ -65,7 +61,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public EvaluationException(Throwable cause)
     {
         super(cause);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java Fri Nov 20 03:15:53 2009
@@ -27,7 +27,6 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public abstract class MethodBinding
 {
 
@@ -37,7 +36,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public MethodBinding()
     {
     }
@@ -49,7 +47,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public String getExpressionString()
     {
         return null;
@@ -58,13 +55,11 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract Class getType(FacesContext facescontext) throws MethodNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract Object invoke(FacesContext facescontext, Object aobj[]) throws EvaluationException,
         MethodNotFoundException;
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java Fri Nov 20 03:15:53 2009
@@ -25,7 +25,6 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public class MethodNotFoundException extends EvaluationException
 {
     private static final long serialVersionUID = 7107789255726890536L;
@@ -36,7 +35,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public MethodNotFoundException()
     {
         super();
@@ -45,7 +43,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public MethodNotFoundException(String message)
     {
         super(message);
@@ -54,7 +51,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public MethodNotFoundException(String message, Throwable cause)
     {
         super(message, cause);
@@ -63,7 +59,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public MethodNotFoundException(Throwable cause)
     {
         super(cause);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java Fri Nov 20 03:15:53 2009
@@ -25,7 +25,6 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public class PropertyNotFoundException extends EvaluationException
 {
     private static final long serialVersionUID = -7271529989175141594L;
@@ -36,7 +35,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public PropertyNotFoundException()
     {
         super();
@@ -45,7 +43,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public PropertyNotFoundException(String message)
     {
         super(message);
@@ -54,7 +51,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public PropertyNotFoundException(String message, Throwable cause)
     {
         super(message, cause);
@@ -63,7 +59,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public PropertyNotFoundException(Throwable cause)
     {
         super(cause);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyResolver.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyResolver.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyResolver.java Fri Nov 20 03:15:53 2009
@@ -29,14 +29,12 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public abstract class PropertyResolver
 {
 
     /**
      * @deprecated
      */
-    @Deprecated
     public PropertyResolver()
     {
     }
@@ -48,7 +46,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract Class getType(Object base, int index) throws EvaluationException, PropertyNotFoundException;
 
     /**
@@ -66,7 +63,6 @@
      *            must be of type String, must not be null and must not be an empty string.
      * @deprecated
      */
-    @Deprecated
     @SuppressWarnings("unchecked")
     public abstract Class getType(Object base, java.lang.Object property) throws EvaluationException,
         PropertyNotFoundException;
@@ -83,7 +79,6 @@
      *             if the base object is not an Array or List.
      * @deprecated
      */
-    @Deprecated
     public abstract Object getValue(Object base, int index) throws EvaluationException, PropertyNotFoundException;
 
     /**
@@ -98,20 +93,17 @@
      *             if the provided object does not have the specified property.
      * @deprecated
      */
-    @Deprecated
     public abstract Object getValue(Object base, java.lang.Object property) throws EvaluationException,
         PropertyNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract boolean isReadOnly(Object base, int index) throws EvaluationException, PropertyNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract boolean isReadOnly(Object base, java.lang.Object property) throws EvaluationException,
         PropertyNotFoundException;
 
@@ -127,7 +119,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract void setValue(Object base, int index, java.lang.Object value) throws EvaluationException,
         PropertyNotFoundException;
 
@@ -136,7 +127,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public abstract void setValue(Object base, Object property, java.lang.Object value) throws EvaluationException,
         PropertyNotFoundException;
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java Fri Nov 20 03:15:53 2009
@@ -25,7 +25,6 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public class ReferenceSyntaxException extends EvaluationException
 {
     private static final long serialVersionUID = -2099185257291689817L;
@@ -36,7 +35,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public ReferenceSyntaxException()
     {
         super();
@@ -45,7 +43,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public ReferenceSyntaxException(String message)
     {
         super(message);
@@ -54,7 +51,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public ReferenceSyntaxException(String message, Throwable cause)
     {
         super(message, cause);
@@ -63,7 +59,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public ReferenceSyntaxException(Throwable cause)
     {
         super(cause);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/ValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/ValueBinding.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/ValueBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/ValueBinding.java Fri Nov 20 03:15:53 2009
@@ -27,13 +27,11 @@
  * @version $Revision$ $Date$
  * @deprecated
  */
-@Deprecated
 public abstract class ValueBinding
 {
     /**
      * @deprecated
      */
-    @Deprecated
     public String getExpressionString()
     {
         return null;
@@ -42,25 +40,21 @@
     /**
      * @deprecated
      */
-    @Deprecated
     abstract public Class getType(FacesContext facesContext) throws EvaluationException, PropertyNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract Object getValue(FacesContext facesContext) throws EvaluationException, PropertyNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract boolean isReadOnly(FacesContext facesContext) throws EvaluationException, PropertyNotFoundException;
 
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract void setValue(FacesContext facesContext, Object value) throws EvaluationException,
         PropertyNotFoundException;
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java Fri Nov 20 03:15:53 2009
@@ -28,7 +28,6 @@
  * 
  * @deprecated
  */
-@Deprecated
 public abstract class VariableResolver
 {
     // FIELDS
@@ -37,7 +36,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public VariableResolver()
     {
     }
@@ -46,6 +44,5 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public abstract Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException;
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java Fri Nov 20 03:15:53 2009
@@ -19,6 +19,7 @@
 package javax.faces.event;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -31,10 +32,11 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Inherited
 public @interface ListenerFor
 {
     public Class<? extends SystemEvent> systemEventClass();
 
     // FIXME: Spec is not Java 5 compliant, specified signature is Class sourceClass()
-    public Class<?> sourceClass() default Void.class;;
+    public Class sourceClass() default Void.class;;
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenersFor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenersFor.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenersFor.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenersFor.java Fri Nov 20 03:15:53 2009
@@ -19,6 +19,7 @@
 package javax.faces.event;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -31,6 +32,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Inherited
 public @interface ListenersFor
 {
     public ListenerFor[] value();

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java Fri Nov 20 03:15:53 2009
@@ -71,7 +71,6 @@
      * @throws IOException 
      * @deprecated
      */
-    @Deprecated
     public void writeState(FacesContext context, StateManager.SerializedView state) throws IOException
     {
         // does nothing as per JSF 1.2 javadoc
@@ -105,7 +104,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public Object getTreeStructureToRestore(FacesContext context, String viewId)
     {
         return null;
@@ -114,7 +112,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public Object getComponentStateToRestore(FacesContext context)
     {
         return null;

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/Validator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/Validator.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/Validator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/Validator.java Fri Nov 20 03:15:53 2009
@@ -34,7 +34,6 @@
     /**
      * @deprecated
      */
-    @Deprecated
     public static final String NOT_IN_RANGE_MESSAGE_ID = "javax.faces.validator.NOT_IN_RANGE";
 
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException;

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java Fri Nov 20 03:15:53 2009
@@ -97,7 +97,7 @@
      * {@inheritDoc}
      */
     @Override
-    protected MetaRuleset createMetaRuleset(Class<?> type)
+    protected MetaRuleset createMetaRuleset(Class type)
     {
         return getTagHandlerDelegate().createMetaRuleset(type);
     }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java Fri Nov 20 03:15:53 2009
@@ -28,7 +28,7 @@
  */
 public abstract class MetaTagHandler extends TagHandler
 {
-    private Class<?> _lastType = Object.class;
+    private Class _lastType = Object.class;
 
     private Metadata _mapper;
 
@@ -45,7 +45,7 @@
      * 
      * FIXME: EG _ GENERIC
      */
-    protected abstract MetaRuleset createMetaRuleset(Class<?> type);
+    protected abstract MetaRuleset createMetaRuleset(Class type);
 
     /**
      * Invoking/extending this method will cause the results of the created MetaRuleset to auto-wire state to 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetadataTarget.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetadataTarget.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetadataTarget.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetadataTarget.java Fri Nov 20 03:15:53 2009
@@ -41,7 +41,7 @@
      * @param name
      * @return
      */
-    public abstract Class<?> getPropertyType(String name);
+    public abstract Class getPropertyType(String name);
 
     /**
      * @param name
@@ -52,7 +52,7 @@
     /**
      * @return
      */
-    public abstract Class<?> getTargetClass();
+    public abstract Class getTargetClass();
 
     /**
      * @param name
@@ -64,5 +64,5 @@
      * @param type
      * @return
      */
-    public abstract boolean isTargetInstanceOf(Class<?> type);
+    public abstract boolean isTargetInstanceOf(Class type);
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java Fri Nov 20 03:15:53 2009
@@ -89,7 +89,7 @@
      *            parameter type
      * @return a MethodExpression instance
      */
-    public abstract MethodExpression getMethodExpression(FaceletContext ctx, Class<?> type, Class<?>[] paramTypes);
+    public abstract MethodExpression getMethodExpression(FaceletContext ctx, Class type, Class[] paramTypes);
 
     /**
      * The resolved Namespace for this attribute
@@ -121,7 +121,7 @@
      *            expected return type
      * @return Object value of this attribute
      */
-    public abstract Object getObject(FaceletContext ctx, Class<?> type);
+    public abstract Object getObject(FaceletContext ctx, Class type);
 
     /**
      * The qualified name for this attribute
@@ -158,7 +158,7 @@
      *            expected return type
      * @return ValueExpression instance
      */
-    public abstract ValueExpression getValueExpression(FaceletContext ctx, Class<?> type);
+    public abstract ValueExpression getValueExpression(FaceletContext ctx, Class type);
 
     /**
      * If this TagAttribute is literal (not #{..} or ${..})

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java Fri Nov 20 03:15:53 2009
@@ -33,5 +33,5 @@
 {
     public abstract void apply(FaceletContext ctx, UIComponent comp) throws IOException;
     
-    public abstract MetaRuleset createMetaRuleset(Class<?> type);
+    public abstract MetaRuleset createMetaRuleset(Class type);
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java Fri Nov 20 03:15:53 2009
@@ -32,7 +32,6 @@
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-@Deprecated
 public class AttributeTag extends TagSupport
 {
     private static final long serialVersionUID = 3147657100171678632L;
@@ -43,7 +42,6 @@
      * @deprecated
      * @param name
      */
-    @Deprecated
     public void setName(String name)
     {
         _name = name;
@@ -53,7 +51,6 @@
      * @deprecated
      * @param value
      */
-    @Deprecated
     public void setValue(String value)
     {
         _value = value;
@@ -63,7 +60,6 @@
      * @deprecated
      */
     @Override
-    @Deprecated
     public int doStartTag() throws JspException
     {
         UIComponentTag componentTag = UIComponentTag.getParentUIComponentTag(pageContext);
@@ -91,7 +87,6 @@
      * @deprecated
      */
     @Override
-    @Deprecated
     public void release()
     {
         super.release();

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ConverterTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ConverterTag.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ConverterTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ConverterTag.java Fri Nov 20 03:15:53 2009
@@ -35,7 +35,6 @@
  * @version $Revision$ $Date$
  * @deprecated replaced by {@link ConverterELTag}
  */
-@Deprecated
 public class ConverterTag extends TagSupport
 {
     private static final long serialVersionUID = -6168345066829108081L;

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentBodyTag.java Fri Nov 20 03:15:53 2009
@@ -26,7 +26,6 @@
  * 
  * @deprecated replaced by {@link UIComponentELTag}
  */
-@Deprecated
 public abstract class UIComponentBodyTag extends UIComponentTag
 {
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java Fri Nov 20 03:15:53 2009
@@ -717,7 +717,6 @@
     /**
      * @deprecated the ResponseWriter is now set by {@link javax.faces.application.ViewHandler#renderView}
      */
-    @Deprecated
     protected void setupResponseWriter()
     {
     }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java Fri Nov 20 03:15:53 2009
@@ -43,7 +43,6 @@
  * 
  * @deprecated replaced by {@link UIComponentELTag}
  */
-@Deprecated
 public abstract class UIComponentTag extends UIComponentClassicTagBase
 {
 
@@ -90,7 +89,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public static UIComponentTag getParentUIComponentTag(PageContext pageContext)
     {
         UIComponentClassicTagBase parentTag = getParentUIComponentClassicTagBase(pageContext);

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java?rev=882395&r1=882394&r2=882395&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java Fri Nov 20 03:15:53 2009
@@ -36,7 +36,6 @@
  * 
  * @deprecated replaced by {@link ValidatorELTag}
  */
-@Deprecated
 public class ValidatorTag extends TagSupport
 {
     private static final long serialVersionUID = 8794036166323016663L;
@@ -123,7 +122,6 @@
      * 
      * @deprecated
      */
-    @Deprecated
     public void setBinding(java.lang.String binding) throws javax.servlet.jsp.JspException
     {
         if (binding != null && !UIComponentTag.isValueReference(binding))