From torque-dev-return-11952-apmail-db-torque-dev-archive=db.apache.org@db.apache.org Sat Oct 6 03:39:50 2012 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 9057ADE5B for ; Sat, 6 Oct 2012 03:39:50 +0000 (UTC) Received: (qmail 68368 invoked by uid 500); 6 Oct 2012 03:39:50 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 68340 invoked by uid 500); 6 Oct 2012 03:39:49 -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 68331 invoked by uid 500); 6 Oct 2012 03:39:49 -0000 Received: (qmail 68304 invoked by uid 99); 6 Oct 2012 03:39:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Oct 2012 03:39:48 +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; Sat, 06 Oct 2012 03:39:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CADEE23889C5; Sat, 6 Oct 2012 03:39:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1394911 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base: imports.vm initDatabaseMap.vm Date: Sat, 06 Oct 2012 03:39:01 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121006033901.CADEE23889C5@eris.apache.org> Author: tfischer Date: Sat Oct 6 03:39:01 2012 New Revision: 1394911 URL: http://svn.apache.org/viewvc?rev=1394911&view=rev Log: TORQUE-232 generated peer's initDatabaseMap() methods should call the init method of the DatabaseMapInit class TORQUE-228 Imports not generated correctly if classes are generated into different package: correct generated MapInit imports in BasePeer classes Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/initDatabaseMap.vm Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm?rev=1394911&r1=1394910&r2=1394911&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm Sat Oct 6 03:39:01 2012 @@ -71,3 +71,10 @@ import ${dbObjectPackage}.*; import ${peerPackage}.${peerClassName}; import ${peerPackage}.${peerImplClassName}; #end +#if (${generateMapInit} == "true") + #set ($databaseMapInitPackage = $torqueGen.option("torque.om.mapInit.databaseMapInitPackage")) + #set ($databaseMapInitClassName = $torqueGen.getParent().getAttribute("databaseMapInitClassName")) + #if (($basePeerPackage != $databaseMapInitPackage)) +import ${databaseMapInitPackage}.${databaseMapInitClassName}; + #end +#end Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/initDatabaseMap.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/initDatabaseMap.vm?rev=1394911&r1=1394910&r2=1394911&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/initDatabaseMap.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/initDatabaseMap.vm Sat Oct 6 03:39:01 2012 @@ -29,12 +29,12 @@ ## #set ( $databaseElement = $torqueGen.getParent() ) #set ( $databaseName = $databaseElement.getAttribute("name") ) -#set ( $baseDatabaseMapInitClassName = $databaseElement.getAttribute("baseDatabaseMapInitClassName") ) +#set ( $databaseMapInitClassName = $databaseElement.getAttribute("databaseMapInitClassName") ) #set ( $databaseOptionElements = $databaseElement.getChildren("option") ) public static void initDatabaseMap() { #if (${generateMapInit} == "true") - ${baseDatabaseMapInitClassName}.init(); + ${databaseMapInitClassName}.init(); #end ## TODO the following needs not be executed for every table ## but it causes no harm --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org