Author: apetrelli
Date: Wed Mar 4 12:41:31 2009
New Revision: 749983
URL: http://svn.apache.org/viewvc?rev=749983&view=rev
Log:
TILES-374
Merge from trunk to TILES_2_1_X branch.
Applied patch by "pijmleko"
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/config-reference.apt
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/dev/ (props changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/getting_started.apt
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/ (props
changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/selenium.apt (props
changed)
tiles/framework/branches/TILES_2_1_X/src/site/apt/tutorial/ (props
changed)
tiles/framework/branches/TILES_2_1_X/src/site/resources/images/page_to_page.png
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/resources/images/tiled_page.png
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/dev/building.xml
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/dev/snapshots.xml
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/images/page_to_page.svg
(props changed)
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/images/tiled_page.svg
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/reflect/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/web/startup/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/web/util/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactoryTest.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/web/util/
(props changed)
Propchange: tiles/framework/branches/TILES_2_1_X/
------------------------------------------------------------------------------
svn:mergeinfo = /tiles/framework/trunk:749981
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/apt/config-reference.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/apt/dev/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/apt/getting_started.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/apt/migration/
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/apt/selenium.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/apt/tutorial/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/resources/images/page_to_page.png
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/resources/images/tiled_page.png
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/xdoc/dev/building.xml
('svn:mergeinfo' removed)
Propchange: tiles/framework/branches/TILES_2_1_X/src/site/xdoc/dev/snapshots.xml
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/images/page_to_page.svg
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/src/site/xdoc/images/tiled_page.svg
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/reflect/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
('svn:mergeinfo' removed)
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=749983&r1=749982&r2=749983&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
Wed Mar 4 12:41:31 2009
@@ -599,15 +599,16 @@
}
/**
- * Renders the specified definition.
+ * Renders the definition with specified name.
*
* @param request The request context.
* @param definitionName The name of the definition to render.
* @throws NoSuchDefinitionException If the definition has not been found.
* @throws DefinitionsFactoryException If something goes wrong when
* obtaining the definition.
+ * @since 2.1.3
*/
- private void render(TilesRequestContext request, String definitionName) {
+ protected void render(TilesRequestContext request, String definitionName) {
if (log.isDebugEnabled()) {
log.debug("Render request recieved for definition '" +
definitionName + "'");
@@ -622,7 +623,16 @@
}
throw new NoSuchDefinitionException(definitionName);
}
+ render(request, definition);
+ }
+ /**
+ * Renders the specified definition
+ * @param request The request context.
+ * @param definition The definition to render.
+ * @since 2.1.3
+ */
+ protected void render(TilesRequestContext request, Definition definition) {
AttributeContext originalContext = getAttributeContext(request);
BasicAttributeContext subContext = new
BasicAttributeContext(originalContext);
subContext.inherit(definition);
@@ -666,8 +676,9 @@
* @param attributeContext The context to render.
* @throws InvalidTemplateException If the template is not valid.
* @throws CannotRenderException If something goes wrong during rendering.
+ * @since 2.1.3
*/
- private void render(TilesRequestContext request,
+ protected void render(TilesRequestContext request,
AttributeContext attributeContext) {
try {
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextTest.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/web/startup/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/main/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactoryTest.java
('svn:mergeinfo' removed)
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-servlet/src/test/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
