- Eugene-commits - mailman.cloud.codelutin.com

r1225 - in trunk: . eugene eugene-java-templates eugene-maven-plugin
by tchemit＠users.nuiton.org 13 Dec '12

13 Dec '12

Author: tchemit Date: 2012-12-13 15:06:36 +0100 (Thu, 13 Dec 2012) New Revision: 1225 Url: http://nuiton.org/projects/eugene/repository/revisions/1225 Log: [maven-release-plugin] prepare release eugene-2.6 Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-12-13 14:03:26 UTC (rev 1224) +++ trunk/eugene/pom.xml 2012-12-13 14:06:36 UTC (rev 1225) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2012-12-13 14:03:26 UTC (rev 1224) +++ trunk/eugene-java-templates/pom.xml 2012-12-13 14:06:36 UTC (rev 1225) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-12-13 14:03:26 UTC (rev 1224) +++ trunk/eugene-maven-plugin/pom.xml 2012-12-13 14:06:36 UTC (rev 1225) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-13 14:03:26 UTC (rev 1224) +++ trunk/pom.xml 2012-12-13 14:06:36 UTC (rev 1225) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> <modules> <module>eugene</module> @@ -377,11 +377,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.6</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.6 </developerConnection> - <url>http://nuiton.org/projects/eugene/repository/show/trunk</url> + <url>http://nuiton.org/projects/eugene/repository/show/tags/eugene-2.6</url> </scm> <distributionManagement>

1 0

r1224 - trunk
by tchemit＠users.nuiton.org 13 Dec '12

13 Dec '12

Author: tchemit Date: 2012-12-13 15:03:26 +0100 (Thu, 13 Dec 2012) New Revision: 1224 Url: http://nuiton.org/projects/eugene/repository/revisions/1224 Log: fixes #2478: Updates mavenpom to 3.4.6 fixes #2471: Updates nuiton-utils to 2.6.5 fixes #2470: Updates plexus-utils to 3.0.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-10 08:17:42 UTC (rev 1223) +++ trunk/pom.xml 2012-12-13 14:03:26 UTC (rev 1224) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.6</version> </parent> <artifactId>eugene</artifactId> @@ -202,7 +202,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.9</version> + <version>3.0.10</version> </dependency> </dependencies> @@ -309,7 +309,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r1223 - in trunk: eugene/src/site eugene-java-templates/src/site eugene-maven-plugin/src/site src/site
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 09:17:42 +0100 (Mon, 10 Dec 2012) New Revision: 1223 Url: http://nuiton.org/projects/eugene/repository/revisions/1223 Log: fix site urls Modified: trunk/eugene-java-templates/src/site/site_en.xml trunk/eugene-java-templates/src/site/site_fr.xml trunk/eugene-maven-plugin/src/site/site_en.xml trunk/eugene-maven-plugin/src/site/site_fr.xml trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene/src/site/site_en.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,8 +39,7 @@ </head> <breadcrumbs> - <item name="${project.name}" href="index.html"/> -  + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene/src/site/site_fr.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,8 +39,7 @@ </head> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/eugene/eugene/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> Modified: trunk/eugene-java-templates/src/site/site_en.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_en.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene-java-templates/src/site/site_en.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2012 CodeLutin + Copyright (C) 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,8 +39,7 @@ </head> <breadcrumbs> - <item name="${project.name}" href="index.html"/> -  + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> Modified: trunk/eugene-java-templates/src/site/site_fr.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_fr.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene-java-templates/src/site/site_fr.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2012 CodeLutin + Copyright (C) 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,8 +39,7 @@ </head> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/eugene/eugene-java-templates/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> Modified: trunk/eugene-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_en.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene-maven-plugin/src/site/site_en.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2006 - 2010 CodeLutin + Copyright (C) 2006 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -44,7 +44,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="parent"/> Modified: trunk/eugene-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2006 - 2010 CodeLutin + Copyright (C) 2006 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -44,7 +44,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs>  Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/src/site/site_en.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -68,8 +68,7 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/eugene/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <head> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-12-10 08:08:37 UTC (rev 1222) +++ trunk/src/site/site_fr.xml 2012-12-10 08:17:42 UTC (rev 1223) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -68,8 +68,7 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/eugene/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <head>

1 0

r1222 - trunk
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 09:08:37 +0100 (Mon, 10 Dec 2012) New Revision: 1222 Url: http://nuiton.org/projects/eugene/repository/revisions/1222 Log: fix site urls Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-10 08:03:39 UTC (rev 1221) +++ trunk/pom.xml 2012-12-10 08:08:37 UTC (rev 1222) @@ -315,6 +315,9 @@  <locales>en,fr</locales> +  + <relativizeDecorationLinks>false</relativizeDecorationLinks> + </properties> <build> @@ -407,18 +410,19 @@ <reportSets> <reportSet> <reports> + <report>summary</report> <report>project-team</report> <report>mailing-list</report> <report>cim</report> <report>issue-tracking</report> <report>license</report> <report>scm</report> - <report>dependencies</report> + <report>dependency-info</report> <report>dependency-convergence</report> + <report>dependency-management</report> <report>plugin-management</report> <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> + <report>dependencies</report> </reports> </reportSet> </reportSets>

1 0

r1221 - trunk
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 09:03:39 +0100 (Mon, 10 Dec 2012) New Revision: 1221 Url: http://nuiton.org/projects/eugene/repository/revisions/1221 Log: fixes #2473: Remove the ant module Removed: trunk/ant-eugene-task/

1 0

