organized expression language support

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;
 

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;

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.

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;
 

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;

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.

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;

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.