svn commit: r1541982 - in /incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web: handler/FilteringEndpoints.java template/Templates.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Nov 14 17:12:04 2013
New Revision: 1541982

URL: http://svn.apache.org/r1541982
Log:
using our own velocity engine

Modified:
    incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
    incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java

Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java?rev=1541982&r1=1541981&r2=1541982&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java Thu Nov 14 17:12:04 2013
@@ -20,7 +20,6 @@ import org.apache.sirona.reporting.web.h
 import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
 import org.apache.sirona.reporting.web.template.Templates;
 import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.RuntimeSingleton;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,7 +36,7 @@ public class FilteringEndpoints {
 
     public FilteringEndpoints() {
         try {
-            rl = ResourceLoader.class.cast(FilteringEndpoints.class.getClassLoader().loadClass((String) RuntimeSingleton.getProperty(Templates.RESOURCE_LOADER_KEY)).newInstance());
+            rl = ResourceLoader.class.cast(FilteringEndpoints.class.getClassLoader().loadClass((String) Templates.property(Templates.RESOURCE_LOADER_KEY)).newInstance());
         } catch (final Exception e) {
             throw new IllegalStateException(e);
         }

Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java?rev=1541982&r1=1541981&r2=1541982&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java Thu Nov 14 17:12:04 2013
@@ -21,9 +21,11 @@ import org.apache.sirona.reporting.web.p
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.log.JdkLogChute;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 
 import java.io.PrintWriter;
 import java.util.Map;
@@ -33,6 +35,7 @@ public final class Templates {
     public static final String RESOURCE_LOADER_KEY = "monitoring." + RuntimeConstants.RESOURCE_LOADER + ".class";
 
     private static String mapping;
+    private static VelocityEngine engine;
 
     public static void init(final String context, final String filterMapping) {
         final Properties velocityConfiguration = new Properties();
@@ -45,7 +48,7 @@ public final class Templates {
         velocityConfiguration.setProperty(RuntimeConstants.RESOURCE_LOADER, "monitoring");
         velocityConfiguration.setProperty(RuntimeConstants.VM_LIBRARY, "/templates/macro.vm");
         velocityConfiguration.setProperty(RESOURCE_LOADER_KEY, Configuration.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.resource-loader", ClasspathResourceLoader.class.getName()));
-        Velocity.init(velocityConfiguration);
+        engine = new VelocityEngine(velocityConfiguration);
 
         if (filterMapping.isEmpty()) {
             mapping = context;
@@ -66,14 +69,14 @@ public final class Templates {
         boolean onlyBodyRendering=variables.containsKey( "onlyBody" );
 
         final Template velocityTemplate = onlyBodyRendering ?
-            Velocity.getTemplate("/templates/"+template, "UTF-8") : Velocity.getTemplate("/templates/page.vm", "UTF-8");
+            engine.getTemplate("/templates/" + template, "UTF-8") : engine.getTemplate("/templates/page.vm", "UTF-8");
         velocityTemplate.merge(context, writer);
     }
 
     public static void render(final PrintWriter writer, final String template, final Map<String, ?> variables) {
         final VelocityContext context = newVelocityContext(variables);
         context.put("mapping", mapping);
-        final Template velocityTemplate = Velocity.getTemplate(template, "UTF-8");
+        final Template velocityTemplate = engine.getTemplate(template, "UTF-8");
         velocityTemplate.merge(context, writer);
     }
 
@@ -87,6 +90,10 @@ public final class Templates {
         return context;
     }
 
+    public static Object property(final String key) {
+        return engine.getProperty(key);
+    }
+
     private Templates() {
         // no-op
     }