r1220 - in trunk: eugene/src/site eugene-java-templates/src eugene-java-templates/src/site eugene-java-templates/src/site/fr eugene-java-templates/src/site/fr/rst eugene-java-templates/src/site/rst eugene-maven-plugin/src/site eugene-maven-plugin/src/site/rst src/site src/site/fr/rst src/site/resources/images src/site/rst
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 08:55:48 +0100 (Mon, 10 Dec 2012) New Revision: 1220 Url: http://nuiton.org/projects/eugene/repository/revisions/1220 Log: fixes #2472: Improve documentation fixes #966: Add documentation about properties file to consolidate model Added: trunk/eugene-java-templates/src/site/ trunk/eugene-java-templates/src/site/fr/ trunk/eugene-java-templates/src/site/fr/rst/ trunk/eugene-java-templates/src/site/fr/rst/index.rst trunk/eugene-java-templates/src/site/rst/ trunk/eugene-java-templates/src/site/rst/index.rst trunk/eugene-java-templates/src/site/site_en.xml trunk/eugene-java-templates/src/site/site_fr.xml Removed: trunk/src/site/resources/images/logos/ Modified: trunk/eugene-maven-plugin/src/site/rst/index.rst trunk/eugene-maven-plugin/src/site/site_en.xml trunk/eugene-maven-plugin/src/site/site_fr.xml trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/src/site/fr/rst/02-objectmodel.rst trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst trunk/src/site/fr/rst/index.rst trunk/src/site/rst/02-objectmodel.rst trunk/src/site/rst/06-fonctionnalites-avancees.rst trunk/src/site/rst/index.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/eugene/src/site/site_en.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -83,11 +83,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/eugene/src/site/site_fr.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -95,11 +95,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Added: trunk/eugene-java-templates/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene-java-templates/src/site/fr/rst/index.rst (rev 0) +++ trunk/eugene-java-templates/src/site/fr/rst/index.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -0,0 +1,46 @@ +.. - +.. * #%L +.. * EUGene :: Java templates +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - + +====== +Eugene +====== + +:Authors: tony CHEMIT +:Contact: chemit(a)codelutin.com +:Revision: $Revision$ +:Date: $Date$ + +.. contents:: + +Templates java +============== + +Ce module offre des templates pour générer des objets java, à savoir : + +- des interfaces (*org.nuiton.eugene.java.JavaInterfaceTransformer*) +- des énumérations (*org.nuiton.eugene.java.JavaEnumerationTransformer*) +- des beans simples (sans surcharge possible) (*org.nuiton.eugene.java.SimpleJavaBeanTransformer*) +- des beans simples (avec surcharge possible : génération d'un abstract et d'un Impl) (*org.nuiton.eugene.java.JavaBeanTransformer*) + +*TODO Finir cette documentation avant la version 3.0 en donnant un exemple complet d'utilisation.* \ No newline at end of file Property changes on: trunk/eugene-java-templates/src/site/fr/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/site/rst/index.rst =================================================================== --- trunk/eugene-java-templates/src/site/rst/index.rst (rev 0) +++ trunk/eugene-java-templates/src/site/rst/index.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -0,0 +1,46 @@ +.. - +.. * #%L +.. * EUGene :: Java templates +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - + +====== +Eugene +====== + +:Authors: tony CHEMIT +:Contact: chemit(a)codelutin.com +:Revision: $Revision$ +:Date: $Date$ + +.. contents:: + +Java Templates +============== + +This module offers you some templates to generate some java stuff: + +- interfaces (*org.nuiton.eugene.java.JavaInterfaceTransformer*) +- enumerations (*org.nuiton.eugene.java.JavaEnumerationTransformer*) +- simple beans (with no method override possible) (*org.nuiton.eugene.java.SimpleJavaBeanTransformer*) +- simple beans (with method override possible: generates a Abstract and Impl class form each bean) (*org.nuiton.eugene.java.JavaBeanTransformer*) + +* TODO Finish this documentation before version 3.0*. Property changes on: trunk/eugene-java-templates/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/site/site_en.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_en.xml (rev 0) +++ trunk/eugene-java-templates/src/site/site_en.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> +  + </breadcrumbs> + + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu ref="parent"/> + + <menu name="User"> + <item href="index.html" name="Home"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' locale='en' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> Property changes on: trunk/eugene-java-templates/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/site/site_fr.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_fr.xml (rev 0) +++ trunk/eugene-java-templates/src/site/site_fr.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> + + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/eugene-java-templates/index.html"/> + </breadcrumbs> + + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> + +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> + + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> Property changes on: trunk/eugene-java-templates/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-maven-plugin/src/site/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/eugene-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_en.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/eugene-maven-plugin/src/site/site_en.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -64,11 +64,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/eugene-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -68,11 +68,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/fr/rst/02-objectmodel.rst =================================================================== --- trunk/src/site/fr/rst/02-objectmodel.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/fr/rst/02-objectmodel.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -110,6 +110,153 @@ .. image:: ../objectmodel/ObjectModel_Generator.png +Utilisation d'un fichier de consolidation du modèle +=================================================== + +Il est possible d'utiliser un fichier supplémmentaire pour injecter au modèle mémoire des tagValues et stéréotypes supplémentaires. + +Le fichier doit avoir le ême suffixe que le fichier contenant le modèle. + +Par exemple avec un fichier *model.zargo*, on peut lui associer un fichier +*model.properties*. + +Ce fichier est utile quand on ne veut pas ajouter les tagValues dans le modèle +zargo (car ensuite impossible d'avoir une vue synthétique de toutes les +tagValues ou stéréotypes utilisés dans un modèle). + +Ajout de tagValues +------------------ + +Les tagvalues peuvent être ajoutés à différents niveaux : + +- sur le modèle complêt + +:: + + model.tagValue.version=1.0 + +- sur un classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.tagValue.version=1.0 + +- sur un attribut d'un classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.attribute.room.tagValue.version=1.0 + +- sur une opération d'un classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.operation.enter.tagValue.version=1.0 + + +Ajout de stéréotypes +-------------------- + +Les stéréotypes ne peuvent pas être ajoutés au niveau du modèle mais sur : + +- les classifiers + +:: + + org.nuiton.eugene.tutorial.Hotel.stereotype=unique + +- sur un attribut d'un classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.attribute.room.stereotype=unique + +- sur une opération d'un classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.operation.enter.stereotype=unique + +*TODO Voir comment ajouter plusieurs stéréotypes sur une même cible*. + +Connaître les tagValues et stéréotypes existants +------------------------------------------------ + +L'utilisation des ModelPropertiesProvider permet de définir (et donc aussi de +valider les tagValues et stéréotypes applicables). + +Pour ne savoir plus sur ce concept voir `ModelPropertiesProvider`_ + +Il suffit alors dans le module maven de génération d'appeler le goal *available-data*. + +Exemple : + +:: + + $ mvn eugene:available-data + + [INFO] --- eugene-maven-plugin:xxx:available-data (default-cli) @ tutti-persistence --- + [INFO] Get datas for data types : [modeltype, writer, modelreader, modeltemplate, tagvalue, stereotype] + + Found 2 modeltypes : + [objectmodel] with implementation 'org.nuiton.eugene.models.object.xml.ObjectModelImpl' + [statemodel] with implementation 'org.nuiton.eugene.models.state.xml.StateModelImpl' + + Found 3 writers : + [xmi] with implementation 'org.nuiton.eugene.plugin.writer.XmiChainedFileWriter + inputProtocol : xmi + outputProtocol : model + defaultIncludes : **/*.xmi + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + [model2Java] with implementation 'org.nuiton.eugene.plugin.writer.ModelChainedFileWriter + inputProtocol : model + outputProtocol : null + defaultIncludes : **/*.*model + defaultInputDirectory : src/main/models + defaultTestInputDirectory : src/test/models' + [zargo2xmi] with implementation 'org.nuiton.eugene.plugin.writer.ZargoChainedFileWriter + inputProtocol : zargo + outputProtocol : xmi + defaultIncludes : **/*.zargo + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + + Found 2 modelreaders : + [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' + [statemodel] with implementation 'org.nuiton.eugene.models.state.StateModelReader' + + Found 5 modeltemplates : + [org.nuiton.eugene.java.JavaInterfaceTransformer] with implementation 'org.nuiton.eugene.java.JavaInterfaceTransformer' + [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' + [org.nuiton.eugene.java.JavaEnumerationTransformer] with implementation 'org.nuiton.eugene.java.JavaEnumerationTransformer' + [org.nuiton.eugene.java.SimpleJavaBeanTransformer] with implementation 'org.nuiton.eugene.java.SimpleJavaBeanTransformer' + [org.nuiton.eugene.java.JavaBeanTransformer] with implementation 'org.nuiton.eugene.java.JavaBeanTransformer' + + Found 7 tagvalues in 2 provider(s) : [eugene, java] + + Provider [eugene] - Found 5 tagvalues : + [constantPrefix] targets : 'ObjectModel, ObjectModelClassifier' : Sets the prefix of any constant to be generated for the given class + [doNotGenerateBooleanGetMethods] targets : 'ObjectModel, ObjectModelClassifier' : To specify to NOT generate getXXX methods for boolean properties + [documentation] targets : 'ObjectModel, ObjectModelElement' : Sets the documentation of a model or any of his elements + [i18n] targets : 'ObjectModel, ObjectModelClassifier' : Sets the i18n prefix to use on I18n keys generated + [version] targets : 'ObjectModel' : To set the version of the model. + Provider [java] - Found 2 tagvalues : + [beanSuperClass] targets : 'ObjectModel, ObjectModelClassifier' : To specify a super-class to used on generated bean for a class or any class of a model + [noPCS] targets : 'ObjectModel, ObjectModelClassifier' : To specify to not generate any propertyChange code for a class or any class of a model + + Found 4 stereotypes in 2 provider(s) : [eugene, java] + + Provider [eugene] - Found 3 stereotypes : + [indexed] targets : 'ObjectModelAttribute' : To specify that a attribute is indexed + [ordered] targets : 'ObjectModelAttribute' : To specify that a attribute is ordered + [skip] targets : 'ObjectModelClassifier' : To specify that a classifier should not been generated. + Provider [java] - Found one stereotype : + [bean] targets : 'ObjectModelClassifier' : To specify that a class is a JavaBean + +`Pour plus d'info sur ce goal`_ + + Application des templates ========================= @@ -126,3 +273,7 @@ différent par modèle, par interface, par classe ou encore par classifier (souche commune aux classes et interfaces). De plus, elles peuvent indifféremment générer du code Java / XML ou encore tout autre type de code (texte ou autre...). + + +.. _Pour plus d'info sur ce goal: ./eugene-maven-plugin/fr/available-data-mojo.html +.. _ModelPropertiesProvider: ./06-fonctionnalites-avancees.html#ModelPropertiesProvider Modified: trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst =================================================================== --- trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -154,7 +154,14 @@ Le calcul du nom d'une constante à partir de la proprité revient donc régulièrement et est caché grâçe à cette extension. +ModelPropertiesProvider +----------------------- +Il est possible de définir les tagValues et stéréotypes applicables sur un +modèle ou sur des templates en utilisant la classe *ModelPropertiesProvider*. + +Docuementationà finir avant la version 3.0... + .. _Templates: 04-templates.html .. _Ref ModelReader: ../eugene/apidocs/org/nuiton/eugene/ModelReader.html Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/fr/rst/index.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -53,16 +53,16 @@ Le projet EUGene est composé de 3 modules : - * `eugene-api`_ - * `ant-eugene-task`_ - * `eugene-maven-plugin`_ + * `eugene-api`_ (Api de base d'EUGene) + * `eugene-java-templates`_ (Templates pour générer des classes java) + * `eugene-maven-plugin`_ (Plugin maven pour lancer des générations) .. _eugene-api: ../eugene/fr/index.html -.. _ant-eugene-task: ../ant-eugene-task/fr/index.html +.. _eugene-java-templates: ../eugene-java-templates/fr/index.html .. _eugene-maven-plugin: ../eugene-maven-plugin/fr/index.html Plus d'infos sur le projet sur la `forge nuiton`_ . -.. _forge nuiton: http://www.nuiton.org/projects/show/eugene +.. _forge nuiton: http://nuiton.org/projects/eugene A venir des tutoriels ainsi qu'une application demo. Modified: trunk/src/site/rst/02-objectmodel.rst =================================================================== --- trunk/src/site/rst/02-objectmodel.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/rst/02-objectmodel.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -108,6 +108,150 @@ .. image:: objectmodel/ObjectModel_Generator.png +Consolidate model with a properties file +======================================== + +You can use another properties file with same name as your model to consolidate +your model by adding sometagvalues and stereotypes, their will be merge into the memory model. + +For example, with a model file *model.zargo*, use then a file named +*model.properties*. + +This file is useful if you don't like to put all your tagValues and +stereotypes into a zargo model when synthetic view of them is not possible. + +Howto add tagValues +------------------- + +They can be added at different levels: + +- On a complete model + +:: + + model.tagValue.version=1.0 + +- on a classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.tagValue.version=1.0 + +- on a classifier's attribute + +:: + + org.nuiton.eugene.tutorial.Hotel.attribute.room.tagValue.version=1.0 + +- on a classifier's operation + +:: + + org.nuiton.eugene.tutorial.Hotel.operation.enter.tagValue.version=1.0 + + +Howto add stereotypes +--------------------- + +Stereotypes can not be placed on a model, but still + +- on a classifier + +:: + + org.nuiton.eugene.tutorial.Hotel.stereotype=unique + +- on a classifier's attribute + +:: + + org.nuiton.eugene.tutorial.Hotel.attribute.room.stereotype=unique + +- on a classifier's operation + +:: + + org.nuiton.eugene.tutorial.Hotel.operation.enter.stereotype=unique + +*TODO See how to add more than one stereotype oat a level* + +Howto discover which tagValues and stereotypes to use +----------------------------------------------------- + +Usage of *ModelPropertiesProvider* permits to define, list and validate usage +of tagValues and stereotypes. + +For more informations about this concept see `ModelPropertiesProvider`_ + +You only need to invoke the *available-data* goal of the maven plugin + +Example : + +:: + + $ mvn eugene:available-data + + [INFO] --- eugene-maven-plugin:xxx:available-data (default-cli) @ tutti-persistence --- + [INFO] Get datas for data types : [modeltype, writer, modelreader, modeltemplate, tagvalue, stereotype] + + Found 2 modeltypes : + [objectmodel] with implementation 'org.nuiton.eugene.models.object.xml.ObjectModelImpl' + [statemodel] with implementation 'org.nuiton.eugene.models.state.xml.StateModelImpl' + + Found 3 writers : + [xmi] with implementation 'org.nuiton.eugene.plugin.writer.XmiChainedFileWriter + inputProtocol : xmi + outputProtocol : model + defaultIncludes : **/*.xmi + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + [model2Java] with implementation 'org.nuiton.eugene.plugin.writer.ModelChainedFileWriter + inputProtocol : model + outputProtocol : null + defaultIncludes : **/*.*model + defaultInputDirectory : src/main/models + defaultTestInputDirectory : src/test/models' + [zargo2xmi] with implementation 'org.nuiton.eugene.plugin.writer.ZargoChainedFileWriter + inputProtocol : zargo + outputProtocol : xmi + defaultIncludes : **/*.zargo + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + + Found 2 modelreaders : + [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' + [statemodel] with implementation 'org.nuiton.eugene.models.state.StateModelReader' + + Found 5 modeltemplates : + [org.nuiton.eugene.java.JavaInterfaceTransformer] with implementation 'org.nuiton.eugene.java.JavaInterfaceTransformer' + [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' + [org.nuiton.eugene.java.JavaEnumerationTransformer] with implementation 'org.nuiton.eugene.java.JavaEnumerationTransformer' + [org.nuiton.eugene.java.SimpleJavaBeanTransformer] with implementation 'org.nuiton.eugene.java.SimpleJavaBeanTransformer' + [org.nuiton.eugene.java.JavaBeanTransformer] with implementation 'org.nuiton.eugene.java.JavaBeanTransformer' + + Found 7 tagvalues in 2 provider(s) : [eugene, java] + + Provider [eugene] - Found 5 tagvalues : + [constantPrefix] targets : 'ObjectModel, ObjectModelClassifier' : Sets the prefix of any constant to be generated for the given class + [doNotGenerateBooleanGetMethods] targets : 'ObjectModel, ObjectModelClassifier' : To specify to NOT generate getXXX methods for boolean properties + [documentation] targets : 'ObjectModel, ObjectModelElement' : Sets the documentation of a model or any of his elements + [i18n] targets : 'ObjectModel, ObjectModelClassifier' : Sets the i18n prefix to use on I18n keys generated + [version] targets : 'ObjectModel' : To set the version of the model. + Provider [java] - Found 2 tagvalues : + [beanSuperClass] targets : 'ObjectModel, ObjectModelClassifier' : To specify a super-class to used on generated bean for a class or any class of a model + [noPCS] targets : 'ObjectModel, ObjectModelClassifier' : To specify to not generate any propertyChange code for a class or any class of a model + + Found 4 stereotypes in 2 provider(s) : [eugene, java] + + Provider [eugene] - Found 3 stereotypes : + [indexed] targets : 'ObjectModelAttribute' : To specify that a attribute is indexed + [ordered] targets : 'ObjectModelAttribute' : To specify that a attribute is ordered + [skip] targets : 'ObjectModelClassifier' : To specify that a classifier should not been generated. + Provider [java] - Found one stereotype : + [bean] targets : 'ObjectModelClassifier' : To specify that a class is a JavaBean + +`More info about this goal`_ + Templates application ===================== @@ -123,3 +267,8 @@ model, by interface, by class or even by classifier (common stub to classes and interfaces). Moreover, they can generate every kind of code what so ever : Java, XML, text, C++, ... + + + +.. _More info about this goal: ./eugene-maven-plugin/available-data-mojo.html +.. _ModelPropertiesProvider: ./06-fonctionnalites-avancees.html#ModelPropertiesProvider \ No newline at end of file Modified: trunk/src/site/rst/06-fonctionnalites-avancees.rst =================================================================== --- trunk/src/site/rst/06-fonctionnalites-avancees.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/rst/06-fonctionnalites-avancees.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -149,6 +149,13 @@ use those constants in the generated code. So the constant's name calculation from a property come quite often and is cached by this extension. +ModelPropertiesProvider +----------------------- + +It is possible to define tagValues and stereotypes via a *ModelPropertiesProvider*. + +Must be continued (doc will be done before version 3.0)... + .. _argouml: http://argouml.tigris.org/ .. _topcased: http://www.topcased.org/ .. _Templates: ./04-templates.html Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/rst/index.rst 2012-12-10 07:55:48 UTC (rev 1220) @@ -53,15 +53,15 @@ EUGene is divided into 3 modules : - * `eugene-api`_ - * `ant-eugene-task`_ - * `eugene-maven-plugin`_ + * `eugene-api`_ (EUGene Api) + * `eugene-java-templates`_ (Templates pour générer des classes java) + * `eugene-maven-plugin`_ (Maven Plugin to generate stuff using EUGene) .. _eugene-api: eugene/index.html -.. _ant-eugene-task: ant-eugene-task/index.html +.. _eugene-java-templates: ../eugene-java-templates/fr/index.html .. _eugene-maven-plugin: eugene-maven-plugin/index.html More info on the project on `nuiton's forge`_ . -.. _nuiton's forge: http://www.nuiton.org/projects/show/eugene +.. _nuiton's forge: http://www.nuiton.org/projects/eugene Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/site_en.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.2</version> + <version>1.3.0</version> </skin> <custom> @@ -57,12 +57,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="${project.url}/images/logos/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -119,11 +119,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-12-10 06:31:58 UTC (rev 1219) +++ trunk/src/site/site_fr.xml 2012-12-10 07:55:48 UTC (rev 1220) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.2</version> + <version>1.3.0</version> </skin> <custom> @@ -57,12 +57,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="${project.url}/images/logos/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -126,11 +126,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r1219 - trunk
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 07:31:58 +0100 (Mon, 10 Dec 2012) New Revision: 1219 Url: http://nuiton.org/projects/eugene/repository/revisions/1219 Log: fixes #2469: Updates jaxen to 1.1.4 fixes #2470: Updates plexus-utils to 3.0.9 fixes #2471: Updates nuiton-utils to 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-10 03:11:03 UTC (rev 1218) +++ trunk/pom.xml 2012-12-10 06:31:58 UTC (rev 1219) @@ -98,7 +98,7 @@ <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -202,7 +202,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.8</version> + <version>3.0.9</version> </dependency> </dependencies> @@ -309,7 +309,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r1218 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 04:11:03 +0100 (Mon, 10 Dec 2012) New Revision: 1218 Url: http://nuiton.org/projects/eugene/repository/revisions/1218 Log: fixes #2204: Bean's property change support must be transient Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2012-12-10 03:05:59 UTC (rev 1217) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2012-12-10 03:11:03 UTC (rev 1218) @@ -63,18 +63,15 @@ String constantName = prefix + builder.getConstantName(attrName); - if (constantNames.contains(constantName)) { + if (!constantNames.contains(constantName)) { - // already generated - return; + addConstant(output, + constantName, + String.class, + "\"" + attrName + "\"", + ObjectModelJavaModifier.PUBLIC + ); } - - addConstant(output, - constantName, - String.class, - "\"" + attrName + "\"", - ObjectModelJavaModifier.PUBLIC - ); } protected String getAttributeName(ObjectModelAttribute attr) { @@ -566,7 +563,8 @@ PropertyChangeSupport.class, "new PropertyChangeSupport(this)", ObjectModelJavaModifier.PROTECTED, - ObjectModelJavaModifier.FINAL + ObjectModelJavaModifier.FINAL, + ObjectModelJavaModifier.TRANSIENT ); // Add PropertyListener

