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 2015/07/11 01:29:53 UTC
svn commit: r1690321 - in /myfaces/core/trunk/api/src/main/java/javax/faces:
application/ bean/ component/ el/ validator/ view/facelets/ webapp/
Author: lu4242
Date: Fri Jul 10 23:29:52 2015
New Revision: 1690321
URL: http://svn.apache.org/r1690321
Log:
MYFACES-4000 Some MyFaces JSF 2.2 API signatures do not match the Java EE 7 API (thanks to Jay Sartoris for provide this patch)
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java
myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManager.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/ReferencedBean.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewAction.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/validator/FacesValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ResourceResolver.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/UIComponentTag.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/ValidatorTag.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java Fri Jul 10 23:29:52 2015
@@ -130,6 +130,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public UIComponent createComponent(ValueBinding componentBinding, FacesContext context, String componentType)
throws FacesException
{
@@ -163,6 +164,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public MethodBinding createMethodBinding(String ref, Class<?>[] params) throws ReferenceSyntaxException
{
return getWrapped().createMethodBinding(ref, params);
@@ -181,6 +183,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public <T> T evaluateExpressionGet(FacesContext context, String expression, Class<? extends T> expectedType)
throws ELException
{
@@ -272,6 +275,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public PropertyResolver getPropertyResolver()
{
return getWrapped().getPropertyResolver();
@@ -308,6 +312,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public VariableResolver getVariableResolver()
{
return getWrapped().getVariableResolver();
@@ -371,6 +376,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public void setPropertyResolver(PropertyResolver resolver)
{
getWrapped().setPropertyResolver(resolver);
@@ -395,6 +401,7 @@ public abstract class ApplicationWrapper
}
@Override
+ @Deprecated
public void setVariableResolver(VariableResolver resolver)
{
getWrapped().setVariableResolver(resolver);
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -148,6 +148,7 @@ public abstract class StateManager
*
* @since 1.2
*/
+ @Deprecated
public Object saveView(FacesContext context)
{
StateManager.SerializedView serializedView = saveSerializedView(context);
@@ -262,6 +263,7 @@ public abstract class StateManager
return context.getRenderKit().getResponseStateManager().getViewState(context, saveView(context));
}
+ @Deprecated
public abstract UIViewRoot restoreView(FacesContext context, String viewId, String renderKitId);
/**
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -28,7 +27,6 @@ import java.lang.annotation.Target;
*
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,11 +26,10 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
public @interface CustomScoped
{
- public String value() default "";
+ public String value();
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java Fri Jul 10 23:29:52 2015
@@ -18,19 +18,15 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-@Inherited
+@Target(ElementType.FIELD)
public @interface ManagedProperty
{
/**
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ReferencedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ReferencedBean.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ReferencedBean.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ReferencedBean.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.CLASS)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java Fri Jul 10 23:29:52 2015
@@ -18,7 +18,6 @@
*/
package javax.faces.bean;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -27,7 +26,6 @@ import java.lang.annotation.Target;
/**
* @since 2.0
*/
-@Documented
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Inherited
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -193,9 +193,12 @@ public abstract class UIComponent
/**
* @since 2.2
* @param create
- * @return
+ * @return A {@code Map} instance, or {@code null}.
*/
- public abstract Map<String,Object> getPassThroughAttributes(boolean create);
+ public Map<String,Object> getPassThroughAttributes(boolean create)
+ {
+ return Collections.emptyMap();
+ }
/**
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewAction.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewAction.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewAction.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewAction.java Fri Jul 10 23:29:52 2015
@@ -193,6 +193,7 @@ public class UIViewAction extends UIComp
context.getAttributes().put(EVENT_COUNT_KEY, count);
}
+ @Deprecated
public MethodBinding getAction()
{
MethodExpression actionExpression = getActionExpression();
@@ -211,6 +212,7 @@ public class UIViewAction extends UIComp
/**
* @deprecated Use setActionExpression instead.
*/
+ @Deprecated
public void setAction(MethodBinding action)
{
if (action != null)
@@ -234,17 +236,6 @@ public class UIViewAction extends UIComp
getStateHelper().put(PropertyKeys.immediate, immediate );
}
- @JSFProperty
- public Object getValue()
- {
- return getStateHelper().eval(PropertyKeys.value);
- }
-
- public void setValue(Object value)
- {
- getStateHelper().put(PropertyKeys.value, value );
- }
-
@JSFProperty(stateHolder=true, returnSignature = "java.lang.Object", jspName = "action", clientEvent="action")
public MethodExpression getActionExpression()
{
@@ -256,6 +247,7 @@ public class UIViewAction extends UIComp
getStateHelper().put(PropertyKeys.actionExpression, actionExpression);
}
+ @Deprecated
@JSFProperty(stateHolder=true, returnSignature = "void", methodSignature = "javax.faces.event.ActionEvent")
public MethodBinding getActionListener()
{
@@ -265,6 +257,7 @@ public class UIViewAction extends UIComp
/**
* @deprecated
*/
+ @Deprecated
@JSFProperty(returnSignature="void",methodSignature="javax.faces.event.ActionEvent")
public void setActionListener(MethodBinding actionListener)
{
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -25,7 +25,6 @@ import javax.faces.FacesException;
*
* @deprecated
*/
-@Deprecated
public class EvaluationException extends FacesException
{
private static final long serialVersionUID = 4668524591042216006L;
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -25,7 +25,6 @@ import javax.faces.context.FacesContext;
*
* @deprecated
*/
-@Deprecated
public abstract class MethodBinding
{
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -23,7 +23,6 @@ package javax.faces.el;
*
* @deprecated
*/
-@Deprecated
public class MethodNotFoundException extends EvaluationException
{
private static final long serialVersionUID = 7107789255726890536L;
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -23,7 +23,6 @@ package javax.faces.el;
*
* @deprecated
*/
-@Deprecated
public class PropertyNotFoundException extends EvaluationException
{
private static final long serialVersionUID = -7271529989175141594L;
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -27,7 +27,6 @@ package javax.faces.el;
*
* @deprecated
*/
-@Deprecated
public abstract class PropertyResolver
{
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -23,7 +23,6 @@ package javax.faces.el;
*
* @deprecated
*/
-@Deprecated
public class ReferenceSyntaxException extends EvaluationException
{
private static final long serialVersionUID = -2099185257291689817L;
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -25,7 +25,6 @@ import javax.faces.context.FacesContext;
*
* @deprecated
*/
-@Deprecated
public abstract class ValueBinding
{
/**
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -25,7 +25,6 @@ import javax.faces.context.FacesContext;
*
* @deprecated
*/
-@Deprecated
public abstract class VariableResolver
{
// FIELDS
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/FacesValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/FacesValidator.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/FacesValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/FacesValidator.java Fri Jul 10 23:29:52 2015
@@ -36,7 +36,7 @@ public @interface FacesValidator
* The value of this annotation attribute is taken to be the <i>validator-id</i> with which instances of this class
* of component can be instantiated by calling {@link Application#createValidator(java.lang.String)}.
*/
- public String value();
+ public String value() default "";
/**
* If it is true, the validator is added to default list calling
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ResourceResolver.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ResourceResolver.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ResourceResolver.java Fri Jul 10 23:29:52 2015
@@ -21,6 +21,7 @@ package javax.faces.view.facelets;
import java.net.URL;
+@Deprecated
public abstract class ResourceResolver
{
public static final String FACELETS_RESOURCE_RESOLVER_PARAM_NAME = "javax.faces.FACELETS_RESOURCE_RESOLVER";
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -30,7 +30,6 @@ import javax.servlet.jsp.tagext.TagSuppo
*
* @deprecated the implementation of this clazz is now an implementation detail.
*/
-@Deprecated
public class AttributeTag extends TagSupport
{
private static final long serialVersionUID = 3147657100171678632L;
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -33,7 +33,6 @@ import javax.servlet.jsp.tagext.TagSuppo
*
* @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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -23,7 +23,6 @@ package javax.faces.webapp;
*
* @deprecated replaced by {@link UIComponentELTag}
*/
-@Deprecated
public abstract class UIComponentBodyTag extends UIComponentTag
{
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -39,7 +39,6 @@ import javax.servlet.jsp.tagext.Tag;
*
* @deprecated replaced by {@link UIComponentELTag}
*/
-@Deprecated
public abstract class UIComponentTag extends UIComponentClassicTagBase
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java?rev=1690321&r1=1690320&r2=1690321&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java Fri Jul 10 23:29:52 2015
@@ -32,8 +32,7 @@ import javax.servlet.jsp.tagext.JspTag;
public abstract class UIComponentTagBase extends Object implements JspTag
{
-
- protected static Logger log = Logger.getLogger("javax.faces.webapp");
+ protected static final Logger log = Logger.getLogger("javax.faces.webapp");
/**
* @see http://java.sun.com/javaee/5/docs/api/javax/faces/webapp/UIComponentTagBase.html#addChild(javax.faces.component.UIComponent)
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=1690321&r1=1690320&r2=1690321&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 Jul 10 23:29:52 2015
@@ -33,7 +33,6 @@ import javax.servlet.jsp.tagext.TagSuppo
*
* @deprecated replaced by {@link ValidatorELTag}
*/
-@Deprecated
public class ValidatorTag extends TagSupport
{
private static final long serialVersionUID = 8794036166323016663L;