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 2008/10/17 21:01:14 UTC
svn commit: r705710 - in /tiles: framework/branches/TILES_2_0_X/
framework/branches/TILES_2_0_X/src/site/apt/
framework/branches/TILES_2_0_X/src/site/apt/dev/
framework/branches/TILES_2_0_X/src/site/apt/migration/
framework/branches/TILES_2_0_X/src/sit...
Author: apetrelli
Date: Fri Oct 17 12:01:14 2008
New Revision: 705710
URL: http://svn.apache.org/viewvc?rev=705710&view=rev
Log:
TILES-284
Merge from trunk to TILES_2_0_X branch.
Upgraded to Maven Site plugin version 2.0-beta-8-SNAPSHOT.
Added some links to documentation.
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
tiles/framework/branches/TILES_2_0_X/pom.xml
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/ (props changed)
tiles/site/src/site/xdoc/index.xml
Propchange: tiles/framework/branches/TILES_2_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815,705699
Modified: tiles/framework/branches/TILES_2_0_X/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/pom.xml?rev=705710&r1=705709&r2=705710&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/pom.xml Fri Oct 17 12:01:14 2008
@@ -95,6 +95,11 @@
<version>1.4.0</version>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-8-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815,705699
Propchange: tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 12:01:14 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815,705699
Modified: tiles/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/index.xml?rev=705710&r1=705709&r2=705710&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/index.xml (original)
+++ tiles/site/src/site/xdoc/index.xml Fri Oct 17 12:01:14 2008
@@ -43,7 +43,7 @@
<ul>
<li><a href="download.html">Download</a></li>
<li><a href="download.html#maven-repo">Maven Repository</a></li>
- <li><a href="download.html#docs">Documentation</a></li>
+ <li><a href="/2.0/framework/index.html">Documentation</a></li>
<li><a href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10160&styleName=Html&version=21862">Release Notes</a></li>
</ul>
</span>
@@ -58,7 +58,7 @@
<ul>
<li><a href="download-21.html">Download</a></li>
<li><a href="download-21.html#maven-repo">Maven Repository</a></li>
- <li><a href="download-21.html#docs">Documentation</a></li>
+ <li><a href="/framework/index.html">Documentation</a></li>
<li><a href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10160&styleName=Html&version=21831">Release Notes</a></li>
</ul>
</span>
@@ -99,6 +99,10 @@
such as <a href="http://struts.apache.org/">Struts 2</a> and
<a href="http://shale.apache.org/">Shale</a>.</p>
+ <ul>
+ <li><a href="/2.0/framework/index.html">Tiles 2.0 Documentation</a></li>
+ <li><a href="/framework/index.html">Tiles 2.1 Documentation</a></li>
+ </ul>
<a name="downloads"/>
</section>
</body>