You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/10/30 13:54:11 UTC

svn commit: r709153 - in /tiles/framework/trunk: src/site/apt/ src/site/apt/how-to/ src/site/apt/tutorial/ src/site/apt/tutorial/advanced/ src/site/apt/tutorial/integration/ src/site/resources/images/ tiles-api/src/main/java/org/apache/tiles/reflect/ t...

Author: apetrelli
Date: Thu Oct 30 05:54:10 2008
New Revision: 709153

URL: http://svn.apache.org/viewvc?rev=709153&view=rev
Log:
Fixed style of the code.

Modified:
    tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/how-to/index.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt   (contents, props changed)
    tiles/framework/trunk/src/site/apt/whats-new.apt   (contents, props changed)
    tiles/framework/trunk/src/site/resources/images/db-schema.png   (props changed)
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java   (contents, props changed)
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java   (contents, props changed)
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java   (contents, props changed)
    tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java   (contents, props changed)
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
    tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java   (contents, props changed)
    tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect   (props changed)
    tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql   (props changed)

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=709153&r1=709152&r2=709153&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 Thu Oct 30 05:54:10 2008
@@ -1,214 +1,214 @@
-~~ $Id: index.apt 700494 2008-09-30 15:12:54Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         Loading definitions from a database
-         -----------
-
-Loading definitions from a database
-
-  A typical request from Tiles users was to be able to load Tiles definitions
-  from a database. With Tiles 2.1, it is a pretty easy task.
-
-  The source of the example is available in the
-  {{{/download-21.html}source distribution of Tiles}}, under the "tiles-test"
-  module.
-
-* Database design
-
-  The first step is to design the database schema. Here we will show a small
-  example that is far from perfect, anyway it will be enough for our example.
-  The following is the picture of the database schema we will use.
-
-[../images/db-schema.png] Database schema that will be used for the example.
-
-* Create a Definition DAO
-
-  Essentially, the main programming task is the development of a
-  {{{../apidocs/org/apache/tiles/definition/dao/DefinitionDAO.html}definition DAO}}.
-  This interface is designed to provide an easy customization of definitions
-  retrieval.
-
-  The method that you should implement is only
-  {{{../apidocs/org/apache/tiles/definition/dao/DefinitionDAO.html#getDefinition(java.lang.String,%20K)}getDefinition}}.
-  You don't have to implement <<<getDefinitions>>> too completely (a simple
-  <<<throw UnsupportedOperationException>>> will be enough) since it won't be
-  called at all.
-
-** getDefinition
-
-  This is the source of <<<getDefinition>>> in our example: the JDBC DAO support
-  of Spring is used to have a cleaner code.
-
--------------------------------------
-/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
-public Definition getDefinition(String name, Locale locale) {
-    List<Map<String, Object>> customizations = null;
-    Long customizationId = null, parentCustomizationId = null;
-    do {
-        customizations = getJdbcTemplate().queryForList(
-                SELECT_CUSTOMIZATION_BY_NAME_SQL,
-                new Object[] { locale.toString() });
-        if (!customizations.isEmpty()) {
-            Map<String, Object> customization = customizations.get(0);
-            customizationId = ((Number) customization.get("ID")).longValue();
-            parentCustomizationId = numberToLong((Number) customization.get("PARENT_ID"));
-        } else {
-            locale = LocaleUtil.getParentLocale(locale);
-        }
-    } while (customizations.isEmpty());
-
-    return getDefinition(name, customizationId, parentCustomizationId,
-            locale);
-}
--------------------------------------
-
-  In other words:
-
-  [[1]] the current customization (in this case, the client's locale) is
-  identified;
-
-  [[2]] it is tried to retrieve the locale from the DB: if it is not found, it
-  tries with the parent locale (the parent locale of "en_US" is "en") until one
-  is found, or the default (no locale) is used;
-
-  [[3]] the definition for the supported minimum-parent-locale is retrieved and
-  passed to the caller.
-
-** Retrieval of the definition from the DB
-
-  At this point the definition must be retrieved from the DB.
-
--------------------------------------
-@SuppressWarnings("unchecked")
-protected DbDefinition getDefinition(String name, Long baseCustomizationId,
-        Long baseParentCustomizationId, Locale locale) {
-    DbDefinition definition = null;
-    Long customizationId = baseCustomizationId;
-    Long parentCustomizationId = baseParentCustomizationId;
-    List<DbDefinition> definitions = null;
-    boolean finished = false;
-    do {
-        definitions = getJdbcTemplate()
-                .query(SELECT_DEFINITION_SQL,
-                        new Object[] { name, customizationId },
-                        definitionRowMapper);
-        if (definitions.isEmpty()) {
-            if (parentCustomizationId != null) {
-                Map<String, Object> customization = getJdbcTemplate().queryForMap(
-                        SELECT_CUSTOMIZATION_BY_ID_SQL,
-                        new Object[] { parentCustomizationId });
-                customizationId = ((Number) customization.get("ID")).longValue();
-                parentCustomizationId = numberToLong((Number) customization.get("PARENT_ID"));
-            } else {
-                finished = true;
-            }
-        } else {
-            definition = definitions.get(0);
-            finished = true;
-        }
-    } while (!finished);
-
-    if (definition != null) {
-        AttributeRowMapper attributeRowMapper = new AttributeRowMapper(definition);
-        getJdbcTemplate().query(SELECT_ATTRIBUTES_SQL,
-                new Object[] { definition.getId() }, attributeRowMapper);
-    }
-    return definition;
-}
--------------------------------------
-
-  The steps that are followed are:
-
-  [[1]] search for a definition that is usable with the customization id
-  (id of the locale in the DB) that is suggested by the caller;
-
-  [[2]] if the definition has not been found, the parent customization id is
-  used and the operation at point 1 is done, until a definition is found;
-
-  [[3]] if the definition has been found, the attributes are loaded from the DB.
-
-  []
-
-  Notice that the definition's inheritance <<is not resolved>> because it will
-  be done by the implementation of
-  {{{../apidocs/org/apache/tiles/definition/DefinitionsFactory.html}DefinitionsFactory}}
-  that will call the definitions DAO multiple times to resolve inheritance.
-
-  The <<<DbDefinition>>> is a simple extension of
-  {{{../apidocs/org/apache/tiles/Definition.html}Definition}}
-  with the addition of an id.
-
-* Configuration
-
-  To use the definitions DAO we need to configure Tiles to use an alternate
-  {{{../apidocs/org/apache/tiles/definition/DefinitionsFactory.html}DefinitionsFactory}}
-  that is
-  {{{../apidocs/org/apache/tiles/definition/LocaleDefinitionsFactory.html}LocaleDefinitionsFactory}}.
-  This definitions factory resolves definitions one by one, by retrieving all
-  extended definitions through calls to the definition DAO.
-
-  Though it may seem slow, it is memory-efficient and it is effective when
-  the number of definitions is high.
-
-  Here will be using pure Java configuration. A new class extending
-  {{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html}BasicTilesContainerFactory}}
-  must be created. It will be called <<<TestDbTilesContainerFactory>>>.
-  This is the source:
-
--------------------------------------
-public class TestDbTilesContainerFactory extends BasicTilesContainerFactory {
-
-    /** {@inheritDoc} */
-    @Override
-    protected DefinitionDAO<Locale> createLocaleDefinitionDao(Object context,
-            TilesApplicationContext applicationContext,
-            TilesContextFactory contextFactory, LocaleResolver resolver) {
-        LocaleDbDefinitionDAO definitionDao = new LocaleDbDefinitionDAO();
-        definitionDao.setDataSource((DataSource) applicationContext
-                .getApplicationScope().get("dataSource"));
-        return definitionDao;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected LocaleDefinitionsFactory instantiateDefinitionsFactory(
-            Object context, TilesApplicationContext applicationContext,
-            TilesContextFactory contextFactory, LocaleResolver resolver) {
-        return new LocaleDefinitionsFactory();
-   }
-}
--------------------------------------
-
-  In <<<web.xml>>> add this piece of configuration:
-
--------------------------------------
-<servlet>
-    <servlet-name>tiles-db</servlet-name>
-    <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
-    <init-param>
-        <param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-        <param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
-    </init-param>
-</servlet>
--------------------------------------
-
-  And you're done!
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         Loading definitions from a database
+         -----------
+
+Loading definitions from a database
+
+  A typical request from Tiles users was to be able to load Tiles definitions
+  from a database. With Tiles 2.1, it is a pretty easy task.
+
+  The source of the example is available in the
+  {{{/download-21.html}source distribution of Tiles}}, under the "tiles-test"
+  module.
+
+* Database design
+
+  The first step is to design the database schema. Here we will show a small
+  example that is far from perfect, anyway it will be enough for our example.
+  The following is the picture of the database schema we will use.
+
+[../images/db-schema.png] Database schema that will be used for the example.
+
+* Create a Definition DAO
+
+  Essentially, the main programming task is the development of a
+  {{{../apidocs/org/apache/tiles/definition/dao/DefinitionDAO.html}definition DAO}}.
+  This interface is designed to provide an easy customization of definitions
+  retrieval.
+
+  The method that you should implement is only
+  {{{../apidocs/org/apache/tiles/definition/dao/DefinitionDAO.html#getDefinition(java.lang.String,%20K)}getDefinition}}.
+  You don't have to implement <<<getDefinitions>>> too completely (a simple
+  <<<throw UnsupportedOperationException>>> will be enough) since it won't be
+  called at all.
+
+** getDefinition
+
+  This is the source of <<<getDefinition>>> in our example: the JDBC DAO support
+  of Spring is used to have a cleaner code.
+
+-------------------------------------
+/** {@inheritDoc} */
+@SuppressWarnings("unchecked")
+public Definition getDefinition(String name, Locale locale) {
+    List<Map<String, Object>> customizations = null;
+    Long customizationId = null, parentCustomizationId = null;
+    do {
+        customizations = getJdbcTemplate().queryForList(
+                SELECT_CUSTOMIZATION_BY_NAME_SQL,
+                new Object[] { locale.toString() });
+        if (!customizations.isEmpty()) {
+            Map<String, Object> customization = customizations.get(0);
+            customizationId = ((Number) customization.get("ID")).longValue();
+            parentCustomizationId = numberToLong((Number) customization.get("PARENT_ID"));
+        } else {
+            locale = LocaleUtil.getParentLocale(locale);
+        }
+    } while (customizations.isEmpty());
+
+    return getDefinition(name, customizationId, parentCustomizationId,
+            locale);
+}
+-------------------------------------
+
+  In other words:
+
+  [[1]] the current customization (in this case, the client's locale) is
+  identified;
+
+  [[2]] it is tried to retrieve the locale from the DB: if it is not found, it
+  tries with the parent locale (the parent locale of "en_US" is "en") until one
+  is found, or the default (no locale) is used;
+
+  [[3]] the definition for the supported minimum-parent-locale is retrieved and
+  passed to the caller.
+
+** Retrieval of the definition from the DB
+
+  At this point the definition must be retrieved from the DB.
+
+-------------------------------------
+@SuppressWarnings("unchecked")
+protected DbDefinition getDefinition(String name, Long baseCustomizationId,
+        Long baseParentCustomizationId, Locale locale) {
+    DbDefinition definition = null;
+    Long customizationId = baseCustomizationId;
+    Long parentCustomizationId = baseParentCustomizationId;
+    List<DbDefinition> definitions = null;
+    boolean finished = false;
+    do {
+        definitions = getJdbcTemplate()
+                .query(SELECT_DEFINITION_SQL,
+                        new Object[] { name, customizationId },
+                        definitionRowMapper);
+        if (definitions.isEmpty()) {
+            if (parentCustomizationId != null) {
+                Map<String, Object> customization = getJdbcTemplate().queryForMap(
+                        SELECT_CUSTOMIZATION_BY_ID_SQL,
+                        new Object[] { parentCustomizationId });
+                customizationId = ((Number) customization.get("ID")).longValue();
+                parentCustomizationId = numberToLong((Number) customization.get("PARENT_ID"));
+            } else {
+                finished = true;
+            }
+        } else {
+            definition = definitions.get(0);
+            finished = true;
+        }
+    } while (!finished);
+
+    if (definition != null) {
+        AttributeRowMapper attributeRowMapper = new AttributeRowMapper(definition);
+        getJdbcTemplate().query(SELECT_ATTRIBUTES_SQL,
+                new Object[] { definition.getId() }, attributeRowMapper);
+    }
+    return definition;
+}
+-------------------------------------
+
+  The steps that are followed are:
+
+  [[1]] search for a definition that is usable with the customization id
+  (id of the locale in the DB) that is suggested by the caller;
+
+  [[2]] if the definition has not been found, the parent customization id is
+  used and the operation at point 1 is done, until a definition is found;
+
+  [[3]] if the definition has been found, the attributes are loaded from the DB.
+
+  []
+
+  Notice that the definition's inheritance <<is not resolved>> because it will
+  be done by the implementation of
+  {{{../apidocs/org/apache/tiles/definition/DefinitionsFactory.html}DefinitionsFactory}}
+  that will call the definitions DAO multiple times to resolve inheritance.
+
+  The <<<DbDefinition>>> is a simple extension of
+  {{{../apidocs/org/apache/tiles/Definition.html}Definition}}
+  with the addition of an id.
+
+* Configuration
+
+  To use the definitions DAO we need to configure Tiles to use an alternate
+  {{{../apidocs/org/apache/tiles/definition/DefinitionsFactory.html}DefinitionsFactory}}
+  that is
+  {{{../apidocs/org/apache/tiles/definition/LocaleDefinitionsFactory.html}LocaleDefinitionsFactory}}.
+  This definitions factory resolves definitions one by one, by retrieving all
+  extended definitions through calls to the definition DAO.
+
+  Though it may seem slow, it is memory-efficient and it is effective when
+  the number of definitions is high.
+
+  Here will be using pure Java configuration. A new class extending
+  {{{../apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html}BasicTilesContainerFactory}}
+  must be created. It will be called <<<TestDbTilesContainerFactory>>>.
+  This is the source:
+
+-------------------------------------
+public class TestDbTilesContainerFactory extends BasicTilesContainerFactory {
+
+    /** {@inheritDoc} */
+    @Override
+    protected DefinitionDAO<Locale> createLocaleDefinitionDao(Object context,
+            TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory, LocaleResolver resolver) {
+        LocaleDbDefinitionDAO definitionDao = new LocaleDbDefinitionDAO();
+        definitionDao.setDataSource((DataSource) applicationContext
+                .getApplicationScope().get("dataSource"));
+        return definitionDao;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected LocaleDefinitionsFactory instantiateDefinitionsFactory(
+            Object context, TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory, LocaleResolver resolver) {
+        return new LocaleDefinitionsFactory();
+   }
+}
+-------------------------------------
+
+  In <<<web.xml>>> add this piece of configuration:
+
+-------------------------------------
+<servlet>
+    <servlet-name>tiles-db</servlet-name>
+    <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
+    <init-param>
+        <param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
+        <param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
+    </init-param>
+</servlet>
+-------------------------------------
+
+  And you're done!
   
\ No newline at end of file

Propchange: tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/how-to/definitions-db.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/src/site/apt/how-to/index.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/how-to/index.apt?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/how-to/index.apt (original)
+++ tiles/framework/trunk/src/site/apt/how-to/index.apt Thu Oct 30 05:54:10 2008
@@ -1,31 +1,31 @@
-~~ $Id: index.apt 700494 2008-09-30 15:12:54Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         HOW-TOs guides
-         -----------
-
-HOW-TOs guides
-
-  Here is collected a set of HOW-TOs to help developing common use cases of
-  Tiles.
-
-Summary
-
-  [[1]] {{{definitions-db.html}Loading definitions from a database}}
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         HOW-TOs guides
+         -----------
+
+HOW-TOs guides
+
+  Here is collected a set of HOW-TOs to help developing common use cases of
+  Tiles.
+
+Summary
+
+  [[1]] {{{definitions-db.html}Loading definitions from a database}}

Propchange: tiles/framework/trunk/src/site/apt/how-to/index.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/how-to/index.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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=709153&r1=709152&r2=709153&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 Thu Oct 30 05:54:10 2008
@@ -1,101 +1,101 @@
-~~ $Id: runtime.apt 700127 2008-09-29 13:32:33Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         Attribute rendering
-         -----------
-
-Attribute rendering
-
-  With Tiles 2.1, attribute rendering behaviour can be customized. The "type"
-  of an attribute can be still <<<string>>>, <<<definition>>> or <<<template>>>
-  but you can define new types or use a class name directly.
-
-Default behaviour
-
-  The behaviour that Tiles follows is compatible with Tiles 2.0 and it applies
-  both to XML definition files and JSP tags. Tiles follows these steps: 
-
-  * If the type is not specified:
-
-  ** if the value is a valid definition name, the definition is rendered;
-
-  ** if the value starts with a '/', a template will be rendered;
-
-  ** otherwise, a string will be rendered.
-
-  * If the type is specified:
-
-  ** if the type is <<<string>>>, <<<definition>>> or <<<template>>>, it will
-  be rendered like in Tiles 2.0;
-
-  ** otherwise, Tiles tries to instantiate (only once) a class whose name is
-  specified in the "type" of the attribute. If an error occurs, it pops up as
-  a runtime exception.
-
-Customize attribute rendering
-
-  With Tiles 2.1 you can customize rendering in three ways:
-
-  * specifying new renderers;
-
-  * overriding the default renderer for untyped attributes;
-
-  * specifying a new renderer factory.
-
-* Custom attribute renderers
-
-  If you don't want to use class names as attribute types, you can use new
-  "named" custom attribute renderers. You can do it by:
-
-  * using the
-  {{{../../config-reference.html#org.apache.tiles.renderer.impl.BasicRendererFactory.TYPE_RENDERERS}<<<org.apache.tiles.renderer.impl.BasicRendererFactory.TYPE_RENDERERS>>>}}
-  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}}
-  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
-
-* Custom default attribute renderer
-
-  The behaviour of Tiles when the type of an attribute is not specified can be
-  also customized. You can do it by:
-
-  * using the
-  {{{../../config-reference.html#org.apache.tiles.renderer.impl.BasicRendererFactory.DEFAULT_RENDERER}<<<org.apache.tiles.renderer.impl.BasicRendererFactory.DEFAULT_RENDERER>>>}}
-  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}}
-  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
-
-* Custom attribute renderer factory
-
-  The attribute renderer factory can be completely customized, leaving to you
-  the maximum freedom of choice in the attribute renderer creation. You can
-  specify the factory's implementation by:
-
-  * using the
-  {{{../../config-reference.html#org.apache.tiles.renderer.RendererFactory}<<<org.apache.tiles.renderer.RendererFactory>>>}}
-  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}}
-  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         Attribute rendering
+         -----------
+
+Attribute rendering
+
+  With Tiles 2.1, attribute rendering behaviour can be customized. The "type"
+  of an attribute can be still <<<string>>>, <<<definition>>> or <<<template>>>
+  but you can define new types or use a class name directly.
+
+Default behaviour
+
+  The behaviour that Tiles follows is compatible with Tiles 2.0 and it applies
+  both to XML definition files and JSP tags. Tiles follows these steps: 
+
+  * If the type is not specified:
+
+  ** if the value is a valid definition name, the definition is rendered;
+
+  ** if the value starts with a '/', a template will be rendered;
+
+  ** otherwise, a string will be rendered.
+
+  * If the type is specified:
+
+  ** if the type is <<<string>>>, <<<definition>>> or <<<template>>>, it will
+  be rendered like in Tiles 2.0;
+
+  ** otherwise, Tiles tries to instantiate (only once) a class whose name is
+  specified in the "type" of the attribute. If an error occurs, it pops up as
+  a runtime exception.
+
+Customize attribute rendering
+
+  With Tiles 2.1 you can customize rendering in three ways:
+
+  * specifying new renderers;
+
+  * overriding the default renderer for untyped attributes;
+
+  * specifying a new renderer factory.
+
+* Custom attribute renderers
+
+  If you don't want to use class names as attribute types, you can use new
+  "named" custom attribute renderers. You can do it by:
+
+  * using the
+  {{{../../config-reference.html#org.apache.tiles.renderer.impl.BasicRendererFactory.TYPE_RENDERERS}<<<org.apache.tiles.renderer.impl.BasicRendererFactory.TYPE_RENDERERS>>>}}
+  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}}
+  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
+
+* Custom default attribute renderer
+
+  The behaviour of Tiles when the type of an attribute is not specified can be
+  also customized. You can do it by:
+
+  * using the
+  {{{../../config-reference.html#org.apache.tiles.renderer.impl.BasicRendererFactory.DEFAULT_RENDERER}<<<org.apache.tiles.renderer.impl.BasicRendererFactory.DEFAULT_RENDERER>>>}}
+  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}}
+  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
+
+* Custom attribute renderer factory
+
+  The attribute renderer factory can be completely customized, leaving to you
+  the maximum freedom of choice in the attribute renderer creation. You can
+  specify the factory's implementation by:
+
+  * using the
+  {{{../../config-reference.html#org.apache.tiles.renderer.RendererFactory}<<<org.apache.tiles.renderer.RendererFactory>>>}}
+  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}}
+  of <<<BasicTilesContainerFactory>>> if you are using Java-based configuration.
     
\ No newline at end of file

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/attribute-rendering.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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=709153&r1=709152&r2=709153&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 Thu Oct 30 05:54:10 2008
@@ -1,4 +1,4 @@
-~~ $Id: nesting-extending.apt 695577 2008-09-15 18:47:00Z apetrelli $
+~~ $Id$
 ~~
 ~~ Licensed to the Apache Software Foundation (ASF) under one
 ~~ or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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=709153&r1=709152&r2=709153&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 Thu Oct 30 05:54:10 2008
@@ -1,72 +1,72 @@
-~~ $Id: list-attributes.apt 700538 2008-09-30 18:08:44Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         Using multiple containers
-         -----------
-
-Defining multiple containers
-
-  With Tiles 2.1 it is possible to use more that one Tiles container in your
-  application.
-
-* 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}}
-  initialization parameter. For example:
-
-------------------------------------
-<servlet>
-    <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-value>alternate</param-value>
-    </init-param>
-</servlet>
-------------------------------------
-
-Selecting one non-default container
-
-  Once defined, it is possible to select a non-default container through Java
-  or JSP
-
-* Selection through Java
-
-  It is possible to use, for the current request, a different container
-  stored under another key, by using
-  {{{../../apidocs/org/apache/tiles/servlet/context/ServletUtil.html#setCurrentContainer(javax.servlet.ServletRequest,%20javax.servlet.ServletContext,%20org.apache.tiles.TilesContainer)}<<<setCurrentContainer>>>}}
-  method of ServletUtil class. For example:
-
-------------------------------------
-ServletUtil.setCurrentContainer(request, applicationContext, "myContainerKey");
-------------------------------------
-
-  If the last parameter is <<<null>>>, the default container is selected.
-
-* Selection through JSP
-
-  The current container can be selected also through the use of JSP:
-
-------------------------------------
-<tiles:setCurrentContainer containerKey="myContainerKey" />
-------------------------------------
-
-  If the <<<containerKey>>> attribute is not present, the default container is selected.
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         Using multiple containers
+         -----------
+
+Defining multiple containers
+
+  With Tiles 2.1 it is possible to use more that one Tiles container in your
+  application.
+
+* 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}}
+  initialization parameter. For example:
+
+------------------------------------
+<servlet>
+    <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-value>alternate</param-value>
+    </init-param>
+</servlet>
+------------------------------------
+
+Selecting one non-default container
+
+  Once defined, it is possible to select a non-default container through Java
+  or JSP
+
+* Selection through Java
+
+  It is possible to use, for the current request, a different container
+  stored under another key, by using
+  {{{../../apidocs/org/apache/tiles/servlet/context/ServletUtil.html#setCurrentContainer(javax.servlet.ServletRequest,%20javax.servlet.ServletContext,%20org.apache.tiles.TilesContainer)}<<<setCurrentContainer>>>}}
+  method of ServletUtil class. For example:
+
+------------------------------------
+ServletUtil.setCurrentContainer(request, applicationContext, "myContainerKey");
+------------------------------------
+
+  If the last parameter is <<<null>>>, the default container is selected.
+
+* Selection through JSP
+
+  The current container can be selected also through the use of JSP:
+
+------------------------------------
+<tiles:setCurrentContainer containerKey="myContainerKey" />
+------------------------------------
+
+  If the <<<containerKey>>> attribute is not present, the default container is selected.

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/multiple-containers.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt Thu Oct 30 05:54:10 2008
@@ -1,91 +1,91 @@
-~~ $Id: menu.apt 700541 2008-09-30 18:32:01Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         Security
-         -----------
-
-Security
-
-  Tiles allows the visibility of a template, an attribute or a definition only
-  to selected roles.
-
-* Allowing definitions
-
-  A definition can be allowed to be rendered only by selected roles:
-
-  * in XML definition files:
-
----------------------------------
-<definition name="test.definition"
-    template="/layout/my-template.jsp role="myrole">
-    ...
-</definition>
----------------------------------
-
-  * in JSP pages, when inserting definitions:
-
----------------------------------
-<tiles:insertDefinition name="test.definition" role="myrole" />
----------------------------------
-
-  * in JSP pages, when definining definitions:
-
----------------------------------
-<tiles:definition name="test.definition"
-    template="/layout/my-template.jsp" "role="myrole">
-    ...
-</tiles:definition>
----------------------------------
-
-* Allowing attributes
-
-  An attribute can be allowed to be rendered only by selected roles:
-
-  * in XML definition files:
-
----------------------------------
-<definition name="test.definition"
-    template="/layout/my-template.jsp>
-  <put-attribute name="header" value="/header.jsp" role="myrole" />
-</definition>
----------------------------------
-
-  * in JSP pages, when inserting attributes:
-
----------------------------------
-<tiles:insertAttribute name="header" role="myrole" />
----------------------------------
-
-  * in JSP pages, when putting attributes:ù
-
----------------------------------
-<tiles:putAttribute name="header" value="/header.jsp" role="myrole" />
----------------------------------
-
-* Allowing templates
-
-  Templates can be allowed to be rendered only by selected rows in JSP pages:
-
----------------------------------
-<tiles:insertTemplate name="test.definition"
-    template="/layout/my-template.jsp" "role="myrole">
-    ...
-</tiles:insertTemplate>
----------------------------------
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         Security
+         -----------
+
+Security
+
+  Tiles allows the visibility of a template, an attribute or a definition only
+  to selected roles.
+
+* Allowing definitions
+
+  A definition can be allowed to be rendered only by selected roles:
+
+  * in XML definition files:
+
+---------------------------------
+<definition name="test.definition"
+    template="/layout/my-template.jsp role="myrole">
+    ...
+</definition>
+---------------------------------
+
+  * in JSP pages, when inserting definitions:
+
+---------------------------------
+<tiles:insertDefinition name="test.definition" role="myrole" />
+---------------------------------
+
+  * in JSP pages, when definining definitions:
+
+---------------------------------
+<tiles:definition name="test.definition"
+    template="/layout/my-template.jsp" "role="myrole">
+    ...
+</tiles:definition>
+---------------------------------
+
+* Allowing attributes
+
+  An attribute can be allowed to be rendered only by selected roles:
+
+  * in XML definition files:
+
+---------------------------------
+<definition name="test.definition"
+    template="/layout/my-template.jsp>
+  <put-attribute name="header" value="/header.jsp" role="myrole" />
+</definition>
+---------------------------------
+
+  * in JSP pages, when inserting attributes:
+
+---------------------------------
+<tiles:insertAttribute name="header" role="myrole" />
+---------------------------------
+
+  * in JSP pages, when putting attributes:ù
+
+---------------------------------
+<tiles:putAttribute name="header" value="/header.jsp" role="myrole" />
+---------------------------------
+
+* Allowing templates
+
+  Templates can be allowed to be rendered only by selected rows in JSP pages:
+
+---------------------------------
+<tiles:insertTemplate name="test.definition"
+    template="/layout/my-template.jsp" "role="myrole">
+    ...
+</tiles:insertTemplate>
+---------------------------------

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/security.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt Thu Oct 30 05:54:10 2008
@@ -1,4 +1,4 @@
-~~ $Id: nesting-extending.apt 695577 2008-09-15 18:47:00Z apetrelli $
+~~ $Id$
 ~~
 ~~ Licensed to the Apache Software Foundation (ASF) under one
 ~~ or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/advanced/wildcard.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt Thu Oct 30 05:54:10 2008
@@ -1,4 +1,4 @@
-~~ $Id: view.apt 538978 2007-05-17 15:43:58Z apetrelli $
+~~ $Id$
 ~~
 ~~ Licensed to the Apache Software Foundation (ASF) under one
 ~~ or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/integration/freemarker.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt Thu Oct 30 05:54:10 2008
@@ -1,142 +1,142 @@
-~~ $Id: configuration.apt 699348 2008-09-26 14:56:42Z apetrelli $
-~~
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements.  See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership.  The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License.  You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied.  See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-~~
-         -----------
-         Load XML definition files using wildcards
-         -----------
-
-Load XML definition files using wildcards
-
-  XML definition files can be loaded using wildcard, but this behaviour is not
-  the default, due to compatibility reasons to Tiles 2.0.x.
-
-* Prerequisites
-
-  To use wildcards in XML definition files, you need to put the following libraries
-  in your classpath:
-
-  * spring-core.jar
-
-  * spring-web.jar
-
-  * spring-context.jar
-
-  * spring-beans.jar
-
-  * aopalliance.jar
-
-  If you are using Maven, simply depend on <<<spring-web>>> package.
-
-* Configuration
-
-  To be able to specify Tiles XML definition files using wildcards, there is the
-  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>>>}}
-  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>
-</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}}
-  of <<<BasicTilesContainerFactory>>> this way:
-
-----------------------------------------
-/** {@inheritDoc} */
-@Override
-protected void registerChainedContextFactories(Object context,
-        ChainedTilesContextFactory contextFactory) {
-    List<TilesContextFactory> factories = new ArrayList<TilesContextFactory>(
-            CONTEXT_FACTORY_CHAIN_COUNT);
-    factories.add(new WildcardServletTilesContextFactory());
-    factories.add(new JspTilesContextFactory());
-    contextFactory.setFactories(factories);
-}
-----------------------------------------
-
-* Usage
-
-  To load XML definition files using wilcards you can proceed, as usual, in two
-  ways:
-
-
-  * If you are using parameter-based initialization, provide a new value for the
-  {{{../config-reference.html#org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG}<<<org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG>>>}}
-  init parameter. The files that have an underscore (_) in their name will be
-  skipped. You can specify, for example:
-
-----------------------------------------
-<init-param>
-    <param-name>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</param-name>
-    <param-value>/WEB-INF/tiles-defs*.xml,
-      classpath:/org/apache/**/tiles-defs.xml</param-value>
-</init-param>
-----------------------------------------
-
-  * 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}}
-  of <<<BasicTilesContainerFactory>>>. In the following example, notice the
-  manual exclusion of files including underscores (_):
-
-----------------------------------------
-/** {@inheritDoc} */
-@Override
-protected List<URL> getSourceURLs(Object context,
-        TilesApplicationContext applicationContext,
-        TilesContextFactory contextFactory) {
-    List<URL> urls = new ArrayList<URL>(URL_COUNT);
-    try {
-        Set<URL> urlSet = applicationContext
-                .getResources("/WEB-INF/tiles-defs*.xml");
-        for (URL url : urlSet) {
-            String externalForm = url.toExternalForm();
-            if (externalForm.indexOf('_', externalForm.lastIndexOf("/")) < 0) {
-                urls.add(url);
-            }
-        }
-        urls.add(applicationContext.getResource(
-                "classpath:/org/apache/tiles/classpath-defs.xml"));
-    } catch (IOException e) {
-        throw new DefinitionsFactoryException(
-                "Cannot load definition URLs", e);
-    }
-    return urls;
-}
-----------------------------------------
-
-* Syntax
-
-  Wildcard support uses Spring Framework syntax for loading files. For example:
-
-  * one asterisk (*) for a single placeholder;
-
-  * two asterisks (**) to say "in every directory under the specified one";
-
-  * the <<<classpath:>>> prefix loads files from the classpath.
-
-  * etc.
-
-  For everything else, see Spring's documentation.
+~~ $Id$
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+         -----------
+         Load XML definition files using wildcards
+         -----------
+
+Load XML definition files using wildcards
+
+  XML definition files can be loaded using wildcard, but this behaviour is not
+  the default, due to compatibility reasons to Tiles 2.0.x.
+
+* Prerequisites
+
+  To use wildcards in XML definition files, you need to put the following libraries
+  in your classpath:
+
+  * spring-core.jar
+
+  * spring-web.jar
+
+  * spring-context.jar
+
+  * spring-beans.jar
+
+  * aopalliance.jar
+
+  If you are using Maven, simply depend on <<<spring-web>>> package.
+
+* Configuration
+
+  To be able to specify Tiles XML definition files using wildcards, there is the
+  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>>>}}
+  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>
+</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}}
+  of <<<BasicTilesContainerFactory>>> this way:
+
+----------------------------------------
+/** {@inheritDoc} */
+@Override
+protected void registerChainedContextFactories(Object context,
+        ChainedTilesContextFactory contextFactory) {
+    List<TilesContextFactory> factories = new ArrayList<TilesContextFactory>(
+            CONTEXT_FACTORY_CHAIN_COUNT);
+    factories.add(new WildcardServletTilesContextFactory());
+    factories.add(new JspTilesContextFactory());
+    contextFactory.setFactories(factories);
+}
+----------------------------------------
+
+* Usage
+
+  To load XML definition files using wilcards you can proceed, as usual, in two
+  ways:
+
+
+  * If you are using parameter-based initialization, provide a new value for the
+  {{{../config-reference.html#org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG}<<<org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG>>>}}
+  init parameter. The files that have an underscore (_) in their name will be
+  skipped. You can specify, for example:
+
+----------------------------------------
+<init-param>
+    <param-name>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</param-name>
+    <param-value>/WEB-INF/tiles-defs*.xml,
+      classpath:/org/apache/**/tiles-defs.xml</param-value>
+</init-param>
+----------------------------------------
+
+  * 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}}
+  of <<<BasicTilesContainerFactory>>>. In the following example, notice the
+  manual exclusion of files including underscores (_):
+
+----------------------------------------
+/** {@inheritDoc} */
+@Override
+protected List<URL> getSourceURLs(Object context,
+        TilesApplicationContext applicationContext,
+        TilesContextFactory contextFactory) {
+    List<URL> urls = new ArrayList<URL>(URL_COUNT);
+    try {
+        Set<URL> urlSet = applicationContext
+                .getResources("/WEB-INF/tiles-defs*.xml");
+        for (URL url : urlSet) {
+            String externalForm = url.toExternalForm();
+            if (externalForm.indexOf('_', externalForm.lastIndexOf("/")) < 0) {
+                urls.add(url);
+            }
+        }
+        urls.add(applicationContext.getResource(
+                "classpath:/org/apache/tiles/classpath-defs.xml"));
+    } catch (IOException e) {
+        throw new DefinitionsFactoryException(
+                "Cannot load definition URLs", e);
+    }
+    return urls;
+}
+----------------------------------------
+
+* Syntax
+
+  Wildcard support uses Spring Framework syntax for loading files. For example:
+
+  * one asterisk (*) for a single placeholder;
+
+  * two asterisks (**) to say "in every directory under the specified one";
+
+  * the <<<classpath:>>> prefix loads files from the classpath.
+
+  * etc.
+
+  For everything else, see Spring's documentation.

Propchange: tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/tutorial/wildcard-configuration.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/src/site/apt/whats-new.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/whats-new.apt?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/whats-new.apt (original)
+++ tiles/framework/trunk/src/site/apt/whats-new.apt Thu Oct 30 05:54:10 2008
@@ -1,4 +1,4 @@
-~~ $Id: getting_started.apt 693560 2008-09-09 18:54:13Z apetrelli $
+~~ $Id$
 ~~
 ~~ Licensed to the Apache Software Foundation (ASF) under one
 ~~ or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/src/site/apt/whats-new.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/src/site/apt/whats-new.apt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: tiles/framework/trunk/src/site/resources/images/db-schema.png
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java Thu Oct 30 05:54:10 2008
@@ -1,5 +1,5 @@
 /*
- * $Id: CannotInstantiateObjectException.java 637434 2008-03-15 15:48:38Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,7 +25,7 @@
 /**
  * Indicates that a method cannot be accessed.
  *
- * @version $Rev: 637434 $ $Date: 2008-03-15 16:48:38 +0100 (sab, 15 mar 2008) $
+ * @version $Rev$ $Date$
  * @since 2.1.0
  */
 public class CannotAccessMethodException extends TilesException {

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotAccessMethodException.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java Thu Oct 30 05:54:10 2008
@@ -1,5 +1,5 @@
 /*
- * $Id: CannotInstantiateObjectException.java 637434 2008-03-15 15:48:38Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,7 +25,7 @@
 /**
  * Indicates that an object cannot be instantiated.
  *
- * @version $Rev: 637434 $ $Date: 2008-03-15 16:48:38 +0100 (sab, 15 mar 2008) $
+ * @version $Rev$ $Date$
  * @since 2.1.0
  */
 public class CannotInstantiateObjectException extends TilesException {

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/CannotInstantiateObjectException.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java Thu Oct 30 05:54:10 2008
@@ -1,5 +1,5 @@
 /*
- * $Id: ClassUtil.java 637434 2008-03-15 15:48:38Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,7 +27,7 @@
 /**
  * Utilities to work with dynamic class loading and instantiation.
  *
- * @version $Rev: 637434 $ $Date: 2008-03-15 16:48:38 +0100 (sab, 15 mar 2008) $
+ * @version $Rev$ $Date$
  * @since 2.0.7
  */
 public final class ClassUtil {

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (original)
+++ tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java Thu Oct 30 05:54:10 2008
@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsPreparerFactory.java 603355 2007-12-11 20:48:27Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,7 +27,7 @@
 /**
  * Factory used to instantiate preparers in a Struts 1 / Tiles 2 environment.
  *
- * @version $Rev: 603355 $ $Date: 2007-12-11 21:48:27 +0100 (mar, 11 dic 2007) $
+ * @version $Rev$ $Date$
  * @since 2.1.0
  */
 public class CompatibilityPreparerFactory extends BasicPreparerFactory {

Propchange: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java Thu Oct 30 05:54:10 2008
@@ -20,8 +20,6 @@
  */
 package org.apache.tiles.util;
 
-import org.apache.tiles.reflect.CannotInstantiateObjectException;
-
 /**
  * Utilities to work with dynamic class loading and instantiation.
  *
@@ -43,8 +41,8 @@
      *
      * @param className The class name to load and to instantiate.
      * @return The new instance of the class name.
-     * @throws CannotInstantiateObjectException If something goes wrong during
-     * instantiation.
+     * @throws org.apache.tiles.reflect.CannotInstantiateObjectException If
+     * something goes wrong during instantiation.
      * @deprecated Use
      * {@link org.apache.tiles.reflect.ClassUtil#instantiate(String)}.
      */
@@ -62,8 +60,8 @@
      * returns <code>true</code>, otherwise it throws a
      * <code>TilesException</code>.
      * @return The new instance of the class name.
-     * @throws CannotInstantiateObjectException If something goes wrong during
-     * instantiation.
+     * @throws org.apache.tiles.reflect.CannotInstantiateObjectException If
+     * something goes wrong during instantiation.
      * @deprecated Use
      * {@link org.apache.tiles.reflect.ClassUtil#instantiate(String, boolean)}.
      */

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java Thu Oct 30 05:54:10 2008
@@ -97,9 +97,9 @@
     }
 
     /** {@inheritDoc} */
-	public TilesApplicationContext getApplicationContext() {
-		return null;
-	}
+    public TilesApplicationContext getApplicationContext() {
+        return null;
+    }
 
     /** {@inheritDoc} */
     public void include(String path) throws IOException {

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Thu Oct 30 05:54:10 2008
@@ -250,11 +250,22 @@
         assertTrue("The default renderer class is not correct",
                 renderer instanceof UntypedAttributeRenderer);
     }
-    
+
+    /**
+     * A test Tiles container factory.
+     */
     public static class CustomBasicTilesContainerFactory extends BasicTilesContainerFactory {
 
+        /**
+         * The application context.
+         */
         private TilesApplicationContext applicationContext;
-        
+
+        /**
+         * Constructor.
+         *
+         * @param applicationContext The Tiles application context.
+         */
         public CustomBasicTilesContainerFactory(TilesApplicationContext applicationContext) {
             this.applicationContext = applicationContext;
         }

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Thu Oct 30 05:54:10 2008
@@ -66,8 +66,8 @@
     public void testInitAndGetRenderer() {
         Map<String, String> params = new HashMap<String, String>();
         params.put(BasicRendererFactory.TYPE_RENDERERS_INIT_PARAM, "test,"
-				+ StringAttributeRenderer.class.getName() + ";test2,"
-				+ StringAttributeRenderer.class.getName());
+                + StringAttributeRenderer.class.getName() + ";test2,"
+                + StringAttributeRenderer.class.getName());
         rendererFactory.init(params);
         AttributeRenderer renderer = rendererFactory.getRenderer("string");
         assertNotNull("The renderer is null", renderer);

Modified: tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java?rev=709153&r1=709152&r2=709153&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java (original)
+++ tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java Thu Oct 30 05:54:10 2008
@@ -1,5 +1,5 @@
 /*
- * $Id: WildcardServletTilesApplicationContextTest.java 676174 2008-07-12 13:01:03Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -38,7 +38,7 @@
 /**
  * Tests {@link WildcardPortletTilesApplicationContext}.
  *
- * @version $Rev: 676174 $ $Date: 2008-07-12 15:01:03 +0200 (sab, 12 lug 2008) $
+ * @version $Rev$ $Date$
  */
 public class WildcardPortletTilesApplicationContextTest extends TestCase {
 

Propchange: tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL