From 047ad0e46dddccb7e43f458cc407aafa778ae17c Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 31 Jul 2007 16:31:39 +0000
Subject: [PATCH] organized expression language support

---
 spring-binding/.classpath                                 | 2 ++
 .../{support => el}/DefaultELContextFactory.java          | 2 +-
 .../expression/{support => el}/DefaultELResolver.java     | 2 +-
 .../expression/{support => el}/DelegatingELContext.java   | 4 ++--
 .../expression/{support => el}/ELContextFactory.java      | 2 +-
 .../binding/expression/{support => el}/ELExpression.java  | 6 +++---
 .../JBossELExpressionParser.java}                         | 4 ++--
 .../expression/{support => ognl}/OgnlExpression.java      | 2 +-
 .../{support => ognl}/OgnlExpressionParser.java           | 3 ++-
 .../expression/support/ELContextDelegationTests.java      | 5 ++++-
 .../expression/support/ELMethodExpressionTests.java       | 3 ++-
 .../binding/expression/support/ELMethodParsingTests.java  | 5 +++--
 .../expression/support/OgnlExpressionParserTests.java     | 3 ++-
 .../binding/expression/support/SimpleExpressionTests.java | 8 +++++---
 .../binding/mapping/RequiredMappingTests.java             | 2 +-
 .../binding/method/TextToMethodSignatureTests.java        | 2 +-
 16 files changed, 33 insertions(+), 22 deletions(-)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => el}/DefaultELContextFactory.java (91%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => el}/DefaultELResolver.java (97%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => el}/DelegatingELContext.java (96%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => el}/ELContextFactory.java (86%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => el}/ELExpression.java (94%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support/ELExpressionParser.java => el/JBossELExpressionParser.java} (97%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => ognl}/OgnlExpression.java (98%)
 rename spring-binding/src/main/java/org/springframework/binding/expression/{support => ognl}/OgnlExpressionParser.java (93%)

diff --git a/spring-binding/.classpath b/spring-binding/.classpath
index 7786252f..34458de4 100644
--- a/spring-binding/.classpath
+++ b/spring-binding/.classpath
@@ -11,5 +11,7 @@
 	<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="/spring/src"/>
 	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
