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

r794 - in tags: . eugene-2.0.0-beta-3
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 19:35:54 +0100 (Sun, 17 Jan 2010) New Revision: 794 Added: tags/eugene-2.0.0-beta-3/ Log: [maven-scm] copy for tag eugene-2.0.0-beta-3 Property changes on: tags/eugene-2.0.0-beta-3 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r793 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 19:35:51 +0100 (Sun, 17 Jan 2010) New Revision: 793 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release eugene-2.0.0-beta-3 Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-01-17 18:34:00 UTC (rev 792) +++ trunk/ant-eugene-task/pom.xml 2010-01-17 18:35:51 UTC (rev 793) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3-SNAPSHOT</version> + <version>2.0.0-beta-3</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-01-17 18:34:00 UTC (rev 792) +++ trunk/eugene/pom.xml 2010-01-17 18:35:51 UTC (rev 793) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3-SNAPSHOT</version> + <version>2.0.0-beta-3</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-01-17 18:34:00 UTC (rev 792) +++ trunk/maven-eugene-plugin/pom.xml 2010-01-17 18:35:51 UTC (rev 793) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3-SNAPSHOT</version> + <version>2.0.0-beta-3</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 18:34:00 UTC (rev 792) +++ trunk/pom.xml 2010-01-17 18:35:51 UTC (rev 793) @@ -13,7 +13,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3-SNAPSHOT</version> + <version>2.0.0-beta-3</version> <modules> <module>eugene</module> @@ -291,9 +291,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.0-beta-3</url> </scm> </project>

1 0

r792 - trunk
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 19:34:00 +0100 (Sun, 17 Jan 2010) New Revision: 792 Modified: trunk/pom.xml Log: Evolution #224: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 15:03:30 UTC (rev 791) +++ trunk/pom.xml 2010-01-17 18:34:00 UTC (rev 792) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <artifactId>eugene</artifactId>

1 0

r791 - in trunk: ant-eugene-task/src/site eugene/src/site maven-eugene-plugin/src/site src/site
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 16:03:30 +0100 (Sun, 17 Jan 2010) New Revision: 791 Modified: trunk/ant-eugene-task/src/site/site_en.xml trunk/ant-eugene-task/src/site/site_fr.xml trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: fix links in french documentation Modified: trunk/ant-eugene-task/src/site/site_en.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_en.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/ant-eugene-task/src/site/site_en.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -12,7 +12,6 @@ </breadcrumbs> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="fr/index.html" /> <item name="en]" href="index.html" /> </links> Modified: trunk/ant-eugene-task/src/site/site_fr.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_fr.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/ant-eugene-task/src/site/site_fr.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -12,12 +12,15 @@ </breadcrumbs> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="index.html" /> <item name="en]" href="../index.html" /> </links> - <menu ref="parent"/> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/eugene/src/site/site_en.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -9,10 +9,10 @@ <breadcrumbs> <item name="${project.name}" href="index.html" /> +  </breadcrumbs> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="fr/index.html" /> <item name="en]" href="index.html" /> </links> Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/eugene/src/site/site_fr.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -8,17 +8,20 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html" /> + <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/eugene/index.html" /> </breadcrumbs> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="index.html" /> <item name="en]" href="../index.html" /> </links> - <menu ref="parent"/> - +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> + <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> <item href="DiscussionSurTypeDeGeneration.html" name="Génération"/> Modified: trunk/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -7,7 +7,6 @@ <body> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="fr/index.html" /> <item name="en]" href="index.html" /> </links> Modified: trunk/maven-eugene-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -7,7 +7,6 @@ <body> <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <item name="[fr" href="index.html"/> <item name="en]" href="../index.html"/> </links> @@ -16,7 +15,11 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> - <menu ref="parent"/> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/src/site/site_en.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -15,9 +15,13 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html" /> + <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> </breadcrumbs> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> + </links> + <menu name="User"> <item name="Home" href="index.html" /> <item name="French version" href="fr/index.html" /> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-17 14:10:21 UTC (rev 790) +++ trunk/src/site/site_fr.xml 2010-01-17 15:03:30 UTC (rev 791) @@ -15,16 +15,26 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html" /> + <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> </breadcrumbs> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + <menu name="Utilisateur"> <item name="Accueil" href="index.html" /> <item name="English version" href="../index.html" /> </menu> - - <menu ref="modules"/> +  +  + <menu name="Modules"> + <item name="Eugene :: Eugene" href="../eugene/fr/index.html"/> + <item name="Eugene :: Ant eugene task" href="../ant-eugene-task/fr/index.html"/> + <item name="Eugene :: Maven Eugene Plugin" href="../maven-eugene-plugin/fr/index.html"/> + </menu> + <menu ref="reports"/> </body> </project>

