Author: apetrelli
Date: Sat Sep 19 13:28:38 2009
New Revision: 816921
URL: http://svn.apache.org/viewvc?rev=816921&view=rev
Log:
TILES-458
Refactoring of EL support.
Added:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/
- copied from r816358,
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
- copied, changed from r816358,
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/
- copied from r816358,
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/evaluator/el/
Removed:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/evaluator/el/
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
Sat Sep 19 13:28:38 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.lang.reflect.Method;
import java.util.HashMap;
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
Sat Sep 19 13:28:38 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import javax.el.ExpressionFactory;
Copied:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
(from r816358,
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java?p2=tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java&p1=tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java&r1=816358&r2=816921&rev=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
Sat Sep 19 13:28:38 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.jsp.evaluator.el;
+package org.apache.tiles.el;
import javax.el.ExpressionFactory;
import javax.servlet.ServletContext;
@@ -27,7 +27,6 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.evaluator.el.ExpressionFactoryFactory;
/**
* Uses the JSP 2.1 {...@link ExpressionFactory} to be used in Tiles.
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
(original)
+++
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
Sat Sep 19 13:28:38 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import javax.el.ExpressionFactory;
Modified:
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
(original)
+++
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.util.HashMap;
import java.util.Map;
@@ -29,6 +29,8 @@
import org.apache.tiles.Expression;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.el.ELAttributeEvaluator;
+import org.apache.tiles.el.TomcatExpressionFactoryFactory;
import org.easymock.EasyMock;
/**
Modified:
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
(original)
+++
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
@@ -31,6 +31,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.el.ELContextImpl;
+import org.apache.tiles.el.TilesContextBeanELResolver;
import org.easymock.EasyMock;
import junit.framework.TestCase;
@@ -240,7 +242,7 @@
/**
* Test method for
- * {...@link
org.apache.tiles.evaluator.el.TilesContextBeanELResolver#getObject(java.util.Map,
java.lang.String)}.
+ * {...@link
org.apache.tiles.el.TilesContextBeanELResolver#getObject(java.util.Map,
java.lang.String)}.
*/
public void testGetObject() {
Map<String, Object> map = new HashMap<String, Object>();
Modified:
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java?rev=816921&r1=816358&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
(original)
+++
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
Sat Sep 19 13:28:38 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.el;
+package org.apache.tiles.el;
import java.beans.FeatureDescriptor;
import java.beans.PropertyDescriptor;
@@ -33,6 +33,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.el.ELContextImpl;
+import org.apache.tiles.el.TilesContextELResolver;
import org.apache.tiles.reflect.ClassUtil;
import org.easymock.EasyMock;
Modified:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=816921&r1=816920&r2=816921&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Sat Sep 19 13:28:38 2009
@@ -53,11 +53,12 @@
import org.apache.tiles.definition.pattern.PrefixedPatternDefinitionResolver;
import
org.apache.tiles.definition.pattern.regexp.RegexpDefinitionPatternMatcherFactory;
import
org.apache.tiles.definition.pattern.wildcard.WildcardDefinitionPatternMatcherFactory;
+import org.apache.tiles.el.ELAttributeEvaluator;
+import org.apache.tiles.el.JspExpressionFactoryFactory;
+import org.apache.tiles.el.TilesContextBeanELResolver;
+import org.apache.tiles.el.TilesContextELResolver;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.el.ELAttributeEvaluator;
-import org.apache.tiles.evaluator.el.TilesContextBeanELResolver;
-import org.apache.tiles.evaluator.el.TilesContextELResolver;
import org.apache.tiles.evaluator.mvel.MVELAttributeEvaluator;
import org.apache.tiles.evaluator.mvel.TilesContextBeanVariableResolverFactory;
import org.apache.tiles.evaluator.mvel.TilesContextVariableResolverFactory;
@@ -76,7 +77,6 @@
import org.apache.tiles.freemarker.renderer.FreeMarkerAttributeRenderer;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.mgmt.CachingTilesContainer;
-import org.apache.tiles.jsp.evaluator.el.JspExpressionFactoryFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.util.URLUtil;
