Author: apetrelli
Date: Mon Sep 14 18:18:50 2009
New Revision: 814766
URL: http://svn.apache.org/viewvc?rev=814766&view=rev
Log:
TILES-462
Merge from trunk to TILES_2_1_X branch.
Fixed typo.
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/configuration.apt
tiles/framework/branches/TILES_2_1_X/tiles-core/ (props changed)
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 14 18:18:50 2009
@@ -1 +1 @@
-/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331
+/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761
Modified:
tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/configuration.apt?rev=814766&r1=814765&r2=814766&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/configuration.apt
(original)
+++
tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/configuration.apt
Mon Sep 14 18:18:50 2009
@@ -155,7 +155,7 @@
*-----------------------+-----------------------------------------------+
| <<<\<put\>>>> | <<<\<put-attribute\>>>> |
*-----------------------+-----------------------------------------------+
-| <<<\<putList\>>>> | <<<\<put-attribute-list\>>>> |
+| <<<\<putList\>>>> | <<<\<put-list-attribute\>>>> |
*-----------------------+-----------------------------------------------+
| <<<\<add\>>>> | <<<\<add-attribute\>>>> [2] |
| | <<<\<add-list-attribute\>>>> [3] |
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 18:18:50 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331
+/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331,814761
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 14 18:18:50 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*
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*
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 14 18:18:50 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
+/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
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 18:18:50 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761
