Author: apetrelli
Date: Tue Sep 9 12:01:20 2008
New Revision: 693565
URL: http://svn.apache.org/viewvc?rev=693565&view=rev
Log:
TILES-284
Merge from trunk to TILES_2_0_X branch.
Added:
tiles/framework/branches/TILES_2_0_X/src/site/apt/
- copied from r693560, tiles/framework/trunk/src/site/apt/
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/config-reference.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/ (props changed)
- copied from r693560, tiles/framework/trunk/src/site/apt/dev/
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/release.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/dev/release.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/getting_started.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/ (props
changed)
- copied from r693560, tiles/framework/trunk/src/site/apt/migration/
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/apis.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/migration/apis.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/configuration.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/migration/configuration.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/extension.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/migration/extension.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/migration/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/tags.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/migration/tags.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/ (props
changed)
- copied from r693560, tiles/framework/trunk/src/site/apt/quickstart/
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/abstracting-tiles.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/quickstart/abstracting-tiles.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/implementing-templates.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/quickstart/implementing-templates.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/quickstart/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/reusing-tiles.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/quickstart/reusing-tiles.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/selenium.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/ (props
changed)
- copied from r693560, tiles/framework/trunk/src/site/apt/tutorial/
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/
- copied from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/beans.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/beans.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/l10n.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/l10n.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/list-attributes.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/menu.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/nesting-extending.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/nesting-extending.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/preparer.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/runtime.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/runtime.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/
- copied from r693560, tiles/framework/trunk/src/site/apt/tutorial/basic/
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/concepts.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/basic/concepts.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/basic/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/basic/pages.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/configuration.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/configuration.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/
- copied from r693560,
tiles/framework/trunk/src/site/apt/tutorial/extension/
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/extension/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/extension/url_definitions_factory.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/integration/
- copied from r693560,
tiles/framework/trunk/src/site/apt/tutorial/integration/
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/integration/frameworks.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/integration/index.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/integration/index.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/integration/view.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/pattern.apt
- copied unchanged from r693560,
tiles/framework/trunk/src/site/apt/tutorial/pattern.apt
tiles/framework/branches/TILES_2_0_X/src/site/resources/
- copied from r693560, tiles/framework/trunk/src/site/resources/
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/
- copied from r693560, tiles/framework/trunk/src/site/resources/images/
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
- copied unchanged from r693560,
tiles/framework/trunk/src/site/resources/images/page_to_page.png
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
- copied unchanged from r693560,
tiles/framework/trunk/src/site/resources/images/tiled_page.png
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/
- copied from r693560, tiles/framework/trunk/src/site/xdoc/
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/
- copied from r693560, tiles/framework/trunk/src/site/xdoc/dev/
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
- copied unchanged from r693560,
tiles/framework/trunk/src/site/xdoc/dev/building.xml
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
- copied unchanged from r693560,
tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/
- copied from r693560, tiles/framework/trunk/src/site/xdoc/images/
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
- copied unchanged from r693560,
tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
- copied unchanged from r693560,
tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/site.xml
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 Tue Sep 9 12:01:20 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116
+/tiles/framework/trunk:676655,680114-680116,693549-693560
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
svn:mergeinfo =
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=693565&r1=693564&r2=693565&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 Tue Sep 9 12:01:20
2008
@@ -45,6 +45,122 @@
name="Home"
href="../index.html"/>
</menu>
+ <menu name="Documentation">
+ <item
+ name="Getting Started"
+ href="getting_started.html"/>
+ <item
+ name="Tutorial"
+ href="tutorial/index.html"
+ collapse="true">
+ <item
+ name="Quickstart"
+ href="quickstart/index.html"/>
+ <item
+ name="The composite view pattern"
+ href="tutorial/pattern.html"/>
+ <item
+ name="Configuration"
+ href="tutorial/configuration.html"/>
+ <item
+ name="Basic Usage"
+ href="tutorial/basic/index.html"
+ collapse="true">
+ <item
+ name="Tiles Concepts"
+ href="tutorial/basic/concepts.html"/>
+ <item
+ name="Creating Pages"
+ href="tutorial/basic/pages.html"/>
+ </item>
+ <item
+ name="Advanced Topics"
+ href="tutorial/advanced/index.html"
+ collapse="true">
+ <item
+ name="Nesting and Extending"
+ href="tutorial/advanced/nesting-extending.html"/>
+ <item
+ name="List Attributes"
+ href="tutorial/advanced/list-attributes.html"/>
+ <item
+ name="Runtime Composition"
+ href="tutorial/advanced/runtime.html"/>
+ <item
+ name="View Preparers"
+ href="tutorial/advanced/preparer.html"/>
+ <item
+ name="Rendering Utilities"
+ href="tutorial/advanced/utils.html"/>
+ <item
+ name="Localization"
+ href="tutorial/advanced/l10n.html"/>
+ <item
+ name="Using Beans as Attributes"
+ href="tutorial/advanced/beans.html"/>
+ <item
+ name="Menu-ing"
+ href="tutorial/advanced/menu.html"/>
+ </item>
+ <item
+ name="Integrations"
+ href="tutorial/integration/index.html"
+ collapse="true">
+ <item
+ name="Frameworks"
+ href="tutorial/integration/frameworks.html"/>
+ <item
+ name="View technologies"
+ href="tutorial/integration/view.html"/>
+ </item>
+ <item
+ name="Extensions"
+ href="tutorial/extension/index.html"
+ collapse="true">
+ <item
+ name="Extension Points"
+ href="tutorial/extension/points.html"/>
+ <item
+ name="UrlDefinitionsFactory"
+
href="tutorial/extension/url_definitions_factory.html"/>
+ </item>
+ <item
+ name="Migration from Struts Tiles"
+ href="migration/index.html"/>
+ </item>
+ </menu>
+ <menu name="Reference">
+ <item
+ name="Configuration reference"
+ href="config-reference.html"/>
+ <item
+ name="Javadoc"
+ href="apidocs/index.html"/>
+ <item
+ name="Taglibdoc"
+ href="tiles-jsp/tlddoc/index.html"/>
+ <item
+ name="Taglib Reference"
+ href="tiles-jsp/tagreference.html"/>
+ <item
+ name="DTD Doc"
+ href="tiles-core/dtddoc/index.html"/>
+ </menu>
+
+ <menu name="Developers">
+ <item
+ name="Building"
+ href="/dev/building.html"/>
+ <item
+ name="Snapshots"
+ href="/dev/snapshots.html"/>
+ <item
+ name="Release Process"
+ href="/dev/release.html"/>
+ <item
+ name="Selenium Testing"
+ href="/selenium.html"/>
+ </menu>
${modules}
${reports}
Propchange:
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 9 12:01:20 2008
@@ -0,0 +1 @@
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560
