Author: apetrelli
Date: Fri Sep 12 10:56:40 2008
New Revision: 694756
URL: http://svn.apache.org/viewvc?rev=694756&view=rev
Log:
TILES-284
Merge from trunk to TILES_2_0_X branch.
Fixed home page of the project.
Added link to the index page of the project.
Added:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/index.xml
- copied unchanged from r694754,
tiles/framework/trunk/src/site/xdoc/index.xml
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
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/quickstart/ (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/site.xml
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)
Propchange: tiles/framework/branches/TILES_2_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/dev:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/migration:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/quickstart:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/apt/tutorial:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754
Modified: tiles/framework/branches/TILES_2_0_X/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/site.xml?rev=694756&r1=694755&r2=694756&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/site.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/site.xml Fri Sep 12 10:56:40
2008
@@ -44,6 +44,9 @@
<item
name="Home"
href="../index.html"/>
+ <item
+ name="Tiles project start page"
+ href="./index.html"/>
</menu>
<menu name="Documentation">
<item
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754
Propchange:
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 10:56:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754
