Return-Path: 
 <torque-dev-return-10462-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
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 76A9D6865
	for <apmail-db-torque-dev-archive@www.apache.org>;
 Tue, 19 Jul 2011 16:14:46 +0000 (UTC)
Received: (qmail 5795 invoked by uid 500); 19 Jul 2011 16:14:46 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 5733 invoked by uid 500); 19 Jul 2011 16:14:45 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 5725 invoked by uid 99); 19 Jul 2011 16:14:45 -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:14:45 +0000
X-ASF-Spam-Status: No, hits=-0.0 required=5.0
	tests=SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: local policy)
Received: from [217.24.207.26] (HELO mail.seitenbau.net) (217.24.207.26)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 16:14:37 +0000
Received: from www.seitenbau.net ([192.168.15.18]:38968)
	by mail.seitenbau.net with esmtp (Exim 4.69)
	(envelope-from <Thomas.Fox@seitenbau.net>)
	id 1QjCw2-0005Qd-31
	for torque-dev@db.apache.org; Tue, 19 Jul 2011 18:14:15 +0200
X-CTCH-RefID: str=0001.0A0B0202.4E25AD57.0007,ss=1,fgs=0
In-Reply-To: <20110719160513.0F25C23888FE@eris.apache.org>
References: <20110719160513.0F25C23888FE@eris.apache.org>
Subject: Antwort: svn commit: r1148423 - in
 /db/torque/torque4/trunk/torque-generator: pom.xml
 src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
X-KeepSent: 22A5A01C:5CE54963-C12578D2:00590865;
 type=4; name=$KeepSent
To: "Apache Torque Developers List" <torque-dev@db.apache.org>
X-Mailer: Lotus Notes Release 8.5.1 September 28, 2009
Message-ID: 
 <OF22A5A01C.5CE54963-ONC12578D2.00590865-C12578D2.005931FD@seitenbau.net>
From: Thomas Fox <Thomas.Fox@seitenbau.net>
Date: Tue, 19 Jul 2011 18:14:13 +0200
X-MIMETrack: Serialize by Router on www/seitenbau(Release 8.5HF467 | May 15,
 2009) at 07/19/2011
 18:14:13
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
X-Virus-Checked: Checked by ClamAV on apache.org

sorry, should have been two commits. Thw pom commit is really the upgrade
to velocity whereas the VelocityOutlet commit is for not creating the
velocity.log file on running the generator any more, but using log4j as the
rest of the generator.

> 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 @@
>
>    <dependencies>
>      <dependency>
> -      <groupId>velocity</groupId>
> +      <groupId>org.apache.velocity</groupId>
>        <artifactId>velocity</artifactId>
> -      <version>1.4</version>
> +      <version>1.7</version>
>      </dependency>
>      <dependency>
>        <groupId>commons-logging</groupId>
>
> 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
>


---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org