Author: apetrelli
Date: Tue Nov 10 19:45:52 2009
New Revision: 834628
URL: http://svn.apache.org/viewvc?rev=834628&view=rev
Log:
TILESSB-12
Moved code from tiles-jsp to tiles-request-jsp and adaptation of the rest.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java
- copied unchanged from r834216,
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextAware.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
- copied unchanged from r834216,
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/NotAvailableFeatureException.java
- copied, changed from r834216,
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/
- copied from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
- copied unchanged from r834219,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/jsp/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/jsp/context/
- copied from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java
- copied, changed from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.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/awareness/TilesRequestContextFactoryAware.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.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/package.html
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspPrintWriterAdapterTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/pom.xml
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-jsp/pom.xml
Copied:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/NotAvailableFeatureException.java
(from r834216,
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/NotAvailableFeatureException.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/NotAvailableFeatureException.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java&r1=834216&r2=834628&rev=834628&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/NotAvailableFeatureException.java
Tue Nov 10 19:45:52 2009
@@ -19,9 +19,7 @@
* under the License.
*/
-package org.apache.tiles.factory;
-
-import org.apache.tiles.TilesException;
+package org.apache.tiles.request;
/**
* Exception that indicates that a feature could not be used since it is not
@@ -30,7 +28,7 @@
* @version $Rev$ $Date$
* @since 2.1.4
*/
-public class NotAvailableFeatureException extends TilesException {
+public class NotAvailableFeatureException extends RuntimeException {
/**
* Constructor.
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-jsp/pom.xml?rev=834628&r1=834627&r2=834628&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-jsp/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-jsp/pom.xml Tue Nov 10
19:45:52 2009
@@ -1,21 +1,64 @@
-<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-jsp</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tiles Request - JSP support</name>
- <description>JSP implementation of the Tiles Request framework.</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request-servlet</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+<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-jsp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Tiles Request - JSP support</name>
+ <description>JSP implementation of the Tiles Request
framework.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-servlet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java?rev=834628&r1=834627&r2=834628&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
Tue Nov 10 19:45:52 2009
@@ -21,6 +21,8 @@
package org.apache.tiles.portlet.context;
+import org.apache.tiles.request.NotAvailableFeatureException;
+
/**
* Exception that indicates that a resource could not be used because it is not
@@ -29,7 +31,7 @@
* @version $Rev$ $Date$
* @since 2.1.4
*/
-public class NotAPortletEnvironmentException extends RuntimeException {
+public class NotAPortletEnvironmentException extends
NotAvailableFeatureException {
/**
* Constructor.
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=834628&r1=834627&r2=834628&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
Tue Nov 10 19:45:52 2009
@@ -54,11 +54,12 @@
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
+import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
import org.apache.tiles.renderer.impl.DefinitionAttributeRenderer;
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.apache.tiles.request.NotAvailableFeatureException;
import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/pom.xml?rev=834628&r1=834627&r2=834628&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/pom.xml Tue Nov 10 19:45:52 2009
@@ -151,6 +151,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-jsp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Copied:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java
(from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java&p1=tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java&r1=834216&r2=834628&rev=834628&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java
Tue Nov 10 19:45:52 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.jsp.context;
+package org.apache.tiles.jsp;
import javax.servlet.ServletContext;
import javax.servlet.jsp.PageContext;
