use VelocityEngine for caching

angryziber · May 22, 2016 · bffb2db · bffb2db
1 parent e08a797
commit bffb2db
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/net/azib/photos/RequestRouter.java b/src/net/azib/photos/RequestRouter.java
@@ -7,7 +7,7 @@
 import com.google.gdata.util.ServiceException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -18,6 +18,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Properties;
 import java.util.logging.Logger;
 
 import static java.util.Collections.emptyList;
@@ -27,9 +28,16 @@
 public class RequestRouter implements Filter {
   private static final Logger logger = Logger.getLogger(RequestRouter.class.getName());
   private ServletContext context;
+  private static VelocityEngine velocity;
 
   public void init(FilterConfig config) throws ServletException {
     this.context = config.getServletContext();
+    Properties velocityProps = new Properties();
+    velocityProps.setProperty("file.resource.loader.path", context.getRealPath("/WEB-INF/views"));
+    velocityProps.setProperty("file.resource.loader.cache", "true");
+    velocity = new VelocityEngine(velocityProps);
+    velocity.setApplicationAttribute("javax.servlet.ServletContext", context);
+    velocity.init();
   }
 
   public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
@@ -123,7 +131,7 @@ static void render(String template, Object source, HttpServletRequest request, H
       String name =  attrs.nextElement();
       ctx.put(name, request.getAttribute(name));
     }
-    Template tmpl = Velocity.getTemplate("WEB-INF/views/" + template + ".vm");
+    Template tmpl = velocity.getTemplate(template + ".vm");
     tmpl.merge(ctx, response.getWriter());
 
     logger.info("Rendered in " + (System.currentTimeMillis() - start) + " ms");

diff --git a/web/WEB-INF/views/album.vm b/web/WEB-INF/views/album.vm
@@ -35,7 +35,7 @@
   <meta property="og:description" content="${album.description.plainText}">
   <meta property="og:site_name" content="${album.nickname} Photography">
 
-  #parse('WEB-INF/views/head.vm')
+  #parse('head.vm')
   <script type="text/javascript">
     var viewer = new PhotoViewer();
     $(function() {

diff --git a/web/WEB-INF/views/gallery.vm b/web/WEB-INF/views/gallery.vm
@@ -11,7 +11,7 @@
   <meta property="og:image" content="${gallery.albumEntries[0].mediaThumbnails[0].url}">
   <meta property="og:site_name" content="${gallery.nickname} Photography">
   <meta name="keywords" content="${gallery.nickname.replace(' ', ',')},photos,picasa,picasaweb,gallery,albums,travel,photography,#foreach($album in $gallery.albumEntries)${album.title.plainText.replace(', ', ' ').replace(' ', ',')},#end">
-  #parse('WEB-INF/views/head.vm')
+  #parse('head.vm')
   <script defer async src="//maps.google.com/maps/api/js" onload="$(initMap)"></script>
   <script defer>$(initAlbumFilter);</script>
 </head>