Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 66754 invoked from network); 9 Dec 2007 22:44:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Dec 2007 22:44:31 -0000 Received: (qmail 46992 invoked by uid 500); 9 Dec 2007 22:44:20 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 46974 invoked by uid 500); 9 Dec 2007 22:44:20 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 46965 invoked by uid 99); 9 Dec 2007 22:44:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2007 14:44:20 -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; Sun, 09 Dec 2007 22:44:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92DF81A9832; Sun, 9 Dec 2007 14:44:10 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602747 - /cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Date: Sun, 09 Dec 2007 22:44:10 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071209224410.92DF81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Sun Dec 9 14:44:09 2007 New Revision: 602747 URL: http://svn.apache.org/viewvc?rev=602747&view=rev Log: CAY-933 Embeddable classes - support class generation (adding support to the frontend tasks) Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java?rev=602747&r1=602746&r2=602747&view=diff ============================================================================== --- cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java (original) +++ cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Sun Dec 9 14:44:09 2007 @@ -44,7 +44,7 @@ * @goal cgen */ public class CayenneGeneratorMojo extends AbstractMojo { - + /** * Project instance used to add generated source code to the build. * @@ -169,13 +169,13 @@ private String superTemplate; /** - * Location of Velocity template file for Entity class generation. If omitted, - * default template is used. + * Location of Velocity template file for Entity class generation. If + * omitted, default template is used. * * @parameter expression="${cgen.template}" */ private String template; - + /** * Location of Velocity template file for Embeddable superclass generation. * Ignored unless makepairs set to true. If @@ -186,14 +186,13 @@ private String embeddableSuperTemplate; /** - * Location of Velocity template file for Embeddable class generation. If omitted, - * default template is used. + * Location of Velocity template file for Embeddable class generation. If + * omitted, default template is used. * * @parameter expression="${cgen.embeddableTemplate}" */ private String embeddableTemplate; - /** * If set to true (default), a directory tree will be * generated in "destDir" corresponding to the class package structure, if @@ -215,6 +214,7 @@ * "1.2".) * * @parameter expression="${cgen.version}" + * @deprecated since 3.0 as 1.1 mode is deprecated. */ private String version; @@ -239,13 +239,14 @@ loaderAction.setAdditionalDataMapFiles(convertAdditionalDataMaps()); DataMap dataMap = loaderAction.getMainDataMap(); - + ClassGenerationAction generator = createGenerator(); generator.setLogger(logger); generator.setTimestamp(map.lastModified()); generator.setDataMap(dataMap); generator.addEntities(filterAction.getFilteredEntities(dataMap)); - generator.addEmbeddables(filterAction.getFilteredEmbeddables(dataMap)); + generator.addEmbeddables(filterAction + .getFilteredEmbeddables(dataMap)); generator.execute(); } catch (Exception e) { throw new MojoExecutionException("Error generating classes: ", e);