Author: apetrelli
Date: Tue Nov 10 20:26:57 2009
New Revision: 834652
URL: http://svn.apache.org/viewvc?rev=834652&view=rev
Log:
TILESSB-12
Moved code from tiles-freemarker to tiles-request-freemarker.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
- copied, changed from r834638,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
- copied unchanged from r834216,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
- copied, changed from r834638,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.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
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml
tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml?rev=834652&r1=834651&r2=834652&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml Tue Nov
10 20:26:57 2009
@@ -10,4 +10,33 @@
<version>1.0-SNAPSHOT</version>
<name>Tiles Request - Freemarker support</name>
<description>Freemarker implementation of the Tiles request
framework</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-servlet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
(from r834638,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java&r1=834638&r2=834652&rev=834652&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtil.java
Tue Nov 10 20:26:57 2009
@@ -1,7 +1,5 @@
package org.apache.tiles.freemarker.context;
-import org.apache.tiles.freemarker.FreeMarkerTilesException;
-
import freemarker.core.Environment;
import freemarker.ext.servlet.FreemarkerServlet;
import freemarker.ext.servlet.HttpRequestHashModel;
@@ -24,7 +22,7 @@
return (HttpRequestHashModel) env.getDataModel().get(
FreemarkerServlet.KEY_REQUEST);
} catch (TemplateModelException e) {
- throw new FreeMarkerTilesException(
+ throw new NotAvailableFreemarkerServletException(
"Exception got when obtaining the request hash model",
e);
}
}
Copied:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
(from r834638,
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/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java&r1=834638&r2=834652&rev=834652&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
Tue Nov 10 20:26:57 2009
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.NotAvailableFeatureException;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.request.servlet.ServletTilesRequestContext;
@@ -69,7 +69,7 @@
HttpRequestHashModel requestModel;
try {
requestModel = FreeMarkerRequestUtil.getRequestHashModel(env);
- } catch (FreeMarkerTilesException e) {
+ } catch (NotAvailableFeatureException e) {
log.warn("Cannot evaluate as a FreeMarker in Servlet
Environment, skipping", e);
return null;
}
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java?rev=834652&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
(added)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
Tue Nov 10 20:26:57 2009
@@ -0,0 +1,27 @@
+package org.apache.tiles.freemarker.context;
+
+import org.apache.tiles.request.NotAvailableFeatureException;
+
+public class NotAvailableFreemarkerServletException extends
+ NotAvailableFeatureException {
+
+ public NotAvailableFreemarkerServletException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(Throwable e) {
+ super(e);
+ // TODO Auto-generated constructor stub
+ }
+
+ public NotAvailableFreemarkerServletException(String message, Throwable
e) {
+ super(message, e);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/NotAvailableFreemarkerServletException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml?rev=834652&r1=834651&r2=834652&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml Tue Nov 10 20:26:57 2009
@@ -82,5 +82,10 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-freemarker</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