+	<classpathentry kind="lib" path="lib/global/el-api.jar"/>
+	<classpathentry kind="lib" path="lib/global/jboss-el.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
similarity index 91%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELContextFactory.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
index 5ea94e34..c9ddf337 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELContextFactory.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import javax.el.ELContext;
 
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELResolver.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
similarity index 97%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELResolver.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
index 53e60091..5db9d1ea 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/DefaultELResolver.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import javax.el.ArrayELResolver;
 import javax.el.BeanELResolver;
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/DelegatingELContext.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DelegatingELContext.java
similarity index 96%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/DelegatingELContext.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/DelegatingELContext.java
index d4867f6b..12e0f901 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/DelegatingELContext.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DelegatingELContext.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -11,7 +11,7 @@ import javax.el.FunctionMapper;
 import javax.el.VariableMapper;
 
 /**
- * An {@link ELContext} implementation that is meant to aggregate the {@link ELResolver}s of preexisting
+ * An {@link ELContext} implementation that is meant to aggregate the {@link ELResolver}s of pre-existing
  * {@link ELContext}s. Can also be used standalone if no other {@link ELContext} exists in the current environment.
  * 
  * Note - Using this context standalone requires Java 5 or higher.
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
similarity index 86%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/ELContextFactory.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
index c0fe5f0d..5aad825f 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELContextFactory.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import javax.el.ELContext;
 
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
similarity index 94%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpression.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
index 8c11df49..46f95041 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpression.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import javax.el.ELContext;
 import javax.el.ELException;
@@ -16,9 +16,9 @@ import org.springframework.binding.expression.SettableExpression;
  */
 public class ELExpression implements SettableExpression {
 
-    ELContextFactory factory;
+    private ELContextFactory factory;
 
-    ValueExpression expression;
+    private ValueExpression expression;
 
     public ELExpression(ELContextFactory factory, ValueExpression expression) {
 	this.factory = factory;
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/JBossELExpressionParser.java
similarity index 97%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpressionParser.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/el/JBossELExpressionParser.java
index a5ed15e0..b493ddef 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/ELExpressionParser.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/JBossELExpressionParser.java
@@ -1,4 +1,4 @@
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.el;
 
 import javax.el.ELContext;
 import javax.el.ELException;
@@ -17,7 +17,7 @@ import org.springframework.binding.expression.SettableExpression;
  * 
  * @author Jeremy Grelle
  */
-public class ELExpressionParser implements ExpressionParser {
+public class JBossELExpressionParser implements ExpressionParser {
 
     /**
      * The expression prefix for deferred EL expressions.
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
similarity index 98%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpression.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
index 3f6d2fd4..86105f26 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpression.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.ognl;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
similarity index 93%
rename from spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpressionParser.java
rename to spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
index 4066423f..5b21dfe6 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/support/OgnlExpressionParser.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.binding.expression.support;
+package org.springframework.binding.expression.ognl;
 
 import ognl.Ognl;
 import ognl.OgnlException;
@@ -23,6 +23,7 @@ import ognl.PropertyAccessor;
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.ParserException;
 import org.springframework.binding.expression.SettableExpression;
+import org.springframework.binding.expression.support.AbstractExpressionParser;
 
 /**
  * An expression parser that parses Ognl expressions.
diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java
index e535d3d5..90d78d07 100644
--- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java
@@ -11,6 +11,9 @@ import javax.el.VariableMapper;
 import junit.framework.TestCase;
 
 import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.binding.expression.el.DelegatingELContext;
+import org.springframework.binding.expression.el.ELContextFactory;
+import org.springframework.binding.expression.el.JBossELExpressionParser;
 
 /**
  * Tests to verify the delegation behavior of ELContextImpl.
@@ -34,7 +37,7 @@ public class ELContextDelegationTests extends TestCase {
 	assertEquals(Boolean.TRUE, expressionParser.parseExpression("#{bean.flag}").evaluate(null, null));
     }
 
-    private class DelegatingELExpressionParser extends ELExpressionParser {
+    private class DelegatingELExpressionParser extends JBossELExpressionParser {
 
 	protected ELContextFactory getELContextFactory() {
 	    ELContextFactory stubFactory = new ELContextFactory() {
diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java
index 22b2afc3..a1e51b6d 100644
--- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java
@@ -3,6 +3,7 @@ package org.springframework.binding.expression.support;
 import java.util.HashMap;
 import java.util.Map;
 import org.easymock.MockControl;
+import org.springframework.binding.expression.el.JBossELExpressionParser;
 
 import junit.framework.TestCase;
 
@@ -14,7 +15,7 @@ import junit.framework.TestCase;
  */
 public class ELMethodExpressionTests extends TestCase {
 
-	ELExpressionParser parser = new ELExpressionParser();
+	JBossELExpressionParser parser = new JBossELExpressionParser();
 
 	Map context;
 
diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java
index 45ab6bd4..35d29c55 100644
--- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java
@@ -3,13 +3,14 @@ package org.springframework.binding.expression.support;
 import junit.framework.TestCase;
 
 import org.springframework.binding.expression.Expression;
+import org.springframework.binding.expression.el.JBossELExpressionParser;
 
 public class ELMethodParsingTests extends TestCase {
 
-	ELExpressionParser parser;
+	JBossELExpressionParser parser;
 
 	protected void setUp() throws Exception {
-		parser = new ELExpressionParser();
+		parser = new JBossELExpressionParser();
 	}
 
 	public void testEmptyMethod() {
diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java
index 0c64dc18..f0042061 100644
--- a/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java
@@ -19,9 +19,10 @@ import junit.framework.TestCase;
 
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.ParserException;
+import org.springframework.binding.expression.ognl.OgnlExpressionParser;
 
 /**
- * Unit tests for {@link org.springframework.binding.expression.support.OgnlExpressionParser}.
+ * Unit tests for {@link org.springframework.binding.expression.ognl.OgnlExpressionParser}.
  */
 public class OgnlExpressionParserTests extends TestCase {
 
diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java
index 7a22ac23..47cef02b 100644
--- a/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java
@@ -21,6 +21,8 @@ import java.util.List;
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.ExpressionParser;
 import org.springframework.binding.expression.ParserException;
+import org.springframework.binding.expression.el.JBossELExpressionParser;
+import org.springframework.binding.expression.ognl.OgnlExpressionParser;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -46,9 +48,9 @@ public class SimpleExpressionTests extends TestCase {
 	suite.addTest(new SimpleExpressionTests("testGetValue", new BeanWrapperExpressionParser(), "$"));
 	suite.addTest(new SimpleExpressionTests("testSetValue", new BeanWrapperExpressionParser(), "$"));
 	suite.addTest(new SimpleExpressionTests("testSyntaxError", new BeanWrapperExpressionParser(), "$"));
-	suite.addTest(new SimpleExpressionTests("testGetValue", new ELExpressionParser(), "#"));
-	suite.addTest(new SimpleExpressionTests("testSetValue", new ELExpressionParser(), "#"));
-	suite.addTest(new SimpleExpressionTests("testSyntaxError", new ELExpressionParser(), "#"));
+	suite.addTest(new SimpleExpressionTests("testGetValue", new JBossELExpressionParser(), "#"));
+	suite.addTest(new SimpleExpressionTests("testSetValue", new JBossELExpressionParser(), "#"));
+	suite.addTest(new SimpleExpressionTests("testSyntaxError", new JBossELExpressionParser(), "#"));
 	return suite;
     }
 
diff --git a/spring-binding/src/test/java/org/springframework/binding/mapping/RequiredMappingTests.java b/spring-binding/src/test/java/org/springframework/binding/mapping/RequiredMappingTests.java
index f83ec8aa..243d544b 100644
--- a/spring-binding/src/test/java/org/springframework/binding/mapping/RequiredMappingTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/mapping/RequiredMappingTests.java
@@ -19,7 +19,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.OgnlExpressionParser;
+import org.springframework.binding.expression.ognl.OgnlExpressionParser;
 
 /**
  * Unit tests for the {@link org.springframework.binding.mapping.RequiredMapping}.
diff --git a/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java b/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java
index 339eae92..fbda9507 100644
--- a/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.support.DefaultConversionService;
 import org.springframework.binding.convert.support.TextToExpression;
-import org.springframework.binding.expression.support.OgnlExpressionParser;
+import org.springframework.binding.expression.ognl.OgnlExpressionParser;
 
 /**
  * Test case for {@link TextToMethodSignature}.