From 1c30a9c3dcde150bb21ade99c58963822aaefbfb Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 9 Dec 2005 01:29:55 +0000
Subject: [PATCH] Updated to use the new LogChute Velocity logging wrapper and
 added a method to create an engine that loads templates from a specified path
 instead of from the classpath.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1740 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../com/samskivert/velocity/VelocityUtil.java | 60 ++++++++++++++-----
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/velocity/VelocityUtil.java b/projects/samskivert/src/java/com/samskivert/velocity/VelocityUtil.java
index f38e1ad0..5714a652 100644
--- a/projects/samskivert/src/java/com/samskivert/velocity/VelocityUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/velocity/VelocityUtil.java
@@ -3,31 +3,34 @@
 
 package com.samskivert.velocity;
 
+import java.io.File;
+
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.velocity.runtime.log.LogChute;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 
+import com.samskivert.Log;
+
 /**
  * Handy Velocity-related routines.
  */
 public class VelocityUtil
 {
     /**
-     * Creates a {@link VelocityEngine} that is configured to load
-     * templates from the classpath and log using the samskivert logging
-     * classes and not complain about a bunch of pointless stuff that it
-     * generally complains about.
+     * Creates a {@link VelocityEngine} that is configured to load templates
+     * from the classpath and log using the samskivert logging classes and not
+     * complain about a bunch of pointless stuff that it generally complains
+     * about.
      *
-     * @throws Exception if a problem occurs initializing Velocity. We'd
-     * throw something less generic, but that's what
-     * {@link VelocityEngine#init} throws.
+     * @throws Exception if a problem occurs initializing Velocity. We'd throw
+     * something less generic, but that's what {@link VelocityEngine#init}
+     * throws.
      */
     public static VelocityEngine createEngine ()
         throws Exception
     {
-        // initialize velocity which we'll use for templating
         VelocityEngine ve = new VelocityEngine();
         ve.setProperty(VelocityEngine.VM_LIBRARY, "");
         ve.setProperty(VelocityEngine.RESOURCE_LOADER, "classpath");
@@ -38,16 +41,41 @@ public class VelocityUtil
         return ve;
     }
 
+    /**
+     * Creates a {@link VelocityEngine} that is configured to load templates
+     * from the specified path and log using the samskivert logging classes and
+     * not complain about a bunch of pointless stuff that it generally
+     * complains about.
+     *
+     * @throws Exception if a problem occurs initializing Velocity. We'd throw
+     * something less generic, but that's what {@link VelocityEngine#init}
+     * throws.
+     */
+    public static VelocityEngine createEngine (File templatePath)
+        throws Exception
+    {
+        VelocityEngine ve = new VelocityEngine();
+        ve.setProperty(VelocityEngine.VM_LIBRARY, "");
+        ve.setProperty("file.resource.loader.path", templatePath);
+        ve.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, _logger);
+        ve.init();
+        return ve;
+    }
+
     /** Handles logging for Velocity. */
-    protected static LogSystem _logger = new LogSystem() {
-        public void init (RuntimeServices rs) {
+    protected static LogChute _logger = new LogChute() {
+        public void init (RuntimeServices rs) throws Exception {
             // nothing doing
         }
-        public void logVelocityMessage (int level, String message) {
-            // skip anything other than warnings or errors
-            if (level == WARN_ID || level == ERROR_ID) {
-                System.err.println(message);
-            }
+        public void log (int level, String message) {
+            Log.warning(message);
+        }
+        public void log (int level, String message, Throwable t) {
+            Log.warning(message);
+            Log.logStackTrace(t);
+        }
+        public boolean isLevelEnabled (int level) {
+            return (level == WARN_ID || level == ERROR_ID);
         }
     };
 }