1 0

r1217 - trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 04:05:59 +0100 (Mon, 10 Dec 2012) New Revision: 1217 Url: http://nuiton.org/projects/eugene/repository/revisions/1217 Log: fixes #2466: NPE when using available-data with no parameter Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-12-10 00:29:12 UTC (rev 1216) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-12-10 03:05:59 UTC (rev 1217) @@ -91,6 +91,7 @@ protected Map<String, Model> modelTypes; /** All available writers introspects via plexus. */ + @Component(role = ModelReader.class) protected Map<String, ModelReader<?>> modelReaders; /** All available templates introspects via plexus. */ @@ -217,21 +218,23 @@ } else { Map<String, ?> map = data.getData(this); - int size = map.size(); + int size = map == null ? 0 : map.size(); if (size == 0) { buffer.append("\nNo available ").append(dataType).append("."); - } else if (size == 1) { - buffer.append("\nFound one ").append(dataType).append(" : "); } else { - buffer.append("\nFound "); - buffer.append(size); - buffer.append(" "); - buffer.append(dataType); - buffer.append("s : "); + if (size == 1) { + buffer.append("\nFound one ").append(dataType).append(" : "); + } else { + buffer.append("\nFound "); + buffer.append(size); + buffer.append(" "); + buffer.append(dataType); + buffer.append("s : "); + } + for (Map.Entry<String, ?> e : map.entrySet()) { + data.toString(buffer, e); + } } - for (Map.Entry<String, ?> e : map.entrySet()) { - data.toString(buffer, e); - } } }

