Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 91067 invoked from network); 14 Nov 2007 14:18:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Nov 2007 14:18:26 -0000 Received: (qmail 23768 invoked by uid 500); 14 Nov 2007 14:18:13 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 23753 invoked by uid 500); 14 Nov 2007 14:18:13 -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 23741 invoked by uid 500); 14 Nov 2007 14:18:13 -0000 Received: (qmail 23738 invoked by uid 99); 14 Nov 2007 14:18:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 06:18:13 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 14:19:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D22B41A9832; Wed, 14 Nov 2007 06:18:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r594893 - /db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java Date: Wed, 14 Nov 2007 14:18:01 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071114141801.D22B41A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Wed Nov 14 06:18:00 2007 New Revision: 594893 URL: http://svn.apache.org/viewvc?rev=594893&view=rev Log: Corrected a velocity context entry when the templates are loaded from file (the template path was not passed to the ResourceLoader). The error was introduced when the new ResourceFileLoader for Texen was added. Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java?rev=594893&r1=594892&r2=594893&view=diff ============================================================================== --- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java (original) +++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java Wed Nov 14 06:18:00 2007 @@ -446,13 +446,14 @@ if (templatePath != null) { log("Using templatePath: " + templatePath, project.MSG_VERBOSE); - ve.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH, + ve.setProperty("torque" + VelocityEngine.FILE_RESOURCE_LOADER_PATH, templatePath); // TR: We need our own FileResourceLoader ve.addProperty(VelocityEngine.RESOURCE_LOADER, "torquefile"); ve.setProperty("torquefile." + VelocityEngine.RESOURCE_LOADER - + ".instance", new TorqueFileResourceLoader(this)); + + ".instance", + new TorqueFileResourceLoader(this)); } if (useClasspath) --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org