From 738c643592ffdad7a3d7f52a454b88728dc77259 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 4 Dec 2012 15:35:33 +0100 Subject: [PATCH] Deprecated JSF 1.1 VariableResolver implementations in favor of Spring-provided ELResolvers --- .../springframework/web/jsf/DelegatingVariableResolver.java | 3 +++ .../springframework/web/jsf/SpringBeanVariableResolver.java | 3 +++ .../web/jsf/WebApplicationContextVariableResolver.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java index 75ee530d965..cfc987dfdfc 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java @@ -69,7 +69,10 @@ import org.springframework.web.context.WebApplicationContext; * @since 1.1 * @see WebApplicationContextVariableResolver * @see FacesContextUtils#getRequiredWebApplicationContext + * @deprecated as of Spring 3.2, in favor of the JSF 1.2 based + * {@link org.springframework.web.jsf.el.SpringBeanFacesELResolver} */ +@Deprecated public class DelegatingVariableResolver extends VariableResolver { /** Logger available to subclasses */ diff --git a/spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java index fb174458c62..5292cfa5ccd 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java @@ -31,7 +31,10 @@ import javax.faces.el.VariableResolver; * @since 2.5 * @see WebApplicationContextVariableResolver * @see FacesContextUtils#getRequiredWebApplicationContext + * @deprecated as of Spring 3.2, in favor of the JSF 1.2 based + * {@link org.springframework.web.jsf.el.SpringBeanFacesELResolver} */ +@Deprecated public class SpringBeanVariableResolver extends DelegatingVariableResolver { public SpringBeanVariableResolver(VariableResolver originalVariableResolver) { diff --git a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java index 3005e37df1a..f66c4a56ee2 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java @@ -47,7 +47,10 @@ import org.springframework.web.context.WebApplicationContext; * @since 1.2.5 * @see DelegatingVariableResolver * @see FacesContextUtils#getWebApplicationContext + * @deprecated as of Spring 3.2, in favor of the JSF 1.2 based + * {@link org.springframework.web.jsf.el.WebApplicationContextFacesELResolver} */ +@Deprecated public class WebApplicationContextVariableResolver extends VariableResolver { /**