Author: apetrelli
Date: Fri Nov 7 06:18:25 2008
New Revision: 712130
URL: http://svn.apache.org/viewvc?rev=712130&view=rev
Log:
TILES-330
Documentation updated for the separation of TilesContextFactory.
Modified:
tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt
tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt
tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt
Modified: tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt?rev=712130&r1=712129&r2=712130&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt (original)
+++ tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt Fri Nov 7
06:18:25 2008
@@ -180,7 +180,7 @@
@Override
protected DefinitionDAO<Locale> createLocaleDefinitionDao(Object context,
TilesApplicationContext applicationContext,
- TilesContextFactory contextFactory, LocaleResolver resolver) {
+ TilesRequestContextFactory contextFactory, LocaleResolver
resolver) {
LocaleDbDefinitionDAO definitionDao = new LocaleDbDefinitionDAO();
definitionDao.setDataSource((DataSource) applicationContext
.getApplicationScope().get("dataSource"));
@@ -191,7 +191,7 @@
@Override
protected LocaleDefinitionsFactory instantiateDefinitionsFactory(
Object context, TilesApplicationContext applicationContext,
- TilesContextFactory contextFactory, LocaleResolver resolver) {
+ TilesRequestContextFactory contextFactory, LocaleResolver
resolver) {
return new LocaleDefinitionsFactory();
}
}
Modified:
tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt?rev=712130&r1=712129&r2=712130&view=diff
==============================================================================
---
tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
(original)
+++
tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
Fri Nov 7 06:18:25 2008
@@ -69,7 +69,7 @@
init parameter, if you are using parameter-based initialization;
* overriding the
-
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#registerAttributeRenderers(org.apache.tiles.renderer.impl.BasicRendererFactory,%20java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}registerAttributeRenderers}}
+
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#registerAttributeRenderers(org.apache.tiles.renderer.impl.BasicRendererFactory,%20java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesRequestContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}registerAttributeRenderers}}
of <<<BasicTilesContainerFactory>>> if you are using Java-based
configuration.
* Custom default attribute renderer
@@ -82,7 +82,7 @@
init parameter, if you are using parameter-based initialization;
* overriding the
-
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createDefaultAttributeRenderer(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}createDefaultAttributeRenderer}}
+
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createDefaultAttributeRenderer(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesRequestContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}createDefaultAttributeRenderer}}
of <<<BasicTilesContainerFactory>>> if you are using Java-based
configuration.
* Custom attribute renderer factory
@@ -96,6 +96,6 @@
init parameter, if you are using parameter-based initialization;
* overriding the
-
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createRendererFactory(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}createRendererFactory}}
+
{{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createRendererFactory(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesRequestContextFactory,%20org.apache.tiles.TilesContainer,%20org.apache.tiles.evaluator.AttributeEvaluator)}createRendererFactory}}
of <<<BasicTilesContainerFactory>>> if you are using Java-based
configuration.
\ No newline at end of file
Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt?rev=712130&r1=712129&r2=712130&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
(original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt Fri Nov
7 06:18:25 2008
@@ -47,7 +47,7 @@
------------------------------------
If you are using programmatic configuration via Java, override the
-
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createEvaluator(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesContextFactory,%20org.apache.tiles.locale.LocaleResolver)}
createEvaluator}}
+
{{{../../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#createEvaluator(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesRequestContextFactory,%20org.apache.tiles.locale.LocaleResolver)}
createEvaluator}}
method, providing <<only the creation>> of the instance of the
<<<AttributeEvaluator>>>.
@@ -58,7 +58,7 @@
@Override
protected AttributeEvaluator createEvaluator(Object context,
TilesApplicationContext applicationContext,
- TilesContextFactory contextFactory, LocaleResolver resolver) {
+ TilesRequestContextFactory contextFactory, LocaleResolver
resolver) {
ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
evaluator.setApplicationContext(applicationContext);
MultiversionExpressionFactoryFactory efFactory = new
JspExpressionFactoryFactory();
Modified: tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt?rev=712130&r1=712129&r2=712130&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/extension/points.apt Fri Nov 7
06:18:25 2008
@@ -41,7 +41,7 @@
{{{../../config-reference.html#KeyedDefinitionsFactoryTilesContainerFactory_configuration}KeyedDefinitionsFactoryTilesContainerFactory}}
that allows to create multiple definitions factory for different "keys".
-* Tiles Context Factory
+* Tiles Application and Request Context Factory
The
{{{../../apidocs/org/apache/tiles/context/TilesRequestContext.html}<<<TilesRequestContext>>>}}
@@ -49,17 +49,25 @@
{{{../../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>>>}}
+
{{{../../config-reference.html#org.apache.tiles.context.TilesApplicationContextFactory}<<<TilesApplicationContextFactory>>>}}
+ and the
+
{{{../../config-reference.html#org.apache.tiles.context.TilesRequestContextFactory}<<<TilesRequestContextFactory>>>}}
interface is used to create instances of the 2 classes above.
- The default implementation,
- {{{../../config-reference.html#ChainedTilesContextFactory
configuration}<<<ChainedTilesContextFactory>>>}}
+ The default implementations,
+
{{{../../config-reference.html#ChainedTilesApplicationContextFactory_configuration}<<<ChainedTilesApplicationContextFactory>>>}}
+ and
+
{{{../../config-reference.html#ChainedTilesRequestContextFactory_configuration}<<<ChainedTilesRequestContextFactory>>>}}
links together different implementation. The default configuration links
together the implementation for Servlet, Portlet and JSP technologies. If you
need to support a new technology, we suggest to configure
- {{{../../config-reference.html#ChainedTilesContextFactory
configuration}<<<ChainedTilesContextFactory>>>}}
+
{{{../../config-reference.html#ChainedTilesApplicationContextFactory_configuration}<<<ChainedTilesApplicationContextFactory>>>}}
+ and
+
{{{../../config-reference.html#ChainedTilesRequestContextFactory_configuration}<<<ChainedTilesRequestContextFactory>>>}}
and create a new instance of
-
{{{../../apidocs/org/apache/tiles/context/TilesContextFactory.html}<<<TilesContextFactory>>>}}.
+
{{{../../apidocs/org/apache/tiles/context/TilesApplicationContextFactory.html}<<<TilesApplicationContextFactory>>>}}
+ and
+
{{{../../apidocs/org/apache/tiles/context/TilesRequestContextFactory.html}<<<TilesRequestContextFactory>>>}}.
* Tiles Definitions Factory
Modified: tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt?rev=712130&r1=712129&r2=712130&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt
(original)
+++ tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt Fri
Nov 7 06:18:25 2008
@@ -49,30 +49,30 @@
need for some configuration:
* If you are using parameter-based initialization, provide a new value for
the
-
{{{../config-reference.html#org.apache.tiles.context.ChainedTilesContextFactory.FACTORY_CLASS_NAMES}<<<org.apache.tiles.context.ChainedTilesContextFactory.FACTORY_CLASS_NAMES>>>}}
+
{{{../config-reference.html#org.apache.tiles.context.ChainedTilesApplicationContextFactory.FACTORY_CLASS_NAMES}<<<org.apache.tiles.context.ChainedTilesApplicationContextFactory.FACTORY_CLASS_NAMES>>>}}
init parameter. For example:
----------------------------------------
<init-param>
-
<param-name>org.apache.tiles.context.ChainedTilesContextFactory.FACTORY_CLASS_NAMES</param-name>
-
<param-value>org.apache.tiles.servlet.context.wildcard.WildcardServletTilesContextFactory,
- org.apache.tiles.jsp.context.JspTilesContextFactory</param-value>
+
<param-name>org.apache.tiles.context.ChainedTilesApplicationContextFactory.FACTORY_CLASS_NAMES</param-name>
+ <param-value>
+
org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContextFactory
+ </param-value>
</init-param>
----------------------------------------
* If you are using Java-based configuration, override the
-
{{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#registerChainedContextFactories(java.lang.Object,%20org.apache.tiles.context.ChainedTilesContextFactory)}registerChainedContextFactories}}
+
{{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#registerChainedApplicationContextFactories(java.lang.Object,%20org.apache.tiles.context.ChainedTilesApplicationContextFactory)}registerChainedContextFactories}}
of <<<BasicTilesContainerFactory>>> this way:
----------------------------------------
/** [EMAIL PROTECTED] */
@Override
-protected void registerChainedContextFactories(Object context,
- ChainedTilesContextFactory contextFactory) {
- List<TilesContextFactory> factories = new ArrayList<TilesContextFactory>(
+protected void registerChainedApplicationContextFactories(Object context,
+ ChainedTilesApplicationContextFactory contextFactory) {
+ List<TilesApplicationContextFactory> factories = new
ArrayList<TilesApplicationContextFactory>(
CONTEXT_FACTORY_CHAIN_COUNT);
- factories.add(new WildcardServletTilesContextFactory());
- factories.add(new JspTilesContextFactory());
+ factories.add(new WildcardServletTilesApplicationContextFactory());
contextFactory.setFactories(factories);
}
----------------------------------------
@@ -97,7 +97,7 @@
----------------------------------------
* If you are using Java-based configuration, override the
-
{{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#getSourceURLs(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesContextFactory)}getSourceURLs}}
+
{{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html#getSourceURLs(java.lang.Object,%20org.apache.tiles.TilesApplicationContext,%20org.apache.tiles.context.TilesApplicationContextFactory)}getSourceURLs}}
of <<<BasicTilesContainerFactory>>>. In the following example, notice the
manual exclusion of files including underscores (_):
@@ -106,7 +106,7 @@
@Override
protected List<URL> getSourceURLs(Object context,
TilesApplicationContext applicationContext,
- TilesContextFactory contextFactory) {
+ TilesRequestContextFactory contextFactory) {
List<URL> urls = new ArrayList<URL>(URL_COUNT);
try {
Set<URL> urlSet = applicationContext