1 0

r790 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 15:10:21 +0100 (Sun, 17 Jan 2010) New Revision: 790 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: use mavenpom4redmine 2.0.1 and clean pluginManagments Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-01-15 14:44:19 UTC (rev 789) +++ trunk/ant-eugene-task/pom.xml 2010-01-17 14:10:21 UTC (rev 790) @@ -56,24 +56,5 @@  <packaging>jar</packaging> - <build> - - <defaultGoal>install</defaultGoal> - - <plugins> - - </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> - - </build> - </project> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-01-15 14:44:19 UTC (rev 789) +++ trunk/eugene/pom.xml 2010-01-17 14:10:21 UTC (rev 790) @@ -199,8 +199,6 @@ <build> - <defaultGoal>install</defaultGoal> - <resources> <resource> <directory>${basedir}/src/main/xsl</directory> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-01-15 14:44:19 UTC (rev 789) +++ trunk/maven-eugene-plugin/pom.xml 2010-01-17 14:10:21 UTC (rev 790) @@ -61,8 +61,6 @@ <build> - <defaultGoal>install</defaultGoal> - <plugins>  @@ -92,15 +90,6 @@ </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> - </build>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 14:44:19 UTC (rev 789) +++ trunk/pom.xml 2010-01-17 14:10:21 UTC (rev 790) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> @@ -251,7 +251,6 @@ <ant.version>1.7.1</ant.version> <processor.version>1.0.2</processor.version> -  <nuiton-utils.version>1.1.1</nuiton-utils.version>  @@ -260,8 +259,6 @@ <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> <plugins> @@ -282,35 +279,11 @@ <version>${processor.version}</version> </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <version>1.4.0</version> - </plugin> - </plugins> </pluginManagement> </build> - <reporting> - <plugins> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> -

1 0

r789 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 15:44:19 +0100 (Fri, 15 Jan 2010) New Revision: 789 Modified: trunk/ant-eugene-task/changelog.txt trunk/changelog.txt trunk/eugene/changelog.txt trunk/maven-eugene-plugin/changelog.txt Log: add message to changelog Modified: trunk/ant-eugene-task/changelog.txt =================================================================== --- trunk/ant-eugene-task/changelog.txt 2010-01-14 19:47:26 UTC (rev 788) +++ trunk/ant-eugene-task/changelog.txt 2010-01-15 14:44:19 UTC (rev 789) @@ -1,3 +1,7 @@ +2.0.0 + * Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/eugene/changes-report.html + 1.0.1 xxx xxx * #91 : Don't call digester pop() on an empty stack Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-01-14 19:47:26 UTC (rev 788) +++ trunk/changelog.txt 2010-01-15 14:44:19 UTC (rev 789) @@ -1,3 +1,7 @@ +2.0.0 + * Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/eugene/changes-report.html + 1.0.1 xxx xxx * #91 : Don't call digester pop() on an empty stack Modified: trunk/eugene/changelog.txt =================================================================== --- trunk/eugene/changelog.txt 2010-01-14 19:47:26 UTC (rev 788) +++ trunk/eugene/changelog.txt 2010-01-15 14:44:19 UTC (rev 789) @@ -1,3 +1,7 @@ +2.0.0 + * Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/eugene/changes-report.html + 1.0.1 * 20091016 [chatellier] Regression on ant task, was generating model file one by one * 20090921 [desbois] [Evol #59] support innerClasses Modified: trunk/maven-eugene-plugin/changelog.txt =================================================================== --- trunk/maven-eugene-plugin/changelog.txt 2010-01-14 19:47:26 UTC (rev 788) +++ trunk/maven-eugene-plugin/changelog.txt 2010-01-15 14:44:19 UTC (rev 789) @@ -1,3 +1,7 @@ +2.0.0 + * Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/eugene/changes-report.html + 1.0.0 xxx xxx * Add multiple models loading and restricted package generation * Recode EugenePlugin without ant @@ -50,4 +54,4 @@ 0.50 ??? ??? * 20070420 [chatellier] add goal to copy a set of generated files - * 20070420 [chatellier] update lutingenerator depencency to 0.50 \ No newline at end of file + * 20070420 [chatellier] update lutingenerator depencency to 0.50

1 0

r788 - in trunk/maven-eugene-plugin/src: main/java/org/nuiton/eugene/plugin site site/fr/rst site/rst
by tchemit＠users.nuiton.org 14 Jan '10

14 Jan '10

