svn commit: r821407 - in /tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet: TilesFreemarkerServlet.java WebappClassTemplateLoader.java

[ap...@apache.org]

Author: apetrelli
Date: Sat Oct  3 20:12:01 2009
New Revision: 821407

URL: http://svn.apache.org/viewvc?rev=821407&view=rev
Log:
TILES-473
Added combined template loader and used it.

Added:
    tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java   (with props)
Modified:
    tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java

Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java?rev=821407&r1=821406&r2=821407&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/TilesFreemarkerServlet.java Sat Oct  3 20:12:01 2009
@@ -21,8 +21,11 @@
 
 package org.apache.tiles.freemarker.servlet;
 
+import java.io.IOException;
+
 import org.apache.tiles.freemarker.template.TilesFMModelRepository;
 
+import freemarker.cache.TemplateLoader;
 import freemarker.ext.beans.BeanModel;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.ext.servlet.FreemarkerServlet;
@@ -46,4 +49,12 @@
         configuration.setSharedVariable("tiles", tilesBeanModel);
         return configuration;
     }
+
+    /** {@inheritDoc} */
+
+    @Override
+    protected TemplateLoader createTemplateLoader(String templatePath)
+            throws IOException {
+        return new WebappClassTemplateLoader(getServletContext());
+    }
 }

Added: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java?rev=821407&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java (added)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java Sat Oct  3 20:12:01 2009
@@ -0,0 +1,87 @@
+/*
+ * $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.freemarker.servlet;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import javax.servlet.ServletContext;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.TemplateLoader;
+import freemarker.cache.WebappTemplateLoader;
+
+/**
+ * Delegates loading templates using a {@link WebappTemplateLoader} and, if not
+ * found, a {@link ClassTemplateLoader}. The resources are loaded from the
+ * webapp root and from the classpath root.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.2.1
+ */
+public class WebappClassTemplateLoader implements TemplateLoader {
+
+    /**
+     * The webapp template loader.
+     */
+    private WebappTemplateLoader webappTemplateLoader;
+
+    /**
+     * The webapp template loader.
+     */
+    private ClassTemplateLoader classTemplateLoader;
+
+    /**
+     * Constructor.
+     *
+     * @param servletContext The servlet context.
+     */
+    public WebappClassTemplateLoader(ServletContext servletContext) {
+        webappTemplateLoader = new WebappTemplateLoader(servletContext);
+        classTemplateLoader = new ClassTemplateLoader(getClass(), "/");
+    }
+
+    /** {@inheritDoc} */
+    public Object findTemplateSource(String name) throws IOException {
+        Object retValue = webappTemplateLoader.findTemplateSource(name);
+        if (retValue == null) {
+            retValue = classTemplateLoader.findTemplateSource(name);
+        }
+        return retValue;
+    }
+
+    /** {@inheritDoc} */
+    public void closeTemplateSource(Object templateSource) throws IOException {
+        webappTemplateLoader.closeTemplateSource(templateSource);
+    }
+
+    /** {@inheritDoc} */
+    public long getLastModified(Object templateSource) {
+        return webappTemplateLoader.getLastModified(templateSource);
+    }
+
+    /** {@inheritDoc} */
+    public Reader getReader(Object templateSource, String encoding)
+            throws IOException {
+        return webappTemplateLoader.getReader(templateSource, encoding);
+    }
+}

Propchange: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/servlet/WebappClassTemplateLoader.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL