Author: apetrelli
Date: Tue Sep 30 11:37:45 2008
New Revision: 700542

URL: http://svn.apache.org/viewvc?rev=700542&view=rev
Log:
TILES-309
Merge from trunk to TILES_2_0_X branch.
Fixed Javadocs and configuration reference links.

Modified:
    tiles/framework/branches/TILES_2_0_X/   (props changed)
    tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt   
(contents, 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/apt/tutorial/advanced/beans.apt
    tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt
    
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt
    
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.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/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 Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541

Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt?rev=700542&r1=700541&r2=700542&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt 
(original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt Tue 
Sep 30 11:37:45 2008
@@ -31,7 +31,7 @@
 
 * Standard configuration
 
-  [[1]] {{{config-reference.html#Main configuration}Main configuration}}.
+  [[1]] {{{config-reference.html#Main_configuration}Main configuration}}.
 
 
*---------------------------------------------+--------------------------------------+
 | 
{{{config-reference.html#org.apache.tiles.factory.TilesContainerFactory}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}
    | Class name of the container factory  |
@@ -51,19 +51,19 @@
 | 
{{{config-reference.html#org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG}<<<org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG>>>}}
   | List of paths that contain Tiles definitions |
 
*---------------------------------------------+--------------------------------------+
 
-  [[3]] {{{config-reference.html#ChainedTilesContextFactory 
configuration}<<<ChainedTilesContextFactory>>> configuration}}.
+  [[3]] 
{{{config-reference.html#ChainedTilesContextFactory_configuration}<<<ChainedTilesContextFactory>>>
 configuration}}.
 
 
*---------------------------------------------+--------------------------------------+
 | 
{{{config-reference.html#org.apache.tiles.context.ChainedTilesContextFactory.FACTORY_CLASS_NAMES}<<<org.apache.tiles.context.ChainedTilesContextFactory.FACTORY_CLASS_NAMES>>>}}
 | List of elementary factory class names |
 
*---------------------------------------------+--------------------------------------+
 
-  [[4]] {{{config-reference.html#DigesterDefinitionsReader 
configuration}<<<DigesterDefinitionsReader>>> configuration}}.
+  [[4]] 
{{{config-reference.html#DigesterDefinitionsReader_configuration}<<<DigesterDefinitionsReader>>>
 configuration}}.
 
 
*---------------------------------------------+--------------------------------------+
 | 
{{{config-reference.html#org.apache.tiles.definition.digester.DigesterDefinitionsReader.PARSER_VALIDATE}<<<org.apache.tiles.definition.digester.DigesterDefinitionsReader.PARSER_VALIDATE>>>}}
 | Flag to deactivate XML parser validation |
 
*---------------------------------------------+--------------------------------------+
 
-  [[5]] {{{config-reference.html#UrlDefinitionsFactory 
configuration}<<<UrlDefinitionsFactory>>> configuration}}.
+  [[5]] 
{{{config-reference.html#UrlDefinitionsFactory_configuration}<<<UrlDefinitionsFactory>>>
 configuration}}.
 
 
*---------------------------------------------+--------------------------------------+
 | 
{{{config-reference.html#org.apache.tiles.definition.DefinitionsReader}<<<org.apache.tiles.definition.DefinitionsReader>>>}}
 | Definitions reader class name |
@@ -73,7 +73,7 @@
 
 * Extended configuration
 
-  [[1]] {{{config-reference.html#KeyedDefinitionsFactoryTilesContainerFactory 
configuration}<<<KeyedDefinitionsFactoryTilesContainerFactory>>> 
configuration}}.
+  [[1]] 
{{{config-reference.html#KeyedDefinitionsFactoryTilesContainerFactory_configuration}<<<KeyedDefinitionsFactoryTilesContainerFactory>>>
 configuration}}.
 
 
*---------------------------------------------+--------------------------------------+
 | 
{{{config-reference.html#org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer.KeyExtractor}<<<org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer.KeyExtractor>>>}}
 | Key extractor class name           |
@@ -92,7 +92,7 @@
   Specifies the container factory class name to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTAINER_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTAINER_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
     
   * <<Default>>: <<<org.apache.tiles.factory.TilesContainerFactory>>>.
     
@@ -104,7 +104,7 @@
   Flag to use a mutable container.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTAINER_FACTORY_MUTABLE_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTAINER_FACTORY_MUTABLE_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
     
   * <<Default>>: <<<false>>> (the container is not mutable).
     
@@ -116,7 +116,7 @@
   Specifies the context factory class name to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTEXT_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/TilesContainerFactory.html#CONTEXT_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
     
   * <<Default>>: <<<org.apache.tiles.context.ChainedTilesContextFactory>>>.
     
@@ -128,7 +128,7 @@
   Specifies the context factory class name to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html#DEFINITIONS_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/TilesContainerFactory.html#DEFINITIONS_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
     
   * <<Default>>: <<<org.apache.tiles.definition.UrlDefinitionsFactory>>>.
     
@@ -140,7 +140,7 @@
   Specifies the view preparer factory class name to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html#PREPARER_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/TilesContainerFactory.html#PREPARER_FACTORY_INIT_PARAM}<<<org.apache.tiles.factory.TilesContainerFactory>>>}}.
     
   * <<Default>>: <<<org.apache.tiles.preparer.BasicPreparerFactory>>>.
     
@@ -154,7 +154,7 @@
   Specifies the list of files that contain the definitions.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/impl/BasicTilesContainer.html#DEFINITIONS_CONFIG}<<<org.apache.tiles.impl.BasicTilesContainer>>>}}.
+  
{{{apidocs/org/apache/tiles/impl/BasicTilesContainer.html#DEFINITIONS_CONFIG}<<<org.apache.tiles.impl.BasicTilesContainer>>>}}.
     
   * <<Default>>: <<</WEB-INF/tiles.xml>>>.
     
@@ -168,7 +168,7 @@
   Specifies the list of elementary Tiles context factory class names.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/context/ChainedTilesContextFactory.html#FACTORY_CLASS_NAMES}<<<org.apache.tiles.context.ChainedTilesContextFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/context/ChainedTilesContextFactory.html#FACTORY_CLASS_NAMES}<<<org.apache.tiles.context.ChainedTilesContextFactory>>>}}.
     
   * <<Default>>: 
<<<org.apache.tiles.servlet.context.ServletTilesContextFactory,
   org.apache.tiles.portlet.context.PortletTilesContextFactory,
@@ -176,7 +176,7 @@
     
   * <<Usage>>: when specified, it must contain a comma-separated list of class
   names implementing
-  
{{{framework/apidocs/org/apache/tiles/context/TilesContextFactory.html}<<<TilesContextFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/context/TilesContextFactory.html}<<<TilesContextFactory>>>}}.
   
 * {<<<DigesterDefinitionsReader>>> configuration}
 
@@ -185,7 +185,7 @@
   Specifies if the digester should validate input XML files.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/definition/digester/DigesterDefinitionsReader.html#PARSER_VALIDATE_PARAMETER_NAME}<<<org.apache.tiles.definition.digester.DigesterDefinitionsReader>>>}}.
+  
{{{apidocs/org/apache/tiles/definition/digester/DigesterDefinitionsReader.html#PARSER_VALIDATE_PARAMETER_NAME}<<<org.apache.tiles.definition.digester.DigesterDefinitionsReader>>>}}.
     
   * <<Default>>: <<<true>>>
     
@@ -197,30 +197,30 @@
 ** {<<<org.apache.tiles.definition.DefinitionsReader>>>}
 
   Specifies the implementation of
-  
{{{framework/apidocs/org/apache/tiles/definition/DefinitionsReader.html}<<<DefinitionsReader>>>}}
+  
{{{apidocs/org/apache/tiles/definition/DefinitionsReader.html}<<<DefinitionsReader>>>}}
   to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/constant-values.html#org.apache.tiles.definition.DefinitionsFactory.READER_IMPL_PROPERTY}<<<org.apache.tiles.definition.DefinitionsFactory>>>}}.
+  
{{{apidocs/constant-values.html#org.apache.tiles.definition.DefinitionsFactory.READER_IMPL_PROPERTY}<<<org.apache.tiles.definition.DefinitionsFactory>>>}}.
     
   * <<Default>>: 
<<<org.apache.tiles.definition.digester.DigesterDefinitionsReader>>>
     
   * <<Usage>>: when specified, it must contain the name of a class implementing
-  
{{{framework/apidocs/org/apache/tiles/definition/DefinitionsReader.html}<<<DefinitionsReader>>>}}.
+  
{{{apidocs/org/apache/tiles/definition/DefinitionsReader.html}<<<DefinitionsReader>>>}}.
 
 ** {<<<org.apache.tiles.locale.LocaleResolver>>>}
 
   Specifies the implementation of
-  
{{{framework/apidocs/org/apache/tiles/locale/LocaleResolver.html}<<<LocaleResolver>>>}}
+  {{{apidocs/org/apache/tiles/locale/LocaleResolver.html}<<<LocaleResolver>>>}}
   to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/constant-values.html#org.apache.tiles.definition.DefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY}<<<org.apache.tiles.definition.DefinitionsFactory>>>}}.
+  
{{{apidocs/constant-values.html#org.apache.tiles.definition.DefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY}<<<org.apache.tiles.definition.DefinitionsFactory>>>}}.
     
   * <<Default>>: <<<org.apache.tiles.locale.impl.DefaultLocaleResolver>>>
     
   * <<Usage>>: when specified, it must contain the name of a class implementing
-  
{{{framework/apidocs/org/apache/tiles/locale/LocaleResolver.html}<<<LocaleResolver>>>}}.
+  
{{{apidocs/org/apache/tiles/locale/LocaleResolver.html}<<<LocaleResolver>>>}}.
 
 Extended configuration parameters
   
@@ -229,16 +229,16 @@
 ** 
{<<<org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer.KeyExtractor>>>}
 
   Specifies the implementation of
-  
{{{framework/apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.KeyExtractor.html}<<<KeyExtractor>>>}}
+  
{{{apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.KeyExtractor.html}<<<KeyExtractor>>>}}
   to use.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.html#KEY_EXTRACTOR_CLASS_INIT_PARAM}<<<org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.html#KEY_EXTRACTOR_CLASS_INIT_PARAM}<<<org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory>>>}}.
     
   * <<Default>>: 
<<<org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer.DefaultKeyExtractor>>>
     
   * <<Usage>>: when specified, it must contain the name of a class implementing
-  
{{{framework/apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.KeyExtractor.html}<<<KeyExtractor>>>}}.
+  
{{{apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.KeyExtractor.html}<<<KeyExtractor>>>}}.
 
 ** 
{<<<org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory.KEYS>>>}
 
@@ -246,7 +246,7 @@
   Factory.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.html#CONTAINER_KEYS_INIT_PARAM}<<<org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory>>>}}.
+  
{{{apidocs/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.html#CONTAINER_KEYS_INIT_PARAM}<<<org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory>>>}}.
     
   * <<Default>>: None, it must be specified explicitly.
     
@@ -259,7 +259,7 @@
   <<<$\{key\}>>>.
   
   * <<Specified in>>:
-  
{{{framework/apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.html#DEFINITIONS_CONFIG_PREFIX}<<<org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer>>>}}.
+  
{{{apidocs/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.html#DEFINITIONS_CONFIG_PREFIX}<<<org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer>>>}}.
     
   * <<Default>>: <<</WEB-INF/tiles.xml>>>.
     

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754
+/tiles/framework/trunk/src/site/apt/dev:694754,700541

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754
+/tiles/framework/trunk/src/site/apt/migration:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/quickstart/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/quickstart:694754
+/tiles/framework/trunk/src/site/apt/quickstart:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541

Modified: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/beans.apt
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/beans.apt?rev=700542&r1=700541&r2=700542&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/beans.apt 
(original)
+++ 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/beans.apt 
Tue Sep 30 11:37:45 2008
@@ -31,7 +31,7 @@
 * Declaring beans in definitions file
 
   You can declare a bean by using the
-  
{{{../../framework/tiles-core/dtddoc/tiles-config_2_0.dtd.html#bean}<<<\<bean\>>>>}}
+  {{{../../tiles-core/dtddoc/tiles-config_2_0.dtd.html#bean}<<<\<bean\>>>>}}
   element in Tiles definition  files. It can be used only in
   {{{list-attributes.html}list attributes}}.
 
@@ -101,7 +101,7 @@
   it.
   
   To import an attribute you have to use the
-  
{{{../../framework/tiles-jsp/tlddoc/tiles/importAttribute.html}<<<\<tiles:importAttribute\>>>>}}
+  
{{{../../tiles-jsp/tlddoc/tiles/importAttribute.html}<<<\<tiles:importAttribute\>>>>}}
   tag:
 
 --------------------------------------
@@ -112,7 +112,7 @@
   named "myAttribute" too.
   
   To use an attribute, you have to use the
-  
{{{../../framework/tiles-jsp/tlddoc/tiles/useAttribute.html}<<<\<tiles:useAttribute\>>>>}}
+  
{{{../../tiles-jsp/tlddoc/tiles/useAttribute.html}<<<\<tiles:useAttribute\>>>>}}
   tag:
 
 --------------------------------------

Modified: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt?rev=700542&r1=700541&r2=700542&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt 
(original)
+++ 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/menu.apt 
Tue Sep 30 11:37:45 2008
@@ -25,7 +25,7 @@
 
   Tiles offers a (pretty small) support to create menus. It consists in 
allowing
   creation of menu-like beans, to be defined in Tiles definition files, using
-  the 
{{{../../framework/tiles-core/dtddoc/tiles-config_2_0.dtd.html#item}<<<\<item\>>>>}}
+  the 
{{{../../tiles-core/dtddoc/tiles-config_2_0.dtd.html#item}<<<\<item\>>>>}}
   element:
 
 -------------------------------------------

Modified: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt?rev=700542&r1=700541&r2=700542&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt 
(original)
+++ 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/points.apt 
Tue Sep 30 11:37:45 2008
@@ -30,23 +30,23 @@
 
   The Tiles container is the object responsible of loading and rendering all
   Tiles artifacts. It is not created directly, but through a
-  
{{{../../framework/apidocs/org/apache/tiles/factory/TilesContainerFactory.html}<<<TilesContainerFactory>>>}}.
+  
{{{../../apidocs/org/apache/tiles/factory/TilesContainerFactory.html}<<<TilesContainerFactory>>>}}.
   The default implementation is
-  
{{{../../framework/apidocs/org/apache/tiles/impl/BasicTilesContainer.html}<<<BasicTilesContainer>>>}}.
+  
{{{../../apidocs/org/apache/tiles/impl/BasicTilesContainer.html}<<<BasicTilesContainer>>>}}.
 
   It is unlikely that you need to customize your Tiles container (and container
   factory) and we suggest to use the default container factory.
   
   As an exception, you can use
-  {{{../../config-reference.html#KeyedDefinitionsFactoryTilesContainerFactory 
configuration}KeyedDefinitionsFactoryTilesContainerFactory}}
+  
{{{../../config-reference.html#KeyedDefinitionsFactoryTilesContainerFactory_configuration}KeyedDefinitionsFactoryTilesContainerFactory}}
   that allows to create multiple definitions factory for different "keys".
 
 * Tiles Context Factory
 
   The
-  
{{{../../framework/apidocs/org/apache/tiles/context/TilesRequestContext.html}<<<TilesRequestContext>>>}}
+  
{{{../../apidocs/org/apache/tiles/context/TilesRequestContext.html}<<<TilesRequestContext>>>}}
   and
-  
{{{../../framework/apidocs/org/apache/tiles/context/TilesApplicationContext.html}<<<TilesApplicationContext>>>}}
+  
{{{../../apidocs/org/apache/tiles/context/TilesApplicationContext.html}<<<TilesApplicationContext>>>}}
   interfaces are used to abstract the Tiles context from the particular
   technology. The
   
{{{../../config-reference.html#org.apache.tiles.context.TilesContextFactory}<<<TilesContextFactory>>>}}
@@ -59,7 +59,7 @@
   need to support a new technology, we suggest to configure
   {{{../../config-reference.html#ChainedTilesContextFactory 
configuration}<<<ChainedTilesContextFactory>>>}}
   and create a new instance of
-  
{{{../../framework/apidocs/org/apache/tiles/context/TilesContextFactory.html}<<<TilesContextFactory>>>}}.
+  
{{{../../apidocs/org/apache/tiles/context/TilesContextFactory.html}<<<TilesContextFactory>>>}}.
 
 * Tiles Definitions Factory
 
@@ -80,10 +80,10 @@
   The
   
{{{../../config-reference.html#org.apache.tiles.preparer.PreparerFactory}<<<PreparerFactory>>>}}
   is responsible of creating instances of
-  
{{{../../framework/apidocs/org/apache/tiles/preparer/ViewPreparer.html}<<<ViewPreparer>>>}}.
+  
{{{../../apidocs/org/apache/tiles/preparer/ViewPreparer.html}<<<ViewPreparer>>>}}.
   
   The default implementation,
-  
{{{../../framework/apidocs/org/apache/tiles/preparer/BasicPreparerFactory.html}<<<BasicPreparerFactory>>>}}
+  
{{{../../apidocs/org/apache/tiles/preparer/BasicPreparerFactory.html}<<<BasicPreparerFactory>>>}}
   takes the preparer name as a class name, instantiates an object per each
   class name and returns it.
   

Modified: 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.apt
URL: 
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.apt?rev=700542&r1=700541&r2=700542&view=diff
==============================================================================
--- 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.apt
 (original)
+++ 
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/extension/url_definitions_factory.apt
 Tue Sep 30 11:37:45 2008
@@ -26,7 +26,7 @@
   The
   {{{../../config-reference.html#UrlDefinitionsFactory 
configuration}<<<UrlDefinitionsFactory>>>}}
   is the default implementation of
-  
{{{../../framework/apidocs/org/apache/tiles/definition/DefinitionsFactory.html}<<<DefinitionsFactory>>>}}.
+  
{{{../../apidocs/org/apache/tiles/definition/DefinitionsFactory.html}<<<DefinitionsFactory>>>}}.
 
 * Definitions reader
 
@@ -34,7 +34,7 @@
   
{{{../../config-reference.html#org.apache.tiles.definition.DefinitionsReader}<<<DefinitionsReader>>>}}
   interfaces reads a source (usually an URL) to return a map of raw (i.e. with
   their inheritance <<not resolved>>) definitions. The default implementation,
-  
{{{../../framework/apidocs/org/apache/tiles/definition/digester/DigesterDefinitionsReader.html}<<<DigesterDefinitionsReader>>>}}
+  
{{{../../apidocs/org/apache/tiles/definition/digester/DigesterDefinitionsReader.html}<<<DigesterDefinitionsReader>>>}}
   reads from usual Tiles XML definition files using Jakarta Commons Digester.
   
   If you need to read definitions from other kind of sources, this is the item
@@ -46,7 +46,7 @@
   
{{{../../config-reference.html#org.apache.tiles.locale.LocaleResolver}<<<LocaleResolver>>>}}
   interface resolves the current locale requested by the user. The default
   implementation,
-  
{{{../../framework/apidocs/org/apache/tiles/locale/impl/DefaultLocaleResolver.html}<<<DefaultLocaleResolver>>>}}
+  
{{{../../apidocs/org/apache/tiles/locale/impl/DefaultLocaleResolver.html}<<<DefaultLocaleResolver>>>}}
   takes the current locale from a session-scoped Locale object under the
   <<<org.apache.tiles.LOCALE>>> key. If it is not found, the default locale of
   the request will be taken.

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541

Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541

Propchange: 
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541

Propchange: 
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 11:37:45 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541


Reply via email to