You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/09/21 20:31:12 UTC
svn commit: r817362 - in /tiles/framework/branches/TILES_2_1_X: ./
tiles-core/src/main/java/org/apache/tiles/evaluator/el/
tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ tiles-test/
Author: apetrelli
Date: Mon Sep 21 18:31:12 2009
New Revision: 817362
URL: http://svn.apache.org/viewvc?rev=817362&view=rev
Log:
TILES-464
Merge from trunk to TILES_2_1_X.
Applied patch by Konrad Garus.
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-test/ (props changed)
Propchange: tiles/framework/branches/TILES_2_1_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 18:31:12 2009
@@ -1 +1 @@
-/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761
+/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=817362&r1=817361&r2=817362&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Mon Sep 21 18:31:12 2009
@@ -99,7 +99,7 @@
} else {
efFactory = (ExpressionFactoryFactory) ClassUtil
.instantiate(
- "org.apache.tiles.evaluator.el.JspExpressionFactoryFactory", true);
+ "org.apache.tiles.jsp.evaluator.el.JspExpressionFactoryFactory", true);
if (efFactory == null) {
efFactory = new TomcatExpressionFactoryFactory();
}
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 18:31:12 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*,817357*
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 18:31:12 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 18:31:12 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761,817357