1 0

r1216 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 10 Dec '12

10 Dec '12

Author: tchemit Date: 2012-12-10 01:29:12 +0100 (Mon, 10 Dec 2012) New Revision: 1216 Url: http://nuiton.org/projects/eugene/repository/revisions/1216 Log: fixes #2468: Introduce a SimpleJavaBeanTransformer fixes #2467: Eugene does not generate Bean Impl as it should Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2012-12-10 00:29:12 UTC (rev 1216) @@ -0,0 +1,687 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +/** + * Common class form javabean like transformer. + * + * @author tchemit <chemit(a)codelutin.com> + * @see SimpleJavaBeanTransformer + * @see JavaBeanTransformer + * @since 2.6 + */ +public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformerToJava { + + public static final String DEFAULT_CONSTANT_PREFIX = "PROPERTY_"; + + protected void createPropertyConstant(ObjectModelClass output, + ObjectModelAttribute attr, + String prefix, + Set<String> constantNames) { + + String attrName = getAttributeName(attr); + + String constantName = prefix + builder.getConstantName(attrName); + + if (constantNames.contains(constantName)) { + + // already generated + return; + } + + addConstant(output, + constantName, + String.class, + "\"" + attrName + "\"", + ObjectModelJavaModifier.PUBLIC + ); + } + + protected String getAttributeName(ObjectModelAttribute attr) { + String attrName = attr.getName(); + if (attr.hasAssociationClass()) { + String assocAttrName = JavaGeneratorUtil.getAssocAttrName(attr); + attrName = JavaGeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + } + return attrName; + } + + protected String getAttributeType(ObjectModelAttribute attr) { + String attrType = attr.getType(); + if (attr.hasAssociationClass()) { + attrType = attr.getAssociationClass().getName(); + } + return attrType; + } + + protected boolean containsMutiple(List<ObjectModelAttribute> attributes) { + + boolean result = false; + + for (ObjectModelAttribute attr : attributes) { + + if (JavaGeneratorUtil.isNMultiplicity(attr)) { + result = true; + + break; + } + + } + return result; + } + + protected void createProperty(ObjectModelClass output, + ObjectModelAttribute attr, + boolean usePCS, + boolean generateBooleanGetMethods) { + + String attrName = getAttributeName(attr); + String attrType = getAttributeType(attr); + + boolean multiple = JavaGeneratorUtil.isNMultiplicity(attr); + + String constantName = getConstantName(attrName); + String simpleType = JavaGeneratorUtil.getSimpleName(attrType); + + if (multiple) { + + createGetChildMethod(output, + attrName, + attrType, + simpleType + ); + + createIsEmptyMethod(output, + attrName + ); + + createSizeMethod(output, + attrName + ); + + createAddChildMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + createAddAllChildrenMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + createRemoveChildMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + createRemoveAllChildrenMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + createContainsChildMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + createContainsAllChildrenMethod(output, + attrName, + attrType, + constantName, + usePCS + ); + + // Change type for Multiple attribute + if (attr.isOrdered()) { + attrType = List.class.getName() + "<" + attrType + ">"; + } else { + attrType = Collection.class.getName() + "<" + attrType + ">"; + } + + simpleType = JavaGeneratorUtil.getSimpleName(attrType); + } + + boolean booleanProperty = JavaGeneratorUtil.isBooleanPrimitive(attr); + + if (booleanProperty && !multiple) { + + // creates a isXXX method + createGetMethod(output, + attrName, + attrType, + JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX + ); + } + + if (multiple || !booleanProperty || generateBooleanGetMethods) { + + createGetMethod(output, + attrName, + attrType, + JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX + ); + + } + createSetMethod(output, + attrName, + attrType, + simpleType, + constantName, + usePCS + ); + + // Add attribute to the class + addAttribute(output, + attrName, + attrType, + "", + ObjectModelJavaModifier.PROTECTED + ); + + } + + protected List<ObjectModelAttribute> getProperties(ObjectModelClass input) { + List<ObjectModelAttribute> attributes = + (List<ObjectModelAttribute>) input.getAttributes(); + + List<ObjectModelAttribute> attrs = + new ArrayList<ObjectModelAttribute>(); + for (ObjectModelAttribute attr : attributes) { + if (attr.isNavigable()) { + + // only keep navigable attributes + attrs.add(attr); + } + } + return attrs; + } + + protected void createGetMethod(ObjectModelClass output, + String attrName, + String attrType, + String methodPrefix) { + + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName(methodPrefix , attrName), + attrType, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" + /*{ + return <%=attrName%>; + }*/ + ); + } + + protected void createGetChildMethod(ObjectModelClass output, + String attrName, + String attrType, + String simpleType) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("get", attrName), + attrType, + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "int", "index"); + setOperationBody(operation, "" + /*{ + <%=simpleType%> o = getChild(<%=attrName%>, index); + return o; + }*/ + ); + } + + protected void createIsEmptyMethod(ObjectModelClass output, + String attrName) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("is", attrName)+"Empty", + boolean.class, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" + /*{ + return <%=attrName%> == null || <%=attrName%>.isEmpty(); + }*/ + ); + } + + protected void createSizeMethod(ObjectModelClass output, + String attrName) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("size", attrName), + int.class, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" + /*{ + return <%=attrName%> == null ? 0 : <%=attrName%>.size(); + }*/ + ); + } + protected void createAddChildMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("add", attrName), + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, attrType, attrName); + + String methodName = getJavaBeanMethodName("get", attrName); + StringBuilder buffer = new StringBuilder("" + /*{ + <%=methodName%>().add(<%=attrName%>); + }*/ + ); + if (usePCS) { + buffer.append("" + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); + }*/ + ); + } + setOperationBody(operation, buffer.toString()); + } + + protected void createAddAllChildrenMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("addAll", attrName), + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); + + String methodName = getJavaBeanMethodName("get", attrName); + StringBuilder buffer = new StringBuilder("" + /*{ + <%=methodName%>().addAll(<%=attrName%>); + }*/ + ); + if (usePCS) { + buffer.append("" + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); + }*/ + ); + } + setOperationBody(operation, buffer.toString()); + } + + protected void createRemoveChildMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("remove", attrName), + "boolean", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, attrType, attrName); + String methodName = getJavaBeanMethodName("get", attrName); + StringBuilder buffer = new StringBuilder(); + buffer.append("" + /*{ + boolean removed = <%=methodName%>().remove(<%=attrName%>);}*/ + ); + + if (usePCS) { + buffer.append("" + /*{ + if (removed) { + firePropertyChange(<%=constantName%>, <%=attrName%>, null); + }}*/ + ); + } + buffer.append("" + /*{ + return removed; + }*/ + ); + setOperationBody(operation, buffer.toString()); + } + + protected void createRemoveAllChildrenMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("removeAll", attrName), + "boolean", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); + StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); + buffer.append("" + /*{ + boolean removed = <%=methodName%>().removeAll(<%=attrName%>);}*/ + ); + + if (usePCS) { + buffer.append("" + /*{ + if (removed) { + firePropertyChange(<%=constantName%>, <%=attrName%>, null); + }}*/ + ); + } + buffer.append("" + /*{ + return removed; + }*/ + ); + setOperationBody(operation, buffer.toString()); + } + + protected void createContainsChildMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("contains", attrName), + "boolean", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, attrType, attrName); + StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); + buffer.append("" + /*{ + boolean contains = <%=methodName%>().contains(<%=attrName%>); + return contains; + }*/ + ); + setOperationBody(operation, buffer.toString()); + } + + protected void createContainsAllChildrenMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("containsAll", attrName), + "boolean", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); + StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); + buffer.append("" + /*{ + boolean contains = <%=methodName%>().containsAll(<%=attrName%>); + return contains; + }*/ + ); + setOperationBody(operation, buffer.toString()); + } + + protected void createSetMethod(ObjectModelClass output, + String attrName, + String attrType, + String simpleType, + String constantName, + boolean usePCS) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("set", attrName), + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, attrType, attrName); + + if (usePCS) { + String methodName = getJavaBeanMethodName("get", attrName); + setOperationBody(operation, "" + /*{ + <%=simpleType%> oldValue = <%=methodName%>(); + this.<%=attrName%> = <%=attrName%>; + firePropertyChange(<%=constantName%>, oldValue, <%=attrName%>); + }*/ + ); + } else { + setOperationBody(operation, "" + /*{ + this.<%=attrName%> = <%=attrName%>; + }*/ + ); + } + } + + protected void addSerializable(ObjectModelClass input, + ObjectModelClass output, + boolean interfaceFound) { + if (!interfaceFound) { + addInterface(output, Serializable.class); + } + + // Generate the serialVersionUID + long serialVersionUID = JavaGeneratorUtil.generateSerialVersionUID(input); + + addConstant(output, + JavaGeneratorUtil.SERIAL_VERSION_UID, + "long", + serialVersionUID + "L", + ObjectModelJavaModifier.PRIVATE + ); + } + + /** + * Add all interfaces defines in input class and returns if + * {@link Serializable} interface was found. + * + * @param input the input model class to process + * @param output the output generated class + * @return {@code true} if {@link Serializable} was found from input, + * {@code false} otherwise + */ + protected boolean addInterfaces(ObjectModelClass input, + ObjectModelClass output) { + boolean foundSerializable = false; + for (ObjectModelInterface parentInterface : input.getInterfaces()) { + String fqn = parentInterface.getQualifiedName(); + addInterface(output, fqn); + if (Serializable.class.getName().equals(fqn)) { + foundSerializable = true; + } + } + return foundSerializable; + } + + protected void createPropertyChangeSupport(ObjectModelClass output) { + + addAttribute(output, + "pcs", + PropertyChangeSupport.class, + "new PropertyChangeSupport(this)", + ObjectModelJavaModifier.PROTECTED, + ObjectModelJavaModifier.FINAL + ); + + // Add PropertyListener + + ObjectModelOperation operation; + + operation = addOperation(output, + "addPropertyChangeListener", + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, PropertyChangeListener.class, "listener"); + setOperationBody(operation, "" + /*{ + pcs.addPropertyChangeListener(listener); + }*/ + ); + + operation = addOperation(output, + "addPropertyChangeListener", + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, String.class, "propertyName"); + addParameter(operation, PropertyChangeListener.class, "listener"); + setOperationBody(operation, "" + /*{ + pcs.addPropertyChangeListener(propertyName, listener); + }*/ + ); + + operation = addOperation(output, + "removePropertyChangeListener", + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, PropertyChangeListener.class, "listener"); + setOperationBody(operation, "" + /*{ + pcs.removePropertyChangeListener(listener); + }*/ + ); + + operation = addOperation(output, + "removePropertyChangeListener", + "void", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, String.class, "propertyName"); + addParameter(operation, PropertyChangeListener.class, "listener"); + setOperationBody(operation, "" + /*{ + pcs.removePropertyChangeListener(propertyName, listener); + }*/ + ); + + operation = addOperation(output, + "firePropertyChange", + "void", + ObjectModelJavaModifier.PROTECTED + ); + addParameter(operation, String.class, "propertyName"); + addParameter(operation, Object.class, "oldValue"); + addParameter(operation, Object.class, "newValue"); + setOperationBody(operation, "" + /*{ + pcs.firePropertyChange(propertyName, oldValue, newValue); + }*/ + ); + + operation = addOperation(output, + "firePropertyChange", + "void", + ObjectModelJavaModifier.PROTECTED + ); + addParameter(operation, String.class, "propertyName"); + addParameter(operation, Object.class, "newValue"); + setOperationBody(operation, "" + /*{ + firePropertyChange(propertyName, null, newValue); + }*/ + ); + } + + protected void createGetChildMethod(ObjectModelClass output) { + ObjectModelOperation getChild = addOperation( + output, + "getChild", "<T> T", + ObjectModelJavaModifier.PROTECTED + ); + addImport(output, List.class); + + addParameter(getChild, "java.util.Collection<T>", "childs"); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" +/*{ + T result = null; + if (childs != null) { + if (childs instanceof List) { + if (index < childs.size()) { + result = ((List<T>) childs).get(index); + } + } else { + int i = 0; + for (T o : childs) { + if (index == i) { + result = o; + break; + } + i++; + } + } + } + return result; +}*/ + ); + } +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-25 09:48:44 UTC (rev 1215) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-12-10 00:29:12 UTC (rev 1216) @@ -30,13 +30,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -60,12 +56,10 @@ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaBeanTransformer" * @since 2.0.2 */ -public class JavaBeanTransformer extends ObjectModelTransformerToJava { +public class JavaBeanTransformer extends AbstractJavaBeanTransformer { private static final Log log = LogFactory.getLog(JavaBeanTransformer.class); - public static final String DEFAULT_CONSTANT_PREFIX = "PROPERTY_"; - @Override public void transformFromClass(ObjectModelClass input) { @@ -75,17 +69,86 @@ return; } - if (canGenerateImpl(input)) { + ObjectModelClass output = null; + if (canGenerateAbstract(input)) { + + // nothing more to do + output = generateAbstract(input); + } + + if (canGenerateImpl(input, output)) { + generateImpl(input); } - - if (!canGenerateAbstract(input)) { + } - // nothing more to do - return; + protected boolean canGenerateAbstract(ObjectModelClass input) { + boolean b = !isInClassPath(input); + return b; + } + + protected boolean canGenerateImpl(ObjectModelClass input, + ObjectModelClass abstractOutput) { + String fqn = input.getQualifiedName() + "Impl"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; } + Collection<ObjectModelOperation> operations = input.getOperations(); + if (!operations.isEmpty()) { + + // this input have some specific operations (so Impl can not be generated) + return false; + } + + Collection<ObjectModelOperation> allOtherOperations = + input.getAllOtherOperations(true); + + if (!allOtherOperations.isEmpty()) { + + Collection<ObjectModelOperation> allExistingOperations = + new ArrayList<ObjectModelOperation>(input.getAllSuperclassOperations(true)); + + if (abstractOutput!=null) { + allExistingOperations.addAll(abstractOutput.getOperations()); + } + + for (ObjectModelOperation operation : allOtherOperations) { + if (!allExistingOperations.contains(operation)) { + + // found one method not on super classe, so can't generate Impl + return false; + } + } + } + return true; + +// boolean hasOperations = !allOtherOperations.isEmpty() || +// !operations.isEmpty(); +// +// // generate only if no user operations found +// return !hasOperations; + } + + + + + protected void createAbstractOperations(ObjectModelClass ouput, + Iterable<ObjectModelOperation> operations) { + JavaGeneratorUtil.cloneOperations( + this, + operations, + ouput, + true, + ObjectModelJavaModifier.ABSTRACT + ); + } + + protected ObjectModelClass generateAbstract(ObjectModelClass input) { // test if a super class has bean stereotype boolean superClassIsBean = false; Collection<ObjectModelClass> superclasses = input.getSuperclasses(); @@ -193,545 +256,29 @@ } } + return output; } - protected boolean canGenerateAbstract(ObjectModelClass input) { - boolean b = !isInClassPath(input); - return b; - } + protected ObjectModelClass generateImpl(ObjectModelClass input) { - protected boolean canGenerateImpl(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "Impl"; - - if (isInClassPath(fqn)) { - - // already in class-path - return false; - } - - boolean hasOperations = !input.getAllOtherOperations(true).isEmpty() || - !input.getOperations().isEmpty(); - - // generate only if no user operations found - return !hasOperations; - } - - protected void createPropertyConstant(ObjectModelClass output, - ObjectModelAttribute attr, - String prefix, - Set<String> constantNames) { - - String attrName = getAttributeName(attr); - - String constantName = prefix + builder.getConstantName(attrName); - - if (constantNames.contains(constantName)) { - - // already generated - return; - } - - addConstant(output, - constantName, - String.class, - "\"" + attrName + "\"", - ObjectModelJavaModifier.PUBLIC + ObjectModelClass resultClassImpl = createClass( + input.getName() + "Impl", + input.getPackageName() ); - } - protected String getAttributeName(ObjectModelAttribute attr) { - String attrName = attr.getName(); - if (attr.hasAssociationClass()) { - String assocAttrName = JavaGeneratorUtil.getAssocAttrName(attr); - attrName = JavaGeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - } - return attrName; - } + // set the abstract resulClass as the resultClassImpl super class + setSuperClass(resultClassImpl, input.getQualifiedName()); - protected String getAttributeType(ObjectModelAttribute attr) { - String attrType = attr.getType(); - if (attr.hasAssociationClass()) { - attrType = attr.getAssociationClass().getName(); - } - return attrType; - } - - protected boolean containsMutiple(List<ObjectModelAttribute> attributes) { - - boolean result = false; - - for (ObjectModelAttribute attr : attributes) { - - if (JavaGeneratorUtil.isNMultiplicity(attr)) { - result = true; - - break; - } - - } - return result; - } - - protected void createProperty(ObjectModelClass output, - ObjectModelAttribute attr, - boolean usePCS, - boolean generateBooleanGetMethods) { - - String attrName = getAttributeName(attr); - String attrType = getAttributeType(attr); - - boolean multiple = JavaGeneratorUtil.isNMultiplicity(attr); - - String constantName = getConstantName(attrName); - String simpleType = JavaGeneratorUtil.getSimpleName(attrType); - - if (multiple) { - - createGetChildMethod(output, - attrName, - attrType, - simpleType - ); - - createIsEmptyMethod(output, - attrName - ); - - createSizeMethod(output, - attrName - ); - - createAddChildMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - createAddAllChildrenMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - createRemoveChildMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - createRemoveAllChildrenMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - createContainsChildMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - createContainsAllChildrenMethod(output, - attrName, - attrType, - constantName, - usePCS - ); - - // Change type for Multiple attribute - if (attr.isOrdered()) { - attrType = List.class.getName() + "<" + attrType + ">"; - } else { - attrType = Collection.class.getName() + "<" + attrType + ">"; - } - - simpleType = JavaGeneratorUtil.getSimpleName(attrType); - } - - boolean booleanProperty = JavaGeneratorUtil.isBooleanPrimitive(attr); - - if (booleanProperty && !multiple) { - - // creates a isXXX method - createGetMethod(output, - attrName, - attrType, - JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX - ); - } - - if (multiple || !booleanProperty || generateBooleanGetMethods) { - - createGetMethod(output, - attrName, - attrType, - JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX - ); - - } - createSetMethod(output, - attrName, - attrType, - simpleType, - constantName, - usePCS - ); - - // Add attribute to the class - addAttribute(output, - attrName, - attrType, - "", - ObjectModelJavaModifier.PROTECTED - ); - - } - - protected void createAbstractOperations(ObjectModelClass ouput, - Iterable<ObjectModelOperation> operations) { - JavaGeneratorUtil.cloneOperations( - this, - operations, - ouput, - true, - ObjectModelJavaModifier.ABSTRACT - ); - } - - protected List<ObjectModelAttribute> getProperties(ObjectModelClass input) { - List<ObjectModelAttribute> attributes = - (List<ObjectModelAttribute>) input.getAttributes(); - - List<ObjectModelAttribute> attrs = - new ArrayList<ObjectModelAttribute>(); - for (ObjectModelAttribute attr : attributes) { - if (attr.isNavigable()) { - - // only keep navigable attributes - attrs.add(attr); - } - } - return attrs; - } - - protected void createGetMethod(ObjectModelClass output, - String attrName, - String attrType, - String methodPrefix) { - - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName(methodPrefix , attrName), - attrType, - ObjectModelJavaModifier.PUBLIC - ); - setOperationBody(operation, "" - /*{ - return <%=attrName%>; - }*/ - ); - } - - protected void createGetChildMethod(ObjectModelClass output, - String attrName, - String attrType, - String simpleType) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("get", attrName), - attrType, - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, "int", "index"); - setOperationBody(operation, "" - /*{ - <%=simpleType%> o = getChild(<%=attrName%>, index); - return o; - }*/ - ); - } - - protected void createIsEmptyMethod(ObjectModelClass output, - String attrName) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("is", attrName)+"Empty", - boolean.class, - ObjectModelJavaModifier.PUBLIC - ); - setOperationBody(operation, "" - /*{ - return <%=attrName%> == null || <%=attrName%>.isEmpty(); - }*/ - ); - } - - protected void createSizeMethod(ObjectModelClass output, - String attrName) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("size", attrName), - int.class, - ObjectModelJavaModifier.PUBLIC - ); - setOperationBody(operation, "" - /*{ - return <%=attrName%> == null ? 0 : <%=attrName%>.size(); - }*/ - ); - } - protected void createAddChildMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("add", attrName), - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, attrType, attrName); - - String methodName = getJavaBeanMethodName("get", attrName); - StringBuilder buffer = new StringBuilder("" - /*{ - <%=methodName%>().add(<%=attrName%>); - }*/ - ); - if (usePCS) { - buffer.append("" - /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); - }*/ - ); - } - setOperationBody(operation, buffer.toString()); - } - - protected void createAddAllChildrenMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("addAll", attrName), - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); - - String methodName = getJavaBeanMethodName("get", attrName); - StringBuilder buffer = new StringBuilder("" - /*{ - <%=methodName%>().addAll(<%=attrName%>); - }*/ - ); - if (usePCS) { - buffer.append("" - /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); - }*/ - ); - } - setOperationBody(operation, buffer.toString()); - } - - protected void createRemoveChildMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("remove", attrName), - "boolean", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, attrType, attrName); - String methodName = getJavaBeanMethodName("get", attrName); - StringBuilder buffer = new StringBuilder(); - buffer.append("" - /*{ - boolean removed = <%=methodName%>().remove(<%=attrName%>);}*/ - ); - - if (usePCS) { - buffer.append("" - /*{ - if (removed) { - firePropertyChange(<%=constantName%>, <%=attrName%>, null); - }}*/ - ); - } - buffer.append("" - /*{ - return removed; - }*/ - ); - setOperationBody(operation, buffer.toString()); - } - - protected void createRemoveAllChildrenMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("removeAll", attrName), - "boolean", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); - StringBuilder buffer = new StringBuilder(); - String methodName = getJavaBeanMethodName("get", attrName); - buffer.append("" - /*{ - boolean removed = <%=methodName%>().removeAll(<%=attrName%>);}*/ - ); - - if (usePCS) { - buffer.append("" - /*{ - if (removed) { - firePropertyChange(<%=constantName%>, <%=attrName%>, null); - }}*/ - ); - } - buffer.append("" - /*{ - return removed; - }*/ - ); - setOperationBody(operation, buffer.toString()); - } - - protected void createContainsChildMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("contains", attrName), - "boolean", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, attrType, attrName); - StringBuilder buffer = new StringBuilder(); - String methodName = getJavaBeanMethodName("get", attrName); - buffer.append("" - /*{ - boolean contains = <%=methodName%>().contains(<%=attrName%>); - return contains; - }*/ - ); - setOperationBody(operation, buffer.toString()); - } - - protected void createContainsAllChildrenMethod(ObjectModelClass output, - String attrName, - String attrType, - String constantName, - boolean usePCS) { - - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("containsAll", attrName), - "boolean", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); - StringBuilder buffer = new StringBuilder(); - String methodName = getJavaBeanMethodName("get", attrName); - buffer.append("" - /*{ - boolean contains = <%=methodName%>().containsAll(<%=attrName%>); - return contains; - }*/ - ); - setOperationBody(operation, buffer.toString()); - } - - protected void createSetMethod(ObjectModelClass output, - String attrName, - String attrType, - String simpleType, - String constantName, - boolean usePCS) { - ObjectModelOperation operation = addOperation( - output, - getJavaBeanMethodName("set", attrName), - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, attrType, attrName); - - if (usePCS) { - String methodName = getJavaBeanMethodName("get", attrName); - setOperationBody(operation, "" - /*{ - <%=simpleType%> oldValue = <%=methodName%>(); - this.<%=attrName%> = <%=attrName%>; - firePropertyChange(<%=constantName%>, oldValue, <%=attrName%>); - }*/ - ); - } else { - setOperationBody(operation, "" - /*{ - this.<%=attrName%> = <%=attrName%>; - }*/ - ); - } - } - - protected void addSerializable(ObjectModelClass input, - ObjectModelClass output, - boolean interfaceFound) { - if (!interfaceFound) { - addInterface(output, Serializable.class); - } - - // Generate the serialVersionUID - long serialVersionUID = JavaGeneratorUtil.generateSerialVersionUID(input); - - addConstant(output, + // add a fix serialVersionUID, since the class has no field nor method + addConstant(resultClassImpl, JavaGeneratorUtil.SERIAL_VERSION_UID, "long", - serialVersionUID + "L", + "1L", ObjectModelJavaModifier.PRIVATE ); + return resultClassImpl; } - /** - * Add all interfaces defines in input class and returns if - * {@link Serializable} interface was found. - * - * @param input the input model class to process - * @param output the output generated class - * @return {@code true} if {@link Serializable} was found from input, - * {@code false} otherwise - */ - protected boolean addInterfaces(ObjectModelClass input, - ObjectModelClass output) { - boolean foundSerializable = false; - for (ObjectModelInterface parentInterface : input.getInterfaces()) { - String fqn = parentInterface.getQualifiedName(); - addInterface(output, fqn); - if (Serializable.class.getName().equals(fqn)) { - foundSerializable = true; - } - } - return foundSerializable; - } - protected void addSuperClass(ObjectModelClass input, ObjectModelClass output) { // Set superclass @@ -744,151 +291,4 @@ setSuperClass(output, qualifiedName); } } - - protected ObjectModelClass generateImpl(ObjectModelClass input) { - - ObjectModelClass resultClassImpl = createClass( - input.getName() + "Impl", - input.getPackageName() - ); - - // set the abstract resulClass as the resultClassImpl super class - setSuperClass(resultClassImpl, input.getQualifiedName()); - - // add a fix serialVersionUID, since the class has no field nor method - addConstant(resultClassImpl, - JavaGeneratorUtil.SERIAL_VERSION_UID, - "long", - "1L", - ObjectModelJavaModifier.PRIVATE - ); - return resultClassImpl; - } - - protected void createPropertyChangeSupport(ObjectModelClass output) { - - addAttribute(output, - "pcs", - PropertyChangeSupport.class, - "new PropertyChangeSupport(this)", - ObjectModelJavaModifier.PROTECTED, - ObjectModelJavaModifier.FINAL - ); - - // Add PropertyListener - - ObjectModelOperation operation; - - operation = addOperation(output, - "addPropertyChangeListener", - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, PropertyChangeListener.class, "listener"); - setOperationBody(operation, "" - /*{ - pcs.addPropertyChangeListener(listener); - }*/ - ); - - operation = addOperation(output, - "addPropertyChangeListener", - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, String.class, "propertyName"); - addParameter(operation, PropertyChangeListener.class, "listener"); - setOperationBody(operation, "" - /*{ - pcs.addPropertyChangeListener(propertyName, listener); - }*/ - ); - - operation = addOperation(output, - "removePropertyChangeListener", - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, PropertyChangeListener.class, "listener"); - setOperationBody(operation, "" - /*{ - pcs.removePropertyChangeListener(listener); - }*/ - ); - - operation = addOperation(output, - "removePropertyChangeListener", - "void", - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, String.class, "propertyName"); - addParameter(operation, PropertyChangeListener.class, "listener"); - setOperationBody(operation, "" - /*{ - pcs.removePropertyChangeListener(propertyName, listener); - }*/ - ); - - operation = addOperation(output, - "firePropertyChange", - "void", - ObjectModelJavaModifier.PROTECTED - ); - addParameter(operation, String.class, "propertyName"); - addParameter(operation, Object.class, "oldValue"); - addParameter(operation, Object.class, "newValue"); - setOperationBody(operation, "" - /*{ - pcs.firePropertyChange(propertyName, oldValue, newValue); - }*/ - ); - - operation = addOperation(output, - "firePropertyChange", - "void", - ObjectModelJavaModifier.PROTECTED - ); - addParameter(operation, String.class, "propertyName"); - addParameter(operation, Object.class, "newValue"); - setOperationBody(operation, "" - /*{ - firePropertyChange(propertyName, null, newValue); - }*/ - ); - } - - protected void createGetChildMethod(ObjectModelClass output) { - ObjectModelOperation getChild = addOperation( - output, - "getChild", "<T> T", - ObjectModelJavaModifier.PROTECTED - ); - addImport(output, List.class); - - addParameter(getChild, "java.util.Collection<T>", "childs"); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" -/*{ - T result = null; - if (childs != null) { - if (childs instanceof List) { - if (index < childs.size()) { - result = ((List<T>) childs).get(index); - } - } else { - int i = 0; - for (T o : childs) { - if (index == i) { - result = o; - break; - } - i++; - } - } - } - return result; -}*/ - ); - } - } \ No newline at end of file Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2012-12-10 00:29:12 UTC (rev 1216) @@ -0,0 +1,214 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorException; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +/** + * SimpleJavaBeanTransformer generates simple bean with pcs support + * (and nothing else) according to the JavaBeans 1.1 norm with no Impl generation mecanism. + * <p/> + * So if there is so operation described on model, you should use the + * {@link JavaBeanTransformer} instead. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.SimpleJavaBeanTransformer" + * @since 2.6 + */ +public class SimpleJavaBeanTransformer extends AbstractJavaBeanTransformer { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(SimpleJavaBeanTransformer.class); + + @Override + public void transformFromClass(ObjectModelClass input) { + + if (!JavaTemplatesGeneratorUtil.hasBeanStereotype(input)) { + + // not a bean + return; + } + + + if (canGenerate(input)) { + + ObjectModelClass output = generateBean(input); + } + + } + + protected boolean canGenerate(ObjectModelClass input) { + boolean canGenerate = !isInClassPath(input); + + if (canGenerate) { + + // check there is no operation on input + if (!input.getOperations().isEmpty()) { + + throw new GeneratorException( + "Can't generate a simple bean as class " + + input.getQualifiedName() + + " contains so operations." + + "\nUse instead the JavaBeanTransformer."); + } + } + return canGenerate; + } + + protected ObjectModelClass generateBean(ObjectModelClass input) { + + // test if a super class has bean stereotype + boolean superClassIsBean = false; + Collection<ObjectModelClass> superclasses = input.getSuperclasses(); + if (CollectionUtils.isNotEmpty(superclasses)) { + for (ObjectModelClass superclass : superclasses) { + if (JavaTemplatesGeneratorUtil.hasBeanStereotype(superclass)) { + superClassIsBean = true; + break; + } + } + } + + String superClass = null; + + if (!superClassIsBean) { + + // try to find a super class by tag-value + superClass = + JavaTemplatesGeneratorUtil.getBeanSuperClassTagValue( + model, input); + if (superClass != null) { + + // will act as if super class is a bean + superClassIsBean = true; + } + } + + ObjectModelClass output = + createClass(input.getName(), input.getPackageName()); + + if (superClass != null) { + setSuperClass(output, superClass); + } + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); + } + + String i18nPrefix = JavaGeneratorUtil.getI18nPrefixTagValue(input, model); + if (!StringUtils.isEmpty(i18nPrefix)) { + generateI18nBlock(input, output, i18nPrefix); + } + + String noPCSTagValue = JavaTemplatesGeneratorUtil.getNoPCSTagValue(model, input); + boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || + !"true".equals(noPCSTagValue.trim()); + + String noGenerateBooleanGetMethods = + JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); + boolean generateBooleanGetMethods = + StringUtils.isEmpty(noGenerateBooleanGetMethods) || + !"true".equals(noGenerateBooleanGetMethods.trim()); + + String prefix = getConstantPrefix(input, DEFAULT_CONSTANT_PREFIX); + + setConstantPrefix(prefix); + + addSuperClass(input, output); + + boolean serializableFound = addInterfaces(input, output); + + if (superClassIsBean) { + serializableFound = true; + } + + addSerializable(input, output, serializableFound); + + Set<String> constantNames = addConstantsFromDependency(input, output); + + // Get available properties + List<ObjectModelAttribute> properties = getProperties(input); + + // Add properties constant + for (ObjectModelAttribute attr : properties) { + + createPropertyConstant(output, attr, prefix, constantNames); + } + + // Add properties field + javabean methods + for (ObjectModelAttribute attr : properties) { + + createProperty(output, attr, usePCS, generateBooleanGetMethods); + } + + if (!superClassIsBean) { + + if (usePCS) { + + // Add property change support + createPropertyChangeSupport(output); + } + } + + boolean hasAMultipleProperty = containsMutiple(properties); + + // Add helper operations + if (hasAMultipleProperty) { + + if (!superClassIsBean) { + + // add getChild methods + createGetChildMethod(output); + } + } + return output; + } + + protected void addSuperClass(ObjectModelClass input, + ObjectModelClass output) { + // Set superclass + Iterator<ObjectModelClass> j = input.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + String qualifiedName = p.getQualifiedName(); + setSuperClass(output, qualifiedName); + } + } +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0