Author: apetrelli
Date: Sun Oct 5 08:32:35 2008
New Revision: 701808
URL: http://svn.apache.org/viewvc?rev=701808&view=rev
Log:
TILES-315
Merge from trunk to TILES_2_0_X branch.
Quickstart removed.
Removed:
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/
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
(contents, 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/apt/tutorial/index.apt
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 Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754,700541
+/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807
Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt?rev=701808&r1=701807&r2=701808&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
(original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt Sun
Oct 5 08:32:35 2008
@@ -63,7 +63,6 @@
Usage
If you are using Tiles for the first time, read the
- {{{quickstart/index.html}Quickstart}} and the
{{{tutorial/index.html}Tutorial}}.
If you are migrating from Struts-Tiles, see the
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754,700541
+/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754,700541
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807
Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt?rev=701808&r1=701807&r2=701808&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
(original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt Sun
Oct 5 08:32:35 2008
@@ -26,20 +26,18 @@
This tutorial is intended to provide a help for first-time Tiles users.
Summary
-
- [[1]] {{{../quickstart/index.html}Quickstart}}
- [[2]] {{{pattern.html}The "composite view" pattern}}
+ [[1]] {{{pattern.html}The "composite view" pattern}}
- [[3]] {{{configuration.html}Configuring your web application}}
+ [[2]] {{{configuration.html}Configuring your web application}}
- [[4]] {{{basic/index.html}Basic Usage}}
+ [[3]] {{{basic/index.html}Basic Usage}}
[[1]] {{{basic/concepts.html}Tiles Concepts}}
[[2]] {{{basic/pages.html}Creating Tiles Pages}}
- [[5]] {{{advanced/index.html}Advanced Topics}}
+ [[4]] {{{advanced/index.html}Advanced Topics}}
[[1]] {{{advanced/nesting-extending.html}Nesting and Extending
Definitions}}
@@ -57,15 +55,14 @@
[[8]] {{{advanced/menu.html}Menu-ing support}}
- [[6]] {{{integration/index.html}Integration with other technologies}}
+ [[5]] {{{integration/index.html}Integration with other technologies}}
[[1]] {{{integration/frameworks.html}Integration with other
frameworks}}
[[2]] {{{integration/view.html}Integration with other view
technologies}}
- [[7]] {{{extension/index.html}Extending Tiles}}
+ [[6]] {{{extension/index.html}Extending Tiles}}
[[1]] {{{extension/points.html}Tiles Extension Points}}
[[2]] {{{extension/url_definitions_factory.html}Customizing
<<<UrlDefinitionsFactory>>>}}
-
\ No newline at end of file
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807
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=701808&r1=701807&r2=701808&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 Sun Oct 5 08:32:35
2008
@@ -57,9 +57,6 @@
href="tutorial/index.html"
collapse="true">
<item
- name="Quickstart"
- href="quickstart/index.html"/>
- <item
name="The composite view pattern"
href="tutorial/pattern.html"/>
<item
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807
Propchange:
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807
Propchange:
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 08:32:35 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807
