Author: apetrelli
Date: Mon Sep 21 18:16:20 2009
New Revision: 817357
URL: http://svn.apache.org/viewvc?rev=817357&view=rev
Log:
TILES-464
JspExpressionFactoryFactory is now instantiated with a simple "new" in 2.2.x.
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.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=817357&r1=817356&r2=817357&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
Mon Sep 21 18:16:20 2009
@@ -36,7 +36,6 @@
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
-import org.apache.tiles.evaluator.EvaluationException;
import org.apache.tiles.reflect.ClassUtil;
/**
@@ -98,14 +97,7 @@
efFactory = (ExpressionFactoryFactory) ClassUtil
.instantiate(expressionFactoryClassName);
} else {
- efFactory = (ExpressionFactoryFactory) ClassUtil
- .instantiate(
-
"org.apache.tiles.evaluator.el.JspExpressionFactoryFactory", true);
- if (efFactory == null) {
- throw new EvaluationException(
- "Cannot instantiate JspExpressionFactoryFactory, "
- + "please add tiles-jsp.jar file in your
classpath");
- }
+ efFactory = new JspExpressionFactoryFactory();
}
if (efFactory instanceof TilesApplicationContextAware) {
((TilesApplicationContextAware) efFactory)
