Author: apetrelli
Date: Fri Jan 9 06:00:36 2009
New Revision: 733039
URL: http://svn.apache.org/viewvc?rev=733039&view=rev
Log:
TILES-346
Fixed init param in BasicTilesInitializer.
Fixed init param in test webapp.
Modified the documentation.
Modified:
tiles/framework/trunk/src/site/apt/config-reference.apt
tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
Modified: tiles/framework/trunk/src/site/apt/config-reference.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/config-reference.apt?rev=733039&r1=733038&r2=733039&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/config-reference.apt (original)
+++ tiles/framework/trunk/src/site/apt/config-reference.apt Fri Jan 9 06:00:36
2009
@@ -83,10 +83,10 @@
|
{{{config-reference.html#org.apache.tiles.locale.LocaleResolver}<<<org.apache.tiles.locale.LocaleResolver>>>}}
| Locale resolver class name |
*---------------------------------------------+--------------------------------------+
- [[6]]
{{{config-reference.html#TilesListener_configuration}<<<TilesListener>>>
configuration}}.
+ [[6]]
{{{config-reference.html#Initialization_configuration}<<<Initialization>>>
configuration}}.
*---------------------------------------------+--------------------------------------+
-|
{{{config-reference.html#org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY}<<<org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY>>>}}
| Container key |
+|
{{{config-reference.html#org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY}<<<org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY>>>}}
| Container key |
*---------------------------------------------+--------------------------------------+
* Extended configuration
@@ -342,14 +342,14 @@
* <<Usage>>: when specified, it must contain the name of a class implementing
{{{apidocs/org/apache/tiles/locale/LocaleResolver.html}<<<LocaleResolver>>>}}.
-* {<<<TilesListener>>> configuration}
+* {Initialization configuration}
-** {<<<org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY>>>}
+** {<<<org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY>>>}
Specifies the key under which the Tiles container will be stored.
* <<Specified in>>:
-
{{{apidocs/org/apache/tiles/web/startup/TilesListener.html#CONTAINER_KEY_INIT_PARAMETER}<<<org.apache.tiles.web.startup.TilesListener>>>}}.
+
{{{apidocs/org/apache/tiles/startup/BasicTilesInitializer.html#CONTAINER_KEY_INIT_PARAMETER}<<<org.apache.tiles.startup.BasicTilesInitializer>>>}}.
* <<Default>>: <<<null>>> (default container)
Modified:
tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt?rev=733039&r1=733038&r2=733039&view=diff
==============================================================================
---
tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
(original)
+++
tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
Fri Jan 9 06:00:36 2009
@@ -29,7 +29,7 @@
* Configuration
To use an alternate container, it must be configured through the use of the
-
{{{../../config-reference.html#org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY}org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY}}
+
{{{../../config-reference.html#org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY}org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY}}
initialization parameter. For example:
------------------------------------
@@ -37,7 +37,7 @@
<servlet-name>tiles-alt</servlet-name>
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<init-param>
-
<param-name>org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY</param-name>
+
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
<param-value>alternate</param-value>
</init-param>
</servlet>
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java?rev=733039&r1=733038&r2=733039&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
Fri Jan 9 06:00:36 2009
@@ -44,7 +44,7 @@
* @since 2.1.2
*/
public static final String CONTAINER_KEY_INIT_PARAMETER =
- "org.apache.tiles.web.startup.TilesServletInitializer.CONTAINER_KEY";
+ "org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY";
/** {...@inheritdoc} */
public void initialize(TilesApplicationContext applicationContext) {
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml?rev=733039&r1=733038&r2=733039&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
(original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml Fri Jan
9 06:00:36 2009
@@ -85,7 +85,7 @@
<param-value>org.apache.tiles.test.factory.TestAlternateTilesContainerFactory</param-value>
</init-param>
<init-param>
-
<param-name>org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY</param-name>
+
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
<param-value>alternate</param-value>
</init-param>
<load-on-startup>3</load-on-startup>
@@ -98,7 +98,7 @@
<param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
</init-param>
<init-param>
-
<param-name>org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY</param-name>
+
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
<param-value>db</param-value>
</init-param>
<load-on-startup>4</load-on-startup>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=733039&r1=733038&r2=733039&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Fri Jan 9
06:00:36 2009
@@ -85,7 +85,7 @@
<param-value>org.apache.tiles.test.factory.TestAlternateTilesContainerFactory</param-value>
</init-param>
<init-param>
-
<param-name>org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY</param-name>
+
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
<param-value>alternate</param-value>
</init-param>
<load-on-startup>3</load-on-startup>
@@ -98,7 +98,7 @@
<param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
</init-param>
<init-param>
-
<param-name>org.apache.tiles.web.startup.TilesListener.CONTAINER_KEY</param-name>
+
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
<param-value>db</param-value>
</init-param>
<load-on-startup>4</load-on-startup>
