Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 232B3631C for ; Tue, 19 Jul 2011 16:05:37 +0000 (UTC) Received: (qmail 80291 invoked by uid 500); 19 Jul 2011 16:05:37 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 80238 invoked by uid 500); 19 Jul 2011 16:05:36 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 80230 invoked by uid 500); 19 Jul 2011 16:05:36 -0000 Received: (qmail 80227 invoked by uid 99); 19 Jul 2011 16:05:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 16:05:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 16:05:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0F25C23888FE; Tue, 19 Jul 2011 16:05:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148423 - in /db/torque/torque4/trunk/torque-generator: pom.xml src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Date: Tue, 19 Jul 2011 16:05:12 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110719160513.0F25C23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Tue Jul 19 16:05:11 2011 New Revision: 1148423 URL: http://svn.apache.org/viewvc?rev=1148423&view=rev Log: upgrade to newest velocity version Modified: db/torque/torque4/trunk/torque-generator/pom.xml db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Modified: db/torque/torque4/trunk/torque-generator/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1148423&r1=1148422&r2=1148423&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/pom.xml (original) +++ db/torque/torque4/trunk/torque-generator/pom.xml Tue Jul 19 16:05:11 2011 @@ -36,9 +36,9 @@ - velocity + org.apache.velocity velocity - 1.4 + 1.7 commons-logging Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java?rev=1148423&r1=1148422&r2=1148423&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Tue Jul 19 16:05:11 2011 @@ -21,6 +21,7 @@ package org.apache.torque.generator.temp import java.io.StringWriter; import java.io.Writer; +import java.util.Properties; import java.util.Set; import org.apache.commons.logging.Log; @@ -41,6 +42,8 @@ import org.apache.torque.generator.varia import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.context.Context; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.log.Log4JLogChute; import org.apache.velocity.util.StringUtils; /** @@ -210,7 +213,14 @@ public class VelocityOutlet extends Temp { try { - Velocity.init(); + Properties properties = new Properties(); + properties.put( + RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, + Log4JLogChute.class.getName()); + properties.put( + RuntimeConstants.RUNTIME_LOG, + ""); + Velocity.init(properties); } catch (Exception e) { --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org