Deprecate OGNL support

Issue: SWF-1627

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 {
 

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 {
 

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 {

src/reference/el.xml

@@ -121,6 +121,11 @@
 		</sect2>
 		<sect2 xml:id="el-ognl">
 			<title>OGNL</title>
+			<note>
+				<para>
+					OGNL support is deprecated as of Web Flow version 2.4.
+				</para>
+			</note>
 			<para>
 				<link xl:href="http://www.ognl.org">OGNL</link> is the third supported expression language.
 				OGNL is the EL most familiar to Web Flow version 1.0 users.

src/reference/whatsnew.xml

@@ -78,6 +78,12 @@
 				See <xref linkend="portlet-jsf"/>.
 			</para>
 		</sect2>
+		<sect2 xml:id="whatsnew-deprecation">
+			<title>Deprecations</title>
+			<para>
+				OGNL support is now deprecated.
+			</para>
+		</sect2>
 	</sect1>
 	<sect1 xml:id="whatsnew-swf-230">
 		<title>Spring Web Flow 2.3</title>