diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
index a42e2a17..adeffc12 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2012 the original author or authors.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,12 +34,15 @@ import org.springframework.binding.expression.EvaluationException;
import org.springframework.binding.expression.Expression;
import org.springframework.binding.expression.PropertyNotFoundException;
import org.springframework.binding.expression.ValueCoercionException;
+import org.springframework.binding.expression.spel.SpringELExpression;
/**
* Evaluates a parsed Ognl expression.
- *
+ *
* @author Keith Donald
* @author Scott Andrews
+ *
+ * @deprecated in favor of Spring EL, see {@link SpringELExpression}.
*/
class OgnlExpression implements Expression {
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
index 6f90c04c..8f797542 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2012 the original author or authors.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,12 +25,15 @@ import org.springframework.binding.convert.service.DefaultConversionService;
import org.springframework.binding.expression.Expression;
import org.springframework.binding.expression.ParserContext;
import org.springframework.binding.expression.ParserException;
+import org.springframework.binding.expression.spel.SpringELExpressionParser;
import org.springframework.binding.expression.support.AbstractExpressionParser;
/**
* An expression parser that parses Ognl expressions.
- *
+ *
* @author Keith Donald
+ *
+ * @deprecated in favor of Spring EL, see {@link SpringELExpressionParser}
*/
public class OgnlExpressionParser extends AbstractExpressionParser {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java
index cae3fa25..8b07641b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java
@@ -33,11 +33,14 @@ import org.springframework.webflow.core.collection.MutableAttributeMap;
import org.springframework.webflow.execution.Action;
import org.springframework.webflow.execution.AnnotatedAction;
import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.expression.spel.WebFlowSpringELExpressionParser;
/**
* An extension of {@link OgnlExpressionParser} that registers Web Flow-specific PropertyAccessors.
- *
+ *
* @author Keith Donald
+ *
+ * @deprecated in favor of Spring EL, see {@link WebFlowSpringELExpressionParser}
*/
@SuppressWarnings("rawtypes")
public class WebFlowOgnlExpressionParser extends OgnlExpressionParser {
diff --git a/src/reference/el.xml b/src/reference/el.xml
index 3a608627..67a6a310 100644
--- a/src/reference/el.xml
+++ b/src/reference/el.xml
@@ -121,6 +121,11 @@
OGNL
+
+
+ OGNL support is deprecated as of Web Flow version 2.4.
+
+
OGNL is the third supported expression language.
OGNL is the EL most familiar to Web Flow version 1.0 users.
diff --git a/src/reference/whatsnew.xml b/src/reference/whatsnew.xml
index a3de1615..53658da3 100644
--- a/src/reference/whatsnew.xml
+++ b/src/reference/whatsnew.xml
@@ -78,6 +78,12 @@
See .
+
+ Deprecations
+
+ OGNL support is now deprecated.
+
+ Spring Web Flow 2.3