Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 26521 invoked from network); 1 Mar 2010 13:59:58 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Mar 2010 13:59:58 -0000 Received: (qmail 47032 invoked by uid 500); 1 Mar 2010 13:59:57 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 46935 invoked by uid 500); 1 Mar 2010 13:59:57 -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 46927 invoked by uid 500); 1 Mar 2010 13:59:57 -0000 Received: (qmail 46924 invoked by uid 99); 1 Mar 2010 13:59:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 13:59:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 01 Mar 2010 13:59:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6666023889CB; Mon, 1 Mar 2010 13:59:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r917533 - in /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf: control/Controller.java source/FileSourcesImpl.java source/Sources.java Date: Mon, 01 Mar 2010 13:59:34 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100301135934.6666023889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon Mar 1 13:59:34 2010 New Revision: 917533 URL: http://svn.apache.org/viewvc?rev=917533&view=rev Log: allow an overrideFileset where the basedir is not set Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java?rev=917533&r1=917532&r2=917533&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java Mon Mar 1 13:59:34 2010 @@ -36,6 +36,7 @@ import org.apache.torque.gf.configuration.controller.GeneratorReference; import org.apache.torque.gf.configuration.controller.Output; import org.apache.torque.gf.configuration.generator.GeneratorConfiguration; +import org.apache.torque.gf.file.Fileset; import org.apache.torque.gf.generator.Generator; import org.apache.torque.gf.generator.GeneratorException; import org.apache.torque.gf.source.Source; @@ -115,10 +116,16 @@ } Sources sources = output.getSources(); - if (unitConfiguration.getOverrideSourceFileset() != null) + Fileset overrideSourceFileset + = unitConfiguration.getOverrideSourceFileset(); + if (overrideSourceFileset != null) { - sources.setSourceFileset( - unitConfiguration.getOverrideSourceFileset()); + File oldBasepath = sources.getSourceFileset().getBasedir(); + if (overrideSourceFileset.getBasedir() == null) + { + overrideSourceFileset.setBasedir(oldBasepath); + } + sources.setSourceFileset(overrideSourceFileset); } sources.init(); if (!sources.hasNext()) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java?rev=917533&r1=917532&r2=917533&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java Mon Mar 1 13:59:34 2010 @@ -50,7 +50,7 @@ */ private SourceType type; - /** The fileset defining the source files. */ + /** The fileset defining the source files, not null. */ private Fileset sourceFileset; /** The paths of all contained Files. */ @@ -60,7 +60,7 @@ private Iterator pathIt; /** - * All known configuration handlers. + * All known configuration handlers, not null. */ private ConfigurationHandlers configurationHandlers; Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java?rev=917533&r1=917532&r2=917533&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java Mon Mar 1 13:59:34 2010 @@ -33,6 +33,13 @@ public interface Sources extends Iterator { /** + * Returns the fileset which determines the source files to read. + * + * @return the source fileset, not null. + */ + Fileset getSourceFileset(); + + /** * Sets the fileset which determines the source files to read. * * @param sourceFileset the new source fileset, not null. --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org