Author: tchemit Date: 2010-01-14 20:47:26 +0100 (Thu, 14 Jan 2010) New Revision: 788 Added: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst trunk/maven-eugene-plugin/src/site/rst/usage.rst Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java trunk/maven-eugene-plugin/src/site/fr/rst/index.rst trunk/maven-eugene-plugin/src/site/rst/index.rst trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml Log: - add maven-eugene-plugin usage documentation - fix imports - improve availabe-data ouput Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2010-01-14 10:02:37 UTC (rev 787) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2010-01-14 19:47:26 UTC (rev 788) @@ -131,6 +131,7 @@ } for (AvailableData data : safeDataTypes) { + buffer.append("\n"); appendData(data, buffer); } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java 2010-01-14 10:02:37 UTC (rev 787) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java 2010-01-14 19:47:26 UTC (rev 788) @@ -22,9 +22,6 @@ import java.io.File; import java.io.FileFilter; -import java.io.IOException; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.dom4j.DocumentException; import org.dom4j.Node; import org.dom4j.io.SAXReader; Modified: trunk/maven-eugene-plugin/src/site/fr/rst/index.rst =================================================================== (Binary files differ) Added: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst (rev 0) +++ trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst 2010-01-14 19:47:26 UTC (rev 788) @@ -0,0 +1,17 @@ +Usage +===== + + +:Authors: Tony Chemit +:Contact: chemit(a)codelutin.com +:Revision: $Revision: 649 $ +:Date: $Date: 2009-10-21 14:21:03 +0200 (Wed, 21 Oct 2009) $ + + +.. contents:: + + +smart-generate +-------------- + +*TODO translate me in french from the english version* Modified: trunk/maven-eugene-plugin/src/site/rst/index.rst =================================================================== (Binary files differ) Added: trunk/maven-eugene-plugin/src/site/rst/usage.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/rst/usage.rst (rev 0) +++ trunk/maven-eugene-plugin/src/site/rst/usage.rst 2010-01-14 19:47:26 UTC (rev 788) @@ -0,0 +1,318 @@ +Usage +===== + + +:Authors: Tony Chemit +:Contact: chemit(a)codelutin.com +:Revision: $Revision: 649 $ +:Date: $Date: 2009-10-21 14:21:03 +0200 (Wed, 21 Oct 2009) $ + + +.. contents:: + +This page describes the usage of the goals of the eugene plugin. + +smart-generate +-------------- + +This goal permits to launch a smart (understood as intelligent) generation, chaining different generation phases. + +Following the maven spirit of using convention (and then default configuration) you should always try to respect the +plugin convention to avoid big headaches... + +modelType +********* + +An invariant of the goal is the type of model to treate given by the configuration property *modelType*. + +actually there is two types of model : + +- objectmodel +- statemodel + +inputs +****** + +To define what to generate, you must fill the *inputs* configuration. + +Each inputs entry is bind to a phase of generation (see next section to learn more about phases). + +an input entry is defined by : + +- a phase (zargo, xmi or model) +- a input directory +- an include pattern + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +If you wants to use more than one entry, you can also write : + + +:: + + <execution> + <configuration> + <inputs> + <input>zargo</input> + <input>xmi</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +An input can have three forms : + +- <input>XXX</input> : use the XXX phase with his default configuration +- <input>dir:includes</input> : use the given directory with the given phase and detects from the includes pattern the phase to use +- <input>XXX:dir:includes</input> : use the XXX phase with the given directory and includes pattern + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <inputs>src/main/myzargo:**/*.zargo</inputs> + <inputs>zargo:src/main/myzargo2:**/*.zargo2</inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + +phases +****** + +A phase (also called a writer) aims to generate something with possibility to fire a *next* chained phase. + +At the moment we have defined several phases of generation : + +- zargo +- xmi +- model + +Each phase has an input protocol and an output protocol, says : + +:: + + zargo --> xmi + xmi --> model + model --> no output protocol (at the moment) + +So if you gives and zargo phase, the plugin will try to chain zargo --> xmi --> model. + +It is possible to skip some phase using the *skipInputs* configuration property. + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +will launch phases zargo then xmi but not the model phase. + +Finally, there is some specific properties that can be filled for each phase. + +zargo phase +~~~~~~~~~~~ + +This phase permits to take some zargo files to extract form them the xmi files. + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <skipInputs>xmi,model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +will detects all zargo files (using the default configuration for zargo phase) and extract xmi files. + +The default configuration for the zargo phase is : + +- input directory : src/main/xmi +- include files : **/*.zargo +- output directory : target/generated-sources/xmi + +This phase has no specific configuration properties. + +xmi phase +~~~~~~~~~ + +This phase permits to take some xmi files to build some objectmoldel (or staemodel) files. + +Example: + +:: + + <execution> + <configuration> + <inputs>xmi</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +will detects all xmi files (using the default configuration for xmi phase) and create model files. + +The default configuration for the xmi phase is : + +- input directory : src/main/xmi +- include files : **/*.xmi +- output directory : target/generated-sources/modles + +This phase defines some specific configuration properties : + +- *fullPackagePath* +- *resolver* + +model phase +~~~~~~~~~~~ + +This phase permits to take some model files to generate some files (java and others) using the given templates + +Example: + +:: + + <execution> + <configuration> + <inputs>model:target/generated-sources/models:observe.objectmodel</inputs> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +The default configuration for the model phase is : + +- input directory : src/main/models +- include files : **/*.objectmodel +- output directory : target/generated-sources/java + + +This phase defines some specific configuration properties : + +- *defaultPackage* +- *templates* +- *excludeTemplates* +- *generatedPackages* + +available-data +-------------- + +This goals help users to determine all type of data that can be used with your current configuration of plugin. + +The goal can only be used by direct invocation in console and not in your pom as his purpose is only to display some +stuff in your console. + +Just type + +:: + + mvn eugene:available-data + +to obtain all datas available. + +Example: + +:: + + [INFO] [eugene:available-data {execution: default-cli}] + [INFO] Get datas for data types : [modeltype, writer, modelreader, modeltemplate] + Found 2 modeltypes : + [statemodel] with implementation 'org.nuiton.eugene.models.state.xml.StateModelImpl' + [objectmodel] with implementation 'org.nuiton.eugene.models.object.xml.ObjectModelImpl' + 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 : + [statemodel] with implementation 'org.nuiton.eugene.models.state.StateModelReader' + [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' + Found one modeltemplate : + [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' + +copyVersionFiles +---------------- + +This goals permits to keep hibernate mappings for each version of model version. + +zargo2xmi +--------- + +'Stupid' generation from zargo to xmi files with no chained stuff. + +Prefer use now the *smart-generate* goal. + +xmi2objectmodel +--------------- + +'Stupid' generation from xmi files to object model files with no chained stuff. + +Prefer use now the *smart-generate* goal. + +xmi2statemodel +-------------- + +'Stupid' generation from xmi files to state model files with no chained stuff. + +Prefer use now the *smart-generate* goal. + +generate +-------- + +'Stupid' generation from model files to java and other files with no chained stuff. + +Prefer use now the *smart-generate* goal. Modified: trunk/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-14 10:02:37 UTC (rev 787) +++ trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-14 19:47:26 UTC (rev 788) @@ -20,6 +20,7 @@ <menu name="User"> <item href="index.html" name="Index"/> + <item href="usage.html" name="Usage"/> <item name="Goals" href="plugin-info.html"> <item name="smart-generate" href="smart-generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/> Modified: trunk/maven-eugene-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-14 10:02:37 UTC (rev 787) +++ trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-14 19:47:26 UTC (rev 788) @@ -20,6 +20,7 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> + <item href="usage.html" name="Utilisation"/> <item name="Goals" href="plugin-info.html"> <item name="smart-generate" href="smart-generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/>

1 0

r787 - in trunk/eugene/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by echatellier＠users.nuiton.org 14 Jan '10

14 Jan '10

Author: echatellier Date: 2010-01-14 11:02:37 +0100 (Thu, 14 Jan 2010) New Revision: 787 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Log: Use a simplier code to parse import. Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-10 23:05:10 UTC (rev 786) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-14 10:02:37 UTC (rev 787) @@ -611,21 +611,20 @@ */ public static Set<String> getTypesList(String str) { - Pattern p = Pattern.compile("^(([\\w\\s\\?]*\\s))?([\\w\\.]+)((<)(.*)(>))?(\$\$)?$"); - Matcher m = p.matcher(str); - Set<String> results = new HashSet<String>(); - if (m.find()) { - results.add(m.group(3)); - if (m.group(6) != null) { // cas du type generic - // FIXME can not work in some case - if (m.group(6).matches("[^,]+<.*>")) { - results.addAll(getTypesList(m.group(6))); - } - else for (String onepart : m.group(6).split("(\\s*,\\s*)")) { - results.addAll(getTypesList(onepart)); - } + // remove extends, super + String localStr = str.replaceAll("([\\w\\?]+ extends|[\\w\\?]+ super|new)", ""); + + // replace non java enabled characters + localStr = localStr.replaceAll("[^\\w\\.]", " "); + + // each space separated part is an import + String[] strArray = localStr.split("\\s+"); + for (String strImport : strArray) { + String localStrImport = strImport.trim(); + if (!localStrImport.isEmpty()) { + results.add(localStrImport); } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-01-10 23:05:10 UTC (rev 786) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-01-14 10:02:37 UTC (rev 787) @@ -205,10 +205,10 @@ log.info(str + " -> " + results); assertEquals(4, results.size()); - //str = "java.util.TreeMap<java.util.ArrayList<java.util.Date>, java.util.SortedSet<java.lang.Number, java.lang.Double>>"; - //results = GeneratorUtil.getTypesList(str); - //log.info(str + " -> " + results); - //assertEquals(4, results.size()); + str = "java.util.TreeMap<java.util.ArrayList<java.util.Date>, java.util.SortedSet<java.lang.Number, java.lang.Double>>"; + results = GeneratorUtil.getTypesList(str); + log.info(str + " -> " + results); + assertEquals(6, results.size()); // str = "<T extends org.nuiton.topia.TopiaEntity> T"; // results = GeneratorUtil.getTypesList(str);

1 0

r786 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-11 00:05:10 +0100 (Mon, 11 Jan 2010) New Revision: 786 Modified: trunk/pom.xml Log: use mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 15:48:04 UTC (rev 785) +++ trunk/pom.xml 2010-01-10 23:05:10 UTC (rev 786) @@ -8,8 +8,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId>

1 0

r785 - in trunk/eugene/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by echatellier＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: echatellier Date: 2010-01-07 16:48:04 +0100 (Thu, 07 Jan 2010) New Revision: 785 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Log: Add a quick hack for test to pass Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-07 14:40:34 UTC (rev 784) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-07 15:48:04 UTC (rev 785) @@ -602,10 +602,16 @@ return result; } + /** + * Parse a fully qualified generic java type, and extract each + * imbricated types. + * + * @param str string to parse + * @return set of found types + */ public static Set<String> getTypesList(String str) { - String regex = "^(([\\w\\s\\?]*\\s))?([\\w\\.]+)((<)(.*)(>))?(\$\$)?$"; - Pattern p = Pattern.compile(regex); + Pattern p = Pattern.compile("^(([\\w\\s\\?]*\\s))?([\\w\\.]+)((<)(.*)(>))?(\$\$)?$"); Matcher m = p.matcher(str); Set<String> results = new HashSet<String>(); @@ -613,26 +619,14 @@ if (m.find()) { results.add(m.group(3)); if (m.group(6) != null) { // cas du type generic - for (String onepart : m.group(6).split("(\\s*,\\s*)")) { + // FIXME can not work in some case + if (m.group(6).matches("[^,]+<.*>")) { + results.addAll(getTypesList(m.group(6))); + } + else for (String onepart : m.group(6).split("(\\s*,\\s*)")) { results.addAll(getTypesList(onepart)); } } - /*if (m.group(2) != null) { // cas du extend ou du new - result += m.group(2); - } - result += m.group(4); - if (m.group(7) != null) { // cas du type generic - result += m.group(6); // < - String sep = ""; - for (String onepart : m.group(7).split("(\\s*,\\s*)")) { - result += sep + getSimpleName(onepart); - sep = ", "; - } - result += m.group(8); // > - } - if (m.group(9) != null) { // cas des () pour un new - result += m.group(9); - }*/ } return results; Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-01-07 14:40:34 UTC (rev 784) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-01-07 15:48:04 UTC (rev 785) @@ -195,10 +195,20 @@ log.info(str + " -> " + results); assertEquals(4, results.size()); -// str = "java.util.List<java.util.Map<java.util.Date, java.lang.Integer>>"; -// results = GeneratorUtil.getTypesList(str); -// log.info(str + " -> " + results); -// assertEquals(4, results.size()); + str = "java.util.List<java.util.Map<java.util.Date, java.lang.Integer>>"; + results = GeneratorUtil.getTypesList(str); + log.info(str + " -> " + results); + assertEquals(4, results.size()); + + str = "java.util.List<java.util.Map<java.util.Date, java.lang.Integer>>"; + results = GeneratorUtil.getTypesList(str); + log.info(str + " -> " + results); + assertEquals(4, results.size()); + + //str = "java.util.TreeMap<java.util.ArrayList<java.util.Date>, java.util.SortedSet<java.lang.Number, java.lang.Double>>"; + //results = GeneratorUtil.getTypesList(str); + //log.info(str + " -> " + results); + //assertEquals(4, results.size()); // str = "<T extends org.nuiton.topia.TopiaEntity> T"; // results = GeneratorUtil.getTypesList(str);

1 0