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/06/17 22:37:38 UTC
svn commit: r785784 - in /tiles/framework/branches/TILES_2_1_X: ./
tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
Author: apetrelli
Date: Wed Jun 17 20:37:37 2009
New Revision: 785784
URL: http://svn.apache.org/viewvc?rev=785784&view=rev
Log:
TILES-416
Merge from trunk to TILES_2_1_X branch.
Fixed the definition order for the test of CachingLocaleURLDefinitionTest
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
Propchange: tiles/framework/branches/TILES_2_1_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 17 20:37:37 2009
@@ -1 +1 @@
-/tiles/framework/trunk:749981,761052,761061,772781
+/tiles/framework/trunk:749981,761052,761061,772781,785782
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml?rev=785784&r1=785783&r2=785784&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml Wed Jun 17 20:37:37 2009
@@ -45,6 +45,8 @@
<put-attribute name="body" value="doc.portal.body" />
</definition>
+ <definition name="test.def*.noAttribute" template="/test{1}.jsp" />
+
<!-- Never used on purpose, if there is the TILES-416 the test will fail -->
<definition name="test.def*" template="/test{1}.jsp">
<put-attribute name="country" value="default"/>
@@ -55,6 +57,4 @@
<put-attribute name="body" value="doc.portal.body" />
</definition>
- <definition name="test.def*.noAttribute" template="/test{1}.jsp" />
-
</tiles-definitions>