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/08 13:16:09 UTC
svn commit: r833862 [1/2] - in /tiles/sandbox/trunk: tiles-request/
tiles-request/tiles-request-api/
tiles-request/tiles-request-api/src/main/java/META-INF/
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/
tiles-request/tiles-req...
Author: apetrelli
Date: Sun Nov 8 12:16:06 2009
New Revision: 833862
URL: http://svn.apache.org/viewvc?rev=833862&view=rev
Log:
TILESSB-12
Moved Servlet requests and application context to tiles-request-servlet.
Moved some base classes to tiles-request-api.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/MANIFEST.MF
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java
- copied, changed from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java
- copied, changed from r833731, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java
- copied, changed from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java
- copied, changed from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponse.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/NotAServletEnvironmentException.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/NotAServletEnvironmentException.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java
- copied, changed from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java (with props)
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/
- copied from r833731, tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java
- copied, changed from r833737, tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.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/TilesRequestContextWrapper.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponse.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/NotAServletEnvironmentException.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.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/test/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponseTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletSessionScopeMapTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
Modified:
tiles/sandbox/trunk/tiles-request/pom.xml
tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/pom.xml
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletSessionScopeMapTest.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/TilesRequestContextFactoryAware.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/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/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.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/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/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-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.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/context/FreeMarkerUtil.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/FreeMarkerUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.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/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.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/main/java/org/apache/tiles/portlet/context/PortletUtil.java
tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-servlet/pom.xml
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.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-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.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/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.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/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/pom.xml?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/pom.xml Sun Nov 8 12:16:06 2009
@@ -1,24 +1,39 @@
-<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-master</artifactId>
- <groupId>org.apache.tiles</groupId>
- <version>1</version>
- </parent>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Tiles Request Framework</name>
- <description>Request abstraction for various request and template technologies</description>
- <url>http://tiles.apache.org/framework/</url>
- <scm>
- <connection>scm:svn:http://svn.eu.apache.org/viewvc/tiles/request/trunk/</connection>
- <developerConnection>scm:svn:https://svn.eu.apache.org/viewvc/tiles/request/trunk/</developerConnection>
- <url>http://svn.eu.apache.org/viewvc/tiles/request/trunk/</url>
- </scm>
- <modules>
- <module>tiles-request-api</module>
- <module>tiles-request-servlet</module>
- </modules>
+<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-master</artifactId>
+ <groupId>org.apache.tiles</groupId>
+ <version>1</version>
+ </parent>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Tiles Request Framework</name>
+ <description>Request abstraction for various request and template technologies</description>
+ <url>http://tiles.apache.org/framework/</url>
+ <scm>
+ <connection>scm:svn:http://svn.eu.apache.org/viewvc/tiles/request/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.eu.apache.org/viewvc/tiles/request/trunk/</developerConnection>
+ <url>http://svn.eu.apache.org/viewvc/tiles/request/trunk/</url>
+ </scm>
+ <modules>
+ <module>tiles-request-api</module>
+ <module>tiles-request-servlet</module>
+ </modules>
+ <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
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=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml Sun Nov 8 12:16:06 2009
@@ -11,18 +11,4 @@
<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
Added: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/MANIFEST.MF?rev=833862&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/MANIFEST.MF (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/MANIFEST.MF Sun Nov 8 12:16:06 2009
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java (from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java&r1=833737&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java Sun Nov 8 12:16:06 2009
@@ -18,10 +18,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles.request;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.Request;
/**
* Creates an instance of the appropriate {@link Request}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java (from r833731, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java&r1=833731&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/MapEntry.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles.request.util;
import java.util.Map;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java (from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java&r1=833737&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesApplicationContextWrapper.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles.request.util;
import java.io.IOException;
import java.net.URL;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java (from r833737, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java&r1=833737&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/TilesRequestContextWrapper.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles.request.util;
import java.util.Map;
import java.util.Locale;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/pom.xml?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/pom.xml Sun Nov 8 12:16:06 2009
@@ -17,5 +17,35 @@
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponse.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponse.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ExternalWriterHttpServletResponse.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java Sun Nov 8 12:16:06 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.io.IOException;
import java.io.PrintWriter;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/NotAServletEnvironmentException.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/NotAServletEnvironmentException.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/NotAServletEnvironmentException.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/NotAServletEnvironmentException.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/NotAServletEnvironmentException.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/NotAServletEnvironmentException.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/NotAServletEnvironmentException.java Sun Nov 8 12:16:06 2009
@@ -19,9 +19,8 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
-import org.apache.tiles.TilesException;
/**
* Exception that indicates that a resource could not be used because it is not
@@ -30,7 +29,7 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class NotAServletEnvironmentException extends TilesException {
+public class NotAServletEnvironmentException extends RuntimeException {
/**
* Constructor.
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletApplicationScopeMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
@@ -32,7 +32,7 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet context
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,7 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet request
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletHeaderValuesMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
@@ -32,7 +32,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletInitParamMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,7 +31,7 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet context
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,7 +32,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet parameter
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletParamValuesMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,7 +31,7 @@
import javax.servlet.ServletRequest;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequestScopeMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,7 +31,7 @@
import javax.servlet.ServletRequest;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet request
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletSessionScopeMap.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,10 +30,9 @@
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-
import javax.servlet.http.HttpSession;
-import org.apache.tiles.context.MapEntry;
+import org.apache.tiles.request.util.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for HTTP session
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesApplicationContext.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.io.IOException;
import java.net.URL;
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContext.java Sun Nov 8 12:16:06 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.io.IOException;
import java.io.OutputStream;
@@ -32,9 +32,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.context.TilesApplicationContextWrapper;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.util.TilesApplicationContextWrapper;
/**
* Servlet-based implementation of the TilesApplicationContext interface.
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java (from r833855, tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java&r1=833855&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
/**
* Creates an instance of the appropriate {@link Request}
Added: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=833862&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java Sun Nov 8 12:16:06 2009
@@ -0,0 +1,95 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tiles.request.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Utilities for Tiles request servlet support.
+ *
+ * @version $Rev$ $Date$
+ * @since 3.0.0
+ */
+public final class ServletUtil {
+
+ /**
+ * Name of the attribute used to store the force-include option.
+ * @since 2.0.6
+ */
+ public static final String FORCE_INCLUDE_ATTRIBUTE_NAME =
+ "org.apache.tiles.servlet.context.ServletTilesRequestContext.FORCE_INCLUDE";
+
+ /**
+ * Wraps a ServletException to create an IOException with the root cause if present.
+ *
+ * @param ex The exception to wrap.
+ * @param message The message of the exception.
+ * @return The wrapped exception.
+ * @since 2.1.1
+ */
+ public static IOException wrapServletException(ServletException ex,
+ String message) {
+ IOException retValue;
+ Throwable rootCause = ex.getRootCause();
+ if (rootCause != null) {
+ // Replace the ServletException with an IOException, with the root
+ // cause of the first as the cause of the latter.
+ retValue = new IOException(message, rootCause);
+ } else {
+ retValue = new IOException(message, ex);
+ }
+
+ return retValue;
+ }
+
+ /**
+ * Returns true if forced include of the result is needed.
+ *
+ * @param request The HTTP request.
+ * @return If <code>true</code> the include operation must be forced.
+ * @since 2.0.6
+ */
+ public static boolean isForceInclude(HttpServletRequest request) {
+ Boolean retValue = (Boolean) request
+ .getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME);
+ return retValue != null && retValue.booleanValue();
+ }
+
+ /**
+ * Sets the option that enables the forced include of the response.
+ *
+ * @param request The HTTP request.
+ * @param forceInclude If <code>true</code> the include operation must be
+ * forced.
+ * @since 2.0.6
+ */
+ public static void setForceInclude(HttpServletRequest request,
+ boolean forceInclude) {
+ Boolean retValue = Boolean.valueOf(forceInclude);
+ request.setAttribute(
+ ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
+ retValue);
+ }
+}
Propchange: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java?rev=833862&r1=833731&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java Sun Nov 8 12:16:06 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.junit.Test;
/**
@@ -39,7 +40,7 @@
public class ExternalWriterHttpServletResponseTest {
/**
- * Test method for {@link org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse#getWriter()}.
+ * Test method for {@link org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse#getWriter()}.
* @throws IOException If something goes wrong.
*/
@Test
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletSessionScopeMapTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletSessionScopeMapTest.java?rev=833862&r1=833731&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletSessionScopeMapTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletSessionScopeMapTest.java Sun Nov 8 12:16:06 2009
@@ -19,13 +19,15 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.util.Vector;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import junit.framework.TestCase;
+
+import org.apache.tiles.request.servlet.ServletSessionScopeMap;
import org.easymock.EasyMock;
/**
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java (from r833737, tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java&p1=tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java&r1=833737&r2=833862&rev=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletTilesRequestContextTest.java Sun Nov 8 12:16:06 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.servlet.context;
+package org.apache.tiles.request.servlet;
import java.io.IOException;
import java.io.PrintWriter;
@@ -38,6 +38,8 @@
import org.apache.shale.test.mock.MockServletContext;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.easymock.classextension.EasyMock;
/**
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=833862&r1=833861&r2=833862&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 Sun Nov 8 12:16:06 2009
@@ -32,9 +32,9 @@
import org.apache.tiles.AttributeContext;
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;
+import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.easymock.EasyMock;
import junit.framework.TestCase;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java Sun Nov 8 12:16:06 2009
@@ -20,7 +20,7 @@
*/
package org.apache.tiles.awareness;
-import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.request.TilesRequestContextFactory;
/**
* It represents an object that can have a reference to the
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=833862&r1=833861&r2=833862&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 Sun Nov 8 12:16:06 2009
@@ -27,6 +27,7 @@
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
/**
* Default implementation for TilesRequestContextFactory, that creates a chain
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=833862&r1=833861&r2=833862&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 Sun Nov 8 12:16:06 2009
@@ -29,7 +29,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.Refreshable;
@@ -60,6 +59,7 @@
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -165,7 +165,7 @@
ChainedTilesRequestContextFactory parent) {
List<TilesRequestContextFactory> factories = new ArrayList<TilesRequestContextFactory>();
registerRequestContextFactory(
- "org.apache.tiles.servlet.context.ServletTilesRequestContextFactory",
+ "org.apache.tiles.request.servlet.ServletTilesRequestContextFactory",
factories, parent);
registerRequestContextFactory(
"org.apache.tiles.portlet.context.PortletTilesRequestContextFactory",
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=833862&r1=833861&r2=833862&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 Sun Nov 8 12:16:06 2009
@@ -28,7 +28,6 @@
import org.apache.tiles.BasicAttributeContext;
import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
@@ -42,6 +41,7 @@
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java Sun Nov 8 12:16:06 2009
@@ -27,13 +27,13 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java Sun Nov 8 12:16:06 2009
@@ -27,13 +27,13 @@
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.TilesRequestContextFactory;
/**
* Basic renderer factory implementation.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java Sun Nov 8 12:16:06 2009
@@ -28,6 +28,7 @@
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Sun Nov 8 12:16:06 2009
@@ -31,7 +31,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory;
@@ -53,6 +52,7 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java Sun Nov 8 12:16:06 2009
@@ -31,12 +31,12 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.factory.BasicTilesContainerFactory;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009
@@ -23,9 +23,9 @@
import java.util.Map;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
/**
* "Repeats" (i.e. returns back) the context as a
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java Sun Nov 8 12:16:06 2009
@@ -28,11 +28,11 @@
import junit.framework.TestCase;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Sun Nov 8 12:16:06 2009
@@ -24,9 +24,9 @@
import java.util.Map;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
import junit.framework.TestCase;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java Sun Nov 8 12:16:06 2009
@@ -27,12 +27,12 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java Sun Nov 8 12:16:06 2009
@@ -28,11 +28,11 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java Sun Nov 8 12:16:06 2009
@@ -28,11 +28,11 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java Sun Nov 8 12:16:06 2009
@@ -27,11 +27,11 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java Sun Nov 8 12:16:06 2009
@@ -42,7 +42,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
@@ -82,6 +81,7 @@
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.util.URLUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java Sun Nov 8 12:16:06 2009
@@ -43,7 +43,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
import org.apache.tiles.definition.pattern.PrefixedPatternDefinitionResolver;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
@@ -61,8 +60,9 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
-import org.apache.tiles.servlet.context.ServletTilesRequestContextFactory;
+import org.apache.tiles.request.TilesRequestContextFactory;
+import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.request.servlet.ServletTilesRequestContextFactory;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.apache.velocity.tools.view.VelocityView;
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java Sun Nov 8 12:16:06 2009
@@ -26,8 +26,8 @@
import java.io.Writer;
import java.util.Locale;
-import org.apache.tiles.context.TilesRequestContextWrapper;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.util.TilesRequestContextWrapper;
import freemarker.core.Environment;
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009
@@ -25,11 +25,11 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
+import org.apache.tiles.request.TilesRequestContextFactory;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java Sun Nov 8 12:16:06 2009
@@ -71,7 +71,7 @@
* @since 2.2.0
*/
public static boolean isForceInclude(Environment env) {
- return ServletUtil
+ return org.apache.tiles.request.servlet.ServletUtil
.isForceInclude(getRequestHashModel(env).getRequest());
}
@@ -84,8 +84,8 @@
* @since 2.2.0
*/
public static void setForceInclude(Environment env, boolean forceInclude) {
- ServletUtil.setForceInclude(getRequestHashModel(env).getRequest(),
- forceInclude);
+ org.apache.tiles.request.servlet.ServletUtil.setForceInclude(
+ getRequestHashModel(env).getRequest(), forceInclude);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java Sun Nov 8 12:16:06 2009
@@ -38,8 +38,8 @@
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
import org.apache.tiles.request.Request;
-import org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
+import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.util.IteratorEnumeration;
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java Sun Nov 8 12:16:06 2009
@@ -30,9 +30,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Test;
import freemarker.core.Environment;