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 2009/11/07 20:17:16 UTC
svn commit: r833737 [1/4] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/
tiles-request/tiles-request-api/src/main/java/org/
tiles-request/tiles-request-api/src/main/java/org/apache/
tiles-request/tiles-request-api/src/main/java/org/apache/...
Author: apetrelli
Date: Sat Nov 7 19:17:09 2009
New Revision: 833737
URL: http://svn.apache.org/viewvc?rev=833737&view=rev
Log:
TILESSB-12
Moved and renamed TilesApplicationContext and TilesRequestContext to tiles-request-api.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/ApplicationContext.java
- copied, changed from r833143, tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
- copied, changed from r833143, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml
tiles/sandbox/trunk/tiles3/tiles-api/pom.xml
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/AttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/TypeDetectingAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml Sat Nov 7 19:17:09 2009
@@ -1,13 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>tiles-request</artifactId>
- <groupId>org.apache.tiles</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tiles request - API</name>
- <description>API for the Tiles Request framework.</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>tiles-request</artifactId>
+ <groupId>org.apache.tiles</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Tiles request - API</name>
+ <description>API for the Tiles Request framework.</description>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/ApplicationContext.java (from r833143, tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/ApplicationContext.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/ApplicationContext.java&p1=tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java&r1=833143&r2=833737&rev=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/ApplicationContext.java Sat Nov 7 19:17:09 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.request;
import java.net.URL;
import java.util.Map;
@@ -33,7 +33,7 @@
* @since 2.0
* @version $Rev$ $Date$
*/
-public interface TilesApplicationContext {
+public interface ApplicationContext {
/**
* Returns the original, technology-dependent, context.
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java (from r833143, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java&r1=833143&r2=833737&rev=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java Sat Nov 7 19:17:09 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles.request;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,7 +27,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
/**
* Encapsulation of request information.
@@ -35,7 +34,7 @@
* @since 2.0
* @version $Rev$ $Date$
*/
-public interface TilesRequestContext {
+public interface Request {
/**
* Return an immutable Map that maps header names to the first (or only)
@@ -76,7 +75,7 @@
* @return The application context associated to this request.
* @since 2.1.1
*/
- TilesApplicationContext getApplicationContext();
+ ApplicationContext getApplicationContext();
/**
* Dispatches the request to a specified path.
Modified: tiles/sandbox/trunk/tiles3/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/pom.xml?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/pom.xml Sat Nov 7 19:17:09 2009
@@ -99,5 +99,10 @@
<version>1.5.8</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java Sat Nov 7 19:17:09 2009
@@ -22,6 +22,8 @@
import java.io.IOException;
+import org.apache.tiles.request.ApplicationContext;
+
/**
* An encapsulation of the tiles framework. This interface is
* used to expose tiles features to frameworks which leverage
@@ -38,7 +40,7 @@
*
* @return current application context
*/
- TilesApplicationContext getApplicationContext();
+ ApplicationContext getApplicationContext();
/**
* Retrive the attribute context of the current request.
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java Sat Nov 7 19:17:09 2009
@@ -20,8 +20,8 @@
*/
package org.apache.tiles.access;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +53,7 @@
* @param container The container object to set.
* @since 2.1.2
*/
- public static void setContainer(TilesApplicationContext context,
+ public static void setContainer(ApplicationContext context,
TilesContainer container) {
setContainer(context, container, CONTAINER_ATTRIBUTE);
}
@@ -66,7 +66,7 @@
* @param key The key under which the container will be stored.
* @since 2.1.2
*/
- public static void setContainer(TilesApplicationContext context,
+ public static void setContainer(ApplicationContext context,
TilesContainer container, String key) {
Logger log = LoggerFactory.getLogger(TilesAccess.class);
if (key == null) {
@@ -93,7 +93,7 @@
* @return The default container object.
* @since 3.0.0
*/
- public static TilesContainer getContainer(TilesApplicationContext context) {
+ public static TilesContainer getContainer(ApplicationContext context) {
return getContainer(context, CONTAINER_ATTRIBUTE);
}
@@ -105,7 +105,7 @@
* @return The container object.
* @since 3.0.0
*/
- public static TilesContainer getContainer(TilesApplicationContext context,
+ public static TilesContainer getContainer(ApplicationContext context,
String key) {
if (key == null) {
key = CONTAINER_ATTRIBUTE;
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java Sat Nov 7 19:17:09 2009
@@ -27,8 +27,8 @@
import java.util.Map;
import org.junit.Test;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.ApplicationContext;
/**
* Tests {@link TilesAccess}.
@@ -38,11 +38,11 @@
public class TilesAccessTest {
/**
- * Tests {@link TilesAccess#setContainer(TilesApplicationContext, TilesContainer)}.
+ * Tests {@link TilesAccess#setContainer(ApplicationContext, TilesContainer)}.
*/
@Test
public void testSetContainer() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> attribs = new HashMap<String, Object>();
expect(context.getApplicationScope()).andReturn(attribs);
@@ -54,11 +54,11 @@
}
/**
- * Tests {@link TilesAccess#setContainer(TilesApplicationContext, TilesContainer, String)}.
+ * Tests {@link TilesAccess#setContainer(ApplicationContext, TilesContainer, String)}.
*/
@Test
public void testSetContainerWithKey() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> attribs = new HashMap<String, Object>();
expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
@@ -77,11 +77,11 @@
}
/**
- * Tests {@link TilesAccess#getContainer(TilesApplicationContext)}.
+ * Tests {@link TilesAccess#getContainer(ApplicationContext)}.
*/
@Test
public void testGetContainer() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> attribs = new HashMap<String, Object>();
expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
@@ -97,7 +97,7 @@
*/
@Test
public void testGetContainerWithKey() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> attribs = new HashMap<String, Object>();
expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java Sat Nov 7 19:17:09 2009
@@ -24,13 +24,13 @@
import java.io.IOException;
import org.apache.tiles.AttributeContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.preparer.ViewPreparerSupport;
+import org.apache.tiles.request.Request;
/**
* Uses a URL that acts as a preparer. When
- * {@link org.apache.tiles.preparer.ViewPreparer#execute(TilesRequestContext, AttributeContext)}
+ * {@link org.apache.tiles.preparer.ViewPreparer#execute(Request, AttributeContext)}
* is called, the URL is got, but its response is discarded.
*
* @version $Rev$ $Date$
@@ -54,7 +54,7 @@
/** {@inheritDoc} */
@Override
- public void execute(TilesRequestContext tilesContext,
+ public void execute(Request tilesContext,
AttributeContext attributeContext) {
try {
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java Sat Nov 7 19:17:09 2009
@@ -30,8 +30,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.AttributeContext;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
@@ -60,7 +60,7 @@
/**
* Test method for
* {@link org.apache.tiles.compat.preparer.UrlPreparer#execute(
- * org.apache.tiles.context.TilesRequestContext, org.apache.tiles.AttributeContext)}.
+ * org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
@@ -73,9 +73,9 @@
ServletContext servletContext = EasyMock
.createMock(ServletContext.class);
RequestDispatcher rd = EasyMock.createMock(RequestDispatcher.class);
- TilesApplicationContext applicationContext = new ServletTilesApplicationContext(
+ ApplicationContext applicationContext = new ServletTilesApplicationContext(
servletContext);
- TilesRequestContext requestContext = new ServletTilesRequestContext(
+ Request requestContext = new ServletTilesRequestContext(
applicationContext, request, response);
AttributeContext attributeContext = EasyMock
.createMock(AttributeContext.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java Sat Nov 7 19:17:09 2009
@@ -20,11 +20,11 @@
*/
package org.apache.tiles.awareness;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
/**
* It represents an object that can have a reference to the
- * {@link TilesApplicationContext}.
+ * {@link ApplicationContext}.
*
* @version $Rev$ $Date$
* @since 2.1.0
@@ -37,5 +37,5 @@
* @param applicationContext The Tiles application context.
* @since 2.1.0
*/
- void setApplicationContext(TilesApplicationContext applicationContext);
+ void setApplicationContext(ApplicationContext applicationContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java Sat Nov 7 19:17:09 2009
@@ -24,8 +24,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Default implementation for TilesRequestContextFactory, that creates a chain
@@ -52,9 +53,9 @@
}
/** {@inheritDoc} */
- public TilesRequestContext createRequestContext(
- TilesApplicationContext context, Object... requestItems) {
- TilesRequestContext retValue = null;
+ public Request createRequestContext(
+ ApplicationContext context, Object... requestItems) {
+ Request retValue = null;
for (Iterator<TilesRequestContextFactory> factoryIt = factories
.iterator(); factoryIt.hasNext() && retValue == null;) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java Sat Nov 7 19:17:09 2009
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
/**
* Delegate for ease of customization.
@@ -33,19 +33,19 @@
* @since Tiles 2.1.1
* @version $Rev$ $Date$
*/
-public class TilesApplicationContextWrapper implements TilesApplicationContext {
+public class TilesApplicationContextWrapper implements ApplicationContext {
/**
* The original context.
*/
- private TilesApplicationContext context;
+ private ApplicationContext context;
/**
* Constructor.
*
* @param context The original context.
*/
- public TilesApplicationContextWrapper(TilesApplicationContext context) {
+ public TilesApplicationContextWrapper(ApplicationContext context) {
this.context = context;
}
@@ -54,7 +54,7 @@
*
* @return The wrapped application context.
*/
- public TilesApplicationContext getWrappedApplicationContext() {
+ public ApplicationContext getWrappedApplicationContext() {
return context;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java Sat Nov 7 19:17:09 2009
@@ -20,10 +20,11 @@
*/
package org.apache.tiles.context;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
- * Creates an instance of the appropriate {@link TilesRequestContext}
+ * Creates an instance of the appropriate {@link Request}
* implementation.
*
* @version $Rev$ $Date$
@@ -35,10 +36,10 @@
* Create a TilesRequestContext for the given context,
* request, and response.
*
- * @param context the associated {@link TilesApplicationContext}
+ * @param context the associated {@link ApplicationContext}
* @param requestItems the associated request items, typically a request and a response.
* @return TilesRequestContext
*/
- TilesRequestContext createRequestContext(TilesApplicationContext context,
+ Request createRequestContext(ApplicationContext context,
Object... requestItems);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java Sat Nov 7 19:17:09 2009
@@ -21,8 +21,10 @@
package org.apache.tiles.context;
+import org.apache.tiles.request.Request;
+
/**
- * Holds in a {@link ThreadLocal} object a {@link TilesRequestContext}.
+ * Holds in a {@link ThreadLocal} object a {@link Request}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -32,7 +34,7 @@
/**
* The Tiles request context holder.
*/
- private ThreadLocal<TilesRequestContext> requestHolder = new ThreadLocal<TilesRequestContext>();
+ private ThreadLocal<Request> requestHolder = new ThreadLocal<Request>();
/**
* Sets the Tiles request context to use.
@@ -40,7 +42,7 @@
* @param request The Tiles request.
* @since 2.2.0
*/
- public void setTilesRequestContext(TilesRequestContext request) {
+ public void setTilesRequestContext(Request request) {
requestHolder.set(request);
}
@@ -50,7 +52,7 @@
* @return The Tiles request.
* @since 2.2.0
*/
- public TilesRequestContext getTilesRequestContext() {
+ public Request getTilesRequestContext() {
return requestHolder.get();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java Sat Nov 7 19:17:09 2009
@@ -27,7 +27,8 @@
import java.io.PrintWriter;
import java.io.Writer;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Delegate for ease of customization.
@@ -35,12 +36,12 @@
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public class TilesRequestContextWrapper implements TilesRequestContext {
+public class TilesRequestContextWrapper implements Request {
/**
* The wrapper request context object.
*/
- private TilesRequestContext context;
+ private Request context;
/**
@@ -48,7 +49,7 @@
*
* @param context The request context to wrap.
*/
- public TilesRequestContextWrapper(TilesRequestContext context) {
+ public TilesRequestContextWrapper(Request context) {
this.context = context;
}
@@ -58,7 +59,7 @@
* @return The wrapped Tiles request.
* @since 2.1.1
*/
- public TilesRequestContext getWrappedRequest() {
+ public Request getWrappedRequest() {
return context;
}
@@ -83,7 +84,7 @@
}
/** {@inheritDoc} */
- public TilesApplicationContext getApplicationContext() {
+ public ApplicationContext getApplicationContext() {
return context.getApplicationContext();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java Sat Nov 7 19:17:09 2009
@@ -27,7 +27,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public class EnhancedTilesApplicationContext implements TilesApplicationContext {
+public class EnhancedTilesApplicationContext implements ApplicationContext {
/**
* The logging object.
@@ -60,14 +60,14 @@
/**
* The root context to be wrapped.
*/
- private TilesApplicationContext rootContext;
+ private ApplicationContext rootContext;
/**
* Constructor.
*
* @param rootContext The root context to use.
*/
- public EnhancedTilesApplicationContext(TilesApplicationContext rootContext) {
+ public EnhancedTilesApplicationContext(ApplicationContext rootContext) {
this.rootContext = rootContext;
}
@@ -81,7 +81,7 @@
*
* @return The root context.
*/
- public TilesApplicationContext getRootContext() {
+ public ApplicationContext getRootContext() {
return rootContext;
}
@@ -90,7 +90,7 @@
*
* @param rootContext The root context.
*/
- public void setRootContext(TilesApplicationContext rootContext) {
+ public void setRootContext(ApplicationContext rootContext) {
this.rootContext = rootContext;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java Sat Nov 7 19:17:09 2009
@@ -22,7 +22,7 @@
package org.apache.tiles.definition;
import org.apache.tiles.Definition;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Interface for creating a {@link Definition}s and managing their contents.
@@ -75,5 +75,5 @@
* @return the Definition matching the given name or null if none
* is found.
*/
- Definition getDefinition(String name, TilesRequestContext tilesContext);
+ Definition getDefinition(String name, Request tilesContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java Sat Nov 7 19:17:09 2009
@@ -24,7 +24,7 @@
import java.util.Locale;
import org.apache.tiles.Definition;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* {@link DefinitionsFactory DefinitionsFactory} implementation that manages
@@ -45,7 +45,7 @@
/** {@inheritDoc} */
@Override
public Definition getDefinition(String name,
- TilesRequestContext tilesContext) {
+ Request tilesContext) {
Definition retValue;
Locale locale = null;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java Sat Nov 7 19:17:09 2009
@@ -24,11 +24,11 @@
import java.util.Locale;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* {@link DefinitionsFactory DefinitionsFactory} implementation that manages
@@ -58,7 +58,7 @@
*
* @since 2.2.1
*/
- protected TilesApplicationContext applicationContext;
+ protected ApplicationContext applicationContext;
/**
* The locale resolver object.
@@ -68,7 +68,7 @@
protected LocaleResolver localeResolver;
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
@@ -94,7 +94,7 @@
/** {@inheritDoc} */
public Definition getDefinition(String name,
- TilesRequestContext tilesContext) {
+ Request tilesContext) {
Locale locale = null;
if (tilesContext != null) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java Sat Nov 7 19:17:09 2009
@@ -33,11 +33,11 @@
import java.util.Set;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.RefreshMonitor;
+import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@
*
* @since 2.1.0
*/
- protected TilesApplicationContext applicationContext;
+ protected ApplicationContext applicationContext;
/**
* Reader used to get definitions from the sources.
@@ -113,7 +113,7 @@
}
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -22,7 +22,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Abstract class to link a correct evaluation of an attribute, by evaluating
@@ -34,7 +34,7 @@
public abstract class AbstractAttributeEvaluator implements AttributeEvaluator {
/** {@inheritDoc} */
- public Object evaluate(Attribute attribute, TilesRequestContext request) {
+ public Object evaluate(Attribute attribute, Request request) {
if (attribute == null) {
throw new IllegalArgumentException("The attribute cannot be null");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -21,7 +21,7 @@
package org.apache.tiles.evaluator;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* It represents an object that resolves a string to return an object.
@@ -39,7 +39,7 @@
* @return The evaluated object.
* @since 2.1.0
*/
- Object evaluate(String expression, TilesRequestContext request);
+ Object evaluate(String expression, Request request);
/**
* Evaluates an attribute value.
@@ -49,5 +49,5 @@
* @return The evaluated object.
* @since 2.1.0
*/
- Object evaluate(Attribute attribute, TilesRequestContext request);
+ Object evaluate(Attribute attribute, Request request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -20,8 +20,8 @@
*/
package org.apache.tiles.evaluator.impl;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
+import org.apache.tiles.request.Request;
/**
* Resolves a string and returns the string itself. It is useful for backward
@@ -33,7 +33,7 @@
public class DirectAttributeEvaluator extends AbstractAttributeEvaluator {
/** {@inheritDoc} */
- public Object evaluate(String expression, TilesRequestContext request) {
+ public Object evaluate(String expression, Request request) {
return expression;
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java Sat Nov 7 19:17:09 2009
@@ -20,8 +20,8 @@
*/
package org.apache.tiles.factory;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.ApplicationContext;
/**
* Abstract Factory that creates instances of {@link TilesContainerFactory}.
@@ -49,5 +49,5 @@
* instantiation.
* @since 2.1.1
*/
- public abstract TilesContainer createContainer(TilesApplicationContext applicationContext);
+ public abstract TilesContainer createContainer(ApplicationContext applicationContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Sat Nov 7 19:17:09 2009
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Locale;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
@@ -60,6 +59,7 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
+import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@
/** {@inheritDoc} */
@Override
- public TilesContainer createContainer(TilesApplicationContext applicationContext) {
+ public TilesContainer createContainer(ApplicationContext applicationContext) {
BasicTilesContainer container = instantiateContainer(applicationContext);
TilesRequestContextFactory requestContextFactory =
createRequestContextFactory(applicationContext);
@@ -121,7 +121,7 @@
* @since 2.1.1
*/
protected BasicTilesContainer instantiateContainer(
- TilesApplicationContext context) {
+ ApplicationContext context) {
return new BasicTilesContainer();
}
@@ -134,7 +134,7 @@
* @since 2.1.1
*/
protected TilesRequestContextFactory createRequestContextFactory(
- TilesApplicationContext context) {
+ ApplicationContext context) {
ChainedTilesRequestContextFactory contextFactory = new ChainedTilesRequestContextFactory();
registerChainedRequestContextFactories(contextFactory);
@@ -232,7 +232,7 @@
* @return The definitions factory.
* @since 2.1.1
*/
- protected DefinitionsFactory createDefinitionsFactory(TilesApplicationContext applicationContext,
+ protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
UnresolvingLocaleDefinitionsFactory factory = instantiateDefinitionsFactory(
@@ -257,7 +257,7 @@
* @since 2.2.1
*/
protected UnresolvingLocaleDefinitionsFactory instantiateDefinitionsFactory(
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
return new UnresolvingLocaleDefinitionsFactory();
}
@@ -272,7 +272,7 @@
* @return The definition DAO.
* @since 2.1.1
*/
- protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(TilesApplicationContext applicationContext,
+ protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
ResolvingLocaleUrlDefinitionDAO dao = new ResolvingLocaleUrlDefinitionDAO();
@@ -289,7 +289,7 @@
* @since 2.1.1
*/
@SuppressWarnings("unchecked")
- protected DefinitionDAO<Locale> createLocaleDefinitionDao(TilesApplicationContext applicationContext,
+ protected DefinitionDAO<Locale> createLocaleDefinitionDao(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
BaseLocaleUrlDefinitionDAO definitionDao = instantiateLocaleDefinitionDao(
@@ -313,7 +313,7 @@
* @return The locale resolver.
* @since 2.1.1
*/
- protected LocaleResolver createLocaleResolver(TilesApplicationContext applicationContext,
+ protected LocaleResolver createLocaleResolver(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
return new DefaultLocaleResolver();
}
@@ -328,7 +328,7 @@
* @since 2.1.1
*/
protected DefinitionsReader createDefinitionsReader(
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
return new DigesterDefinitionsReader();
}
@@ -342,7 +342,7 @@
* @return The source URLs.
* @since 2.1.1
*/
- protected List<URL> getSourceURLs(TilesApplicationContext applicationContext,
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
List<URL> retValue = new ArrayList<URL>(1);
try {
@@ -367,7 +367,7 @@
* @since 2.2.0
*/
protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
return new BasicAttributeEvaluatorFactory(new DirectAttributeEvaluator());
}
@@ -381,7 +381,7 @@
* @return The preparer factory.
* @since 2.1.1
*/
- protected PreparerFactory createPreparerFactory(TilesApplicationContext applicationContext,
+ protected PreparerFactory createPreparerFactory(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
return new BasicPreparerFactory();
}
@@ -400,7 +400,7 @@
* @return The renderer factory.
* @since 2.2.0
*/
- protected RendererFactory createRendererFactory(TilesApplicationContext applicationContext,
+ protected RendererFactory createRendererFactory(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container, AttributeEvaluatorFactory attributeEvaluatorFactory) {
BasicRendererFactory retValue = new BasicRendererFactory();
@@ -430,7 +430,7 @@
*/
protected AttributeRenderer createDefaultAttributeRenderer(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -482,7 +482,7 @@
*/
protected void registerAttributeRenderers(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -513,7 +513,7 @@
*/
protected AttributeRenderer createStringAttributeRenderer(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -537,7 +537,7 @@
*/
protected AttributeRenderer createTemplateAttributeRenderer(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -561,7 +561,7 @@
*/
protected AttributeRenderer createDefinitionAttributeRenderer(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Nov 7 19:17:09 2009
@@ -27,9 +27,7 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
@@ -42,6 +40,8 @@
import org.apache.tiles.preparer.ViewPreparer;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@
/**
* The Tiles application context object.
*/
- private TilesApplicationContext context;
+ private ApplicationContext context;
/**
* The definitions factory.
@@ -107,19 +107,19 @@
/** {@inheritDoc} */
public AttributeContext startContext(Object... requestItems) {
- TilesRequestContext tilesContext = getRequestContext(requestItems);
+ Request tilesContext = getRequestContext(requestItems);
return startContext(tilesContext);
}
/** {@inheritDoc} */
public void endContext(Object... requestItems) {
- TilesRequestContext tilesContext = getRequestContext(requestItems);
+ Request tilesContext = getRequestContext(requestItems);
endContext(tilesContext);
}
/** {@inheritDoc} */
public void renderContext(Object... requestItems) {
- TilesRequestContext request = getRequestContext(requestItems);
+ Request request = getRequestContext(requestItems);
AttributeContext attributeContext = getAttributeContext(request);
render(request, attributeContext);
@@ -130,7 +130,7 @@
*
* @return the application context for this container.
*/
- public TilesApplicationContext getApplicationContext() {
+ public ApplicationContext getApplicationContext() {
return context;
}
@@ -139,13 +139,13 @@
*
* @param context The Tiles application context.
*/
- public void setApplicationContext(TilesApplicationContext context) {
+ public void setApplicationContext(ApplicationContext context) {
this.context = context;
}
/** {@inheritDoc} */
public AttributeContext getAttributeContext(Object... requestItems) {
- TilesRequestContext tilesContext = getRequestContext(requestItems);
+ Request tilesContext = getRequestContext(requestItems);
return getAttributeContext(tilesContext);
}
@@ -228,7 +228,7 @@
/** {@inheritDoc} */
public void prepare(String preparer, Object... requestItems) {
- TilesRequestContext requestContext = getRequestContextFactory().createRequestContext(
+ Request requestContext = getRequestContextFactory().createRequestContext(
getApplicationContext(),
requestItems
);
@@ -237,7 +237,7 @@
/** {@inheritDoc} */
public void render(String definitionName, Object... requestItems) {
- TilesRequestContext requestContext = getRequestContextFactory().createRequestContext(
+ Request requestContext = getRequestContextFactory().createRequestContext(
getApplicationContext(),
requestItems
);
@@ -247,14 +247,14 @@
/** {@inheritDoc} */
public void render(Attribute attr, Object... requestItems)
throws IOException {
- TilesRequestContext requestContext = getRequestContextFactory()
+ Request requestContext = getRequestContextFactory()
.createRequestContext(getApplicationContext(), requestItems);
render(attr, requestContext);
}
/** {@inheritDoc} */
public Object evaluate(Attribute attribute, Object... requestItems) {
- TilesRequestContext request = getRequestContextFactory()
+ Request request = getRequestContextFactory()
.createRequestContext(context, requestItems);
AttributeEvaluator evaluator = attributeEvaluatorFactory
.getAttributeEvaluator(attribute);
@@ -276,7 +276,7 @@
* exception.
*/
protected Definition getDefinition(String definitionName,
- TilesRequestContext request) {
+ Request request) {
Definition definition =
definitionsFactory.getDefinition(definitionName, request);
return definition;
@@ -304,7 +304,7 @@
* @since 2.0.6
*/
@SuppressWarnings("unchecked")
- protected ArrayStack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
+ protected ArrayStack<AttributeContext> getContextStack(Request tilesContext) {
ArrayStack<AttributeContext> contextStack =
(ArrayStack<AttributeContext>) tilesContext
.getRequestScope().get(ATTRIBUTE_CONTEXT_STACK);
@@ -325,7 +325,7 @@
* @since 2.0.6
*/
protected void pushContext(AttributeContext context,
- TilesRequestContext tilesContext) {
+ Request tilesContext) {
ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
contextStack.push(context);
}
@@ -337,7 +337,7 @@
* @return The popped context object.
* @since 2.0.6
*/
- protected AttributeContext popContext(TilesRequestContext tilesContext) {
+ protected AttributeContext popContext(Request tilesContext) {
ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
return contextStack.pop();
}
@@ -349,7 +349,7 @@
* @return BasicAttributeContext or null if context is not found.
* @since 2.0.6
*/
- protected AttributeContext getContext(TilesRequestContext tilesContext) {
+ protected AttributeContext getContext(Request tilesContext) {
ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
if (!contextStack.isEmpty()) {
return contextStack.peek();
@@ -364,7 +364,7 @@
* @param tilesContext The request context to use.
* @return The current attribute context.
*/
- private AttributeContext getAttributeContext(TilesRequestContext tilesContext) {
+ private AttributeContext getAttributeContext(Request tilesContext) {
AttributeContext context = getContext(tilesContext);
if (context == null) {
context = new BasicAttributeContext();
@@ -379,7 +379,7 @@
* @param requestItems The request items.
* @return The created Tiles request context.
*/
- private TilesRequestContext getRequestContext(Object... requestItems) {
+ private Request getRequestContext(Object... requestItems) {
return getRequestContextFactory().createRequestContext(
getApplicationContext(), requestItems);
}
@@ -390,7 +390,7 @@
* @param tilesContext The request context to use.
* @return The newly created attribute context.
*/
- private AttributeContext startContext(TilesRequestContext tilesContext) {
+ private AttributeContext startContext(Request tilesContext) {
AttributeContext context = new BasicAttributeContext();
ArrayStack<AttributeContext> stack = getContextStack(tilesContext);
if (!stack.isEmpty()) {
@@ -406,7 +406,7 @@
*
* @param tilesContext The request context to use.
*/
- private void endContext(TilesRequestContext tilesContext) {
+ private void endContext(Request tilesContext) {
popContext(tilesContext);
}
@@ -421,7 +421,7 @@
* <code>ignoreMissing</code> is not set) or if the preparer itself threw an
* exception.
*/
- private void prepare(TilesRequestContext context, String preparerName, boolean ignoreMissing) {
+ private void prepare(Request context, String preparerName, boolean ignoreMissing) {
if (log.isDebugEnabled()) {
log.debug("Prepare request received for '" + preparerName);
@@ -451,7 +451,7 @@
* obtaining the definition.
* @since 2.1.3
*/
- protected void render(TilesRequestContext request, String definitionName) {
+ protected void render(Request request, String definitionName) {
if (log.isDebugEnabled()) {
log.debug("Render request recieved for definition '" + definitionName + "'");
@@ -475,7 +475,7 @@
* @param definition The definition to render.
* @since 2.1.3
*/
- protected void render(TilesRequestContext request, Definition definition) {
+ protected void render(Request request, Definition definition) {
AttributeContext originalContext = getAttributeContext(request);
BasicAttributeContext subContext = new BasicAttributeContext(originalContext);
subContext.inherit(definition);
@@ -496,7 +496,7 @@
* @param requestContext The Tiles request context.
* @throws IOException If something goes wrong during rendering.
*/
- private void render(Attribute attr, TilesRequestContext requestContext)
+ private void render(Attribute attr, Request requestContext)
throws IOException {
if (attr == null) {
throw new CannotRenderException("Cannot render a null attribute");
@@ -521,7 +521,7 @@
* @throws CannotRenderException If something goes wrong during rendering.
* @since 2.1.3
*/
- protected void render(TilesRequestContext request,
+ protected void render(Request request,
AttributeContext attributeContext) {
try {
@@ -543,7 +543,7 @@
* @return <code>true</code> if <code>definitionName</code> is a valid
* definition name.
*/
- private boolean isValidDefinition(TilesRequestContext context, String definitionName) {
+ private boolean isValidDefinition(Request context, String definitionName) {
try {
Definition definition = getDefinition(definitionName, context);
return definition != null;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java Sat Nov 7 19:17:09 2009
@@ -21,10 +21,10 @@
package org.apache.tiles.impl.mgmt;
import org.apache.tiles.Definition;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.mgmt.MutableTilesContainer;
+import org.apache.tiles.request.Request;
/**
* Mutable container which caches (in memory) the definitions
@@ -44,7 +44,7 @@
/** {@inheritDoc} */
public void register(Definition definition, Object... requestItems) {
- TilesRequestContext requestContext = getRequestContextFactory()
+ Request requestContext = getRequestContextFactory()
.createRequestContext(getApplicationContext(), requestItems);
register(definition, requestContext);
}
@@ -52,7 +52,7 @@
/** {@inheritDoc} */
@Override
protected Definition getDefinition(String definition,
- TilesRequestContext context) {
+ Request context) {
return mgr.getDefinition(definition, context);
}
@@ -78,7 +78,7 @@
* registered.
*/
protected void register(Definition definition,
- TilesRequestContext request) {
+ Request request) {
mgr.addDefinition(definition, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java Sat Nov 7 19:17:09 2009
@@ -26,9 +26,9 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.NoSuchDefinitionException;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,7 +109,7 @@
* something goes wrong when obtaining a main definition.
*/
public Definition getDefinition(String definition,
- TilesRequestContext request) {
+ Request request) {
Map<String, Definition> definitions =
getDefinitions(request);
if (definitions != null && definitions.containsKey(definition)) {
@@ -127,7 +127,7 @@
* something goes wrong during the addition.
*/
public void addDefinition(Definition definition,
- TilesRequestContext request) {
+ Request request) {
Map<String, Definition> definitions = getOrCreateDefinitions(request);
if (definition.getName() == null) {
definition.setName(getNextUniqueDefinitionName(definitions));
@@ -183,7 +183,7 @@
* inheritance can not be solved.
*/
protected void resolveInheritance(Definition definition,
- TilesRequestContext request) {
+ Request request) {
// Already done, or not needed ?
if (!definition.isExtending()) {
return;
@@ -225,7 +225,7 @@
*/
@SuppressWarnings("unchecked")
protected Map<String, Definition> getDefinitions(
- TilesRequestContext request) {
+ Request request) {
return (Map<String, Definition>) request.getRequestScope()
.get(definitionsAttributeName);
}
@@ -239,7 +239,7 @@
*/
@SuppressWarnings("unchecked")
protected Map<String, Definition> getOrCreateDefinitions(
- TilesRequestContext request) {
+ Request request) {
Map<String, Definition> definitions =
(Map<String, Definition>) request
.getRequestScope().get(definitionsAttributeName);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java Sat Nov 7 19:17:09 2009
@@ -22,7 +22,7 @@
import java.util.Locale;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* It represents an object able to resolve the current locale for the current
@@ -38,5 +38,5 @@
* @param request The Tiles request object.
* @return The current locale for the current request.
*/
- Locale resolveLocale(TilesRequestContext request);
+ Locale resolveLocale(Request request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java Sat Nov 7 19:17:09 2009
@@ -23,8 +23,8 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.request.Request;
/**
* Default implementation of <code>LocaleResolver</code><br>
@@ -42,7 +42,7 @@
public static final String LOCALE_KEY = "org.apache.tiles.LOCALE";
/** {@inheritDoc} */
- public Locale resolveLocale(TilesRequestContext request) {
+ public Locale resolveLocale(Request request) {
Locale retValue = null;
Map<String, Object> session = request.getSessionScope();
if (session != null) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java Sat Nov 7 19:17:09 2009
@@ -23,8 +23,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@
* @param context current context
* @return ViewPreparer instance
*/
- public ViewPreparer getPreparer(String name, TilesRequestContext context) {
+ public ViewPreparer getPreparer(String name, Request context) {
if (!preparers.containsKey(name)) {
preparers.put(name, createPreparer(name));
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java Sat Nov 7 19:17:09 2009
@@ -20,7 +20,7 @@
*/
package org.apache.tiles.preparer;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* <p>
@@ -48,5 +48,5 @@
* @param context the context within which the preparerInstance will be invoked.
* @return instance of the ViewPreparer
*/
- ViewPreparer getPreparer(String name, TilesRequestContext context);
+ ViewPreparer getPreparer(String name, Request context);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java Sat Nov 7 19:17:09 2009
@@ -20,7 +20,7 @@
*/
package org.apache.tiles.preparer;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.AttributeContext;
/**
@@ -53,6 +53,6 @@
* @param attributeContext Current tile context.
* @throws PreparerException If something goes wrong during execution.
*/
- void execute(TilesRequestContext tilesContext,
+ void execute(Request tilesContext,
AttributeContext attributeContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java Sat Nov 7 19:17:09 2009
@@ -20,7 +20,7 @@
*/
package org.apache.tiles.preparer;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.AttributeContext;
/**
@@ -34,7 +34,7 @@
public class ViewPreparerSupport implements ViewPreparer {
/** {@inheritDoc} */
- public void execute(TilesRequestContext tilesContext,
+ public void execute(Request tilesContext,
AttributeContext attributeContext) {
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/AttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/AttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/AttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/AttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,7 @@
import java.io.IOException;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* An object that can render an attribute. For each attribute, if it needs to be
@@ -43,6 +43,6 @@
* @throws RendererException If something goes wrong during rendition.
* @since 2.1.2
*/
- void render(Attribute attribute, TilesRequestContext request)
+ void render(Attribute attribute, Request request)
throws IOException;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/TypeDetectingAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/TypeDetectingAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/TypeDetectingAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/TypeDetectingAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -22,7 +22,7 @@
package org.apache.tiles.renderer;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* It represents a renderer that identifies attributes that can render.
@@ -41,7 +41,7 @@
* @return <code>true</code> if this renderer can render the attribute.
* @since 2.2.1
*/
- boolean isRenderable(Attribute attribute, TilesRequestContext request);
+ boolean isRenderable(Attribute attribute, Request request);
/**
* Checks if this renderer can render an attribute. Note that this does not mean
@@ -54,5 +54,5 @@
* @since 2.2.1
*/
boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request);
+ Request request);
}