Author: apetrelli
Date: Sun Dec 6 20:14:49 2009
New Revision: 887760
URL: http://svn.apache.org/viewvc?rev=887760&view=rev
Log:
TILES-488
Merge from trunk to TILES_2_1_X branch.
Corrected link to TLDDoc and DTDDoc.
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/index.xml
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 Sun Dec 6 20:14:49 2009
@@ -1,2 +1,2 @@
-/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641,831448
+/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641,831448,887758
/tiles/sandbox/trunk/tiles3:831431-831440
Modified: tiles/framework/branches/TILES_2_1_X/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/src/site/xdoc/index.xml?rev=887760&r1=887759&r2=887760&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/src/site/xdoc/index.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/src/site/xdoc/index.xml Sun Dec 6
20:14:49 2009
@@ -54,8 +54,8 @@
<li><a href="how-to/index.html">HOW-TOs</a></li>
<li><a href="config-reference.html">Configuration
Reference</a></li>
<li><a href="apidocs/index.html">Javadocs</a></li>
- <li><a href="tlddoc/index.html">Tag library documentation</a></li>
- <li><a href="dtddoc/index.html">Tiles definition file
documentation</a></li>
+ <li><a href="tiles-jsp/tlddoc/index.html">Tag library
documentation</a></li>
+ <li><a href="tiles-core/dtddoc/index.html">Tiles definition file
documentation</a></li>
<li><a href="http://cwiki.apache.org/TILES/";>Wiki</a></li>
</ul>
</subsection>
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:14:49 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331,814761,819630,819641,831448
+/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331,814761,819630,819641,831448,887758
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:14:49 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*,817357*,819630*,819641*,831448
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*,817357*,819630*,819641*,831448,887758
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 Sun Dec 6 20:14:49 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,817357,819630,819641,831448
+/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,819630,819641,831448,887758
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 20:14:49 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641,831448
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641,831448,887758
