organized expression language support

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() {

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;
 

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() {

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 {
 

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;
     }
 

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}.

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}.