svn commit: r1406071 - in /manifoldcf/trunk: CHANGES.txt framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java

[kwright]

Author: kwright
Date: Tue Nov  6 08:40:45 2012
New Revision: 1406071

URL: http://svn.apache.org/viewvc?rev=1406071&view=rev
Log:
Tentative fix for CONNECTORS-564.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1406071&r1=1406070&r2=1406071&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Nov  6 08:40:45 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.1-dev =====================
 
+CONNECTORS-564: Configure velocity to use the ManifoldCF log
+configuration and the logger "velocity".
+(Shigeki Kobayashi, Karl Wright)
+
 CONNECTORS-561: Only download font packages if they aren't already
 present.
 (Alex Ott)

Modified: 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java?rev=1406071&r1=1406070&r2=1406071&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java
 (original)
+++ 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java
 Tue Nov  6 08:40:45 2012
@@ -31,6 +31,7 @@ import java.io.InputStream;
 import org.apache.manifoldcf.core.system.Logging;
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
 
 public class Messages
 {
@@ -59,6 +60,10 @@ public class Messages
     // This is the property which describes the resource loader itself
     
configuration.setProperty("mcf."+VelocityEngine.RESOURCE_LOADER+".instance",new 
MCFVelocityResourceLoader(classInstance));
     engine.setExtendedProperties(configuration);
+    engine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+      "org.apache.velocity.runtime.log.Log4JLogChute" );
+    engine.setProperty("runtime.log.logsystem.log4j.logger",
+      "velocity");
     return engine;
   }