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

14 Aug '12

Author: tchemit Date: 2012-08-14 17:03:58 +0200 (Tue, 14 Aug 2012) New Revision: 1158 Url: http://nuiton.org/repositories/revision/eugene/1158 Log: fixes #2251: Reintroduces generate goal (and deprecates the smart-generate one) fixes #929: Use maven 3 api fixes #2109: Updates to mavenpom 3.3.6 fixes #2253: Make all its works again fixes #2110: Migrate site to fluido Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java Removed: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/invoker.properties branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/ Modified: branches/eugene-2.4.3/ant-eugene-task/pom.xml branches/eugene-2.4.3/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java branches/eugene-2.4.3/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java branches/eugene-2.4.3/eugene-maven-plugin/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/README.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/README.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/README.txt branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/example.rst.vm branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/usage.rst branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/example.rst.vm branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/usage.rst branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_en.xml branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_fr.xml branches/eugene-2.4.3/eugene/pom.xml branches/eugene-2.4.3/eugene/src/site/site_en.xml branches/eugene-2.4.3/eugene/src/site/site_fr.xml branches/eugene-2.4.3/pom.xml branches/eugene-2.4.3/src/site/site_en.xml branches/eugene-2.4.3/src/site/site_fr.xml Modified: branches/eugene-2.4.3/ant-eugene-task/pom.xml =================================================================== --- branches/eugene-2.4.3/ant-eugene-task/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/ant-eugene-task/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- branches/eugene-2.4.3/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -48,6 +48,7 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.apache.commons.io.FileUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -444,7 +445,7 @@ File propertyOutputFile = new File(outputDirectory, propertyFile.getName()); try { - FileUtil.copy(propertyFile, propertyOutputFile); + FileUtils.copyFile(propertyFile, propertyOutputFile); } catch (IOException ioe) { log("Cannot copy .properties file", ioe, Project.MSG_ERR); Modified: branches/eugene-2.4.3/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java =================================================================== --- branches/eugene-2.4.3/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; +import org.apache.commons.io.FileUtils; import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; @@ -112,7 +113,7 @@ ).exists()); // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -148,7 +149,7 @@ // TODO Check result // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -183,7 +184,7 @@ // TODO Check result // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -230,6 +231,6 @@ } // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } } Modified: branches/eugene-2.4.3/eugene/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/eugene/src/site/site_en.xml =================================================================== --- branches/eugene-2.4.3/eugene/src/site/site_en.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene/src/site/site_en.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,69 +26,75 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> -  - </breadcrumbs> + <body> - <links> - <item name="[fr" href="fr/index.html" /> - <item name="en]" href="index.html" /> - </links> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu ref="parent"/> - - <menu name="User"> - <item href="index.html" name="Home"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> +  + </breadcrumbs> - <menu name="Downloads"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="http://${platform}/projects/eugene/files" name="Archives" /> - </menu> + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> - <menu name="Trackers"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> - <item name="Evolutions" href="${project.issueManagement.url}?query_id=1"/> - <item name="Help" href="${project.issueManagement.url}?query_id=3"/> - </menu> + <menu ref="parent"/> - <menu name="Links"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - </menu> + <menu name="User"> + <item href="index.html" name="Home"/> + </menu> - <menu ref="reports"/> + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="http://${platform}/projects/eugene/files" name="Archives"/> + </menu> - <footer> + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> + <item name="Evolutions" href="${project.issueManagement.url}?query_id=1"/> + <item name="Help" href="${project.issueManagement.url}?query_id=3"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="Links"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu ref="reports"/> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/eugene-2.4.3/eugene/src/site/site_fr.xml =================================================================== --- branches/eugene-2.4.3/eugene/src/site/site_fr.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene/src/site/site_fr.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,81 +26,89 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="../index.html" /> - </links> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> -  -  - <menu name="Parent Projet"> - <item name="Eugene" href="../../fr/index.html"/> - </menu> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/eugene/index.html"/> + </breadcrumbs> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="DiscussionSurTypeDeGeneration.html" name="Génération"/> - <item href="FAQ.html" name="FAQ"/> - </menu> - - <menu name="Developpeur"> - <item name="ObjectModel" href="ObjectModel.html"/> - <item name="UIModel" href="DevUIDoc.html"/> - <item name="Plugin Eclipse" href="plugineclipse.html"/> - <item name="Todo" href="Todo.html"/> - </menu> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="http://${platform}/projects/eugene/files" name="Archives" /> - </menu> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> - <menu name="Trackers"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> - <item name="Améliorations" href="${project.issueManagement.url}?query_id=1"/> - <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> - </menu> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item href="DiscussionSurTypeDeGeneration.html" name="Génération"/> + <item href="FAQ.html" name="FAQ"/> + </menu> - <menu name="Liens"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - </menu> + <menu name="Developpeur"> + <item name="ObjectModel" href="ObjectModel.html"/> + <item name="UIModel" href="DevUIDoc.html"/> + <item name="Plugin Eclipse" href="plugineclipse.html"/> + <item name="Todo" href="Todo.html"/> + </menu> - <menu ref="reports"/> + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="http://${platform}/projects/eugene/files" name="Archives"/> + </menu> - <footer> + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> + <item name="Améliorations" + href="${project.issueManagement.url}?query_id=1"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="Liens"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu ref="reports"/> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/eugene-2.4.3/eugene-maven-plugin/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> @@ -96,6 +96,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> @@ -118,7 +123,7 @@  <name>EUGene :: Maven plugin</name> <inceptionYear>2006</inceptionYear> - <description>maven plugin to use the eugene library</description> + <description>Maven plugin to use the eugene library</description>   @@ -127,6 +132,27 @@ <build> + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </pluginManagement> + <plugins>  @@ -150,35 +176,6 @@  <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - - <plugins> - -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - -  - <profile> <id>reporting</id> <activation> <property> @@ -226,15 +223,15 @@ <configuration> <pomIncludes> <pomInclude>evol-308/pom.xml</pomInclude> -  -  -  -  -  -  -  -  -  + <pomInclude>evol-879/zargo/pom.xml</pomInclude> + <pomInclude>evol-879/xmi/pom.xml</pomInclude> + <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> + <pomInclude>generate/only-zargo/pom.xml</pomInclude> + <pomInclude>generate/only-zargo-xmi/pom.xml</pomInclude> + <pomInclude>generate/all/pom.xml</pomInclude> + <pomInclude>generate/generators/pom.xml</pomInclude> +  + <pomInclude>evol-879/model/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean test \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2011 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% -### -invoker.goals=clean test \ No newline at end of file Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -79,7 +79,7 @@ <execution> <phase>generate-sources</phase> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/README.txt 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/README.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier model dans le class-path : +On teste ici le goal generate avec un fichier model dans le class-path : Le résultat désiré est : Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean install \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -46,12 +46,12 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.4.1</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.4.3</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -68,6 +68,9 @@ <name>EUGene Test :: testEvol879-model-impl</name> + <properties> + <topiaVersion>2.6.11</topiaVersion> + </properties> <build> <plugins> @@ -97,7 +100,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -111,7 +114,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -124,7 +127,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -137,7 +140,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -155,7 +158,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.4.3</version> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/README.txt 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/README.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier xmi dans le class-path : +On teste ici le goal generate avec un fichier xmi dans le class-path : Le result désiré est : Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean install \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -75,7 +75,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -88,7 +88,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -100,7 +100,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -114,7 +114,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -126,7 +126,7 @@ <extractDirectory>target/extracted-sources5</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -139,7 +139,7 @@ <extractDirectory>target/extracted-sources6</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -151,7 +151,7 @@ <extractDirectory>target/extracted-sources7</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -163,7 +163,7 @@ <extractDirectory>target/extracted-sources8</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -175,7 +175,7 @@ <extractDirectory>target/extracted-sources9</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/README.txt 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/README.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier zargo dans le class-path : +On teste ici le goal generate avec un fichier zargo dans le class-path : Le result doit être Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean install \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -75,7 +75,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -88,7 +88,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -100,7 +100,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -114,7 +114,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -126,7 +126,7 @@ <extractDirectory>target/extracted-sources5</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -139,7 +139,7 @@ <extractDirectory>target/extracted-sources6</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -151,7 +151,7 @@ <extractDirectory>target/extracted-sources7</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -163,7 +163,7 @@ <extractDirectory>target/extracted-sources8</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -175,7 +175,7 @@ <extractDirectory>target/extracted-sources9</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean generate-test-sources \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/all/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-test-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/all/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -40,7 +40,7 @@ </parent> <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-smart-generate-all</artifactId> + <artifactId>eugene-test-generate-all</artifactId> <dependencies> <dependency> @@ -96,7 +96,7 @@ <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -107,7 +107,7 @@ <outputDirectory>target/generated-sources-xmi2Java</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -118,7 +118,7 @@ <outputDirectory>target/generated-sources-objectModel2Java</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean test \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/generators/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean test - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/generators/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -126,7 +126,7 @@ <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -137,7 +137,7 @@ <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution>  </executions> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -22,24 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% - * EUGene Test - * Copyright (C) 2007 - 2009 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>. - * ##%*/ /* * * BeanGenerator.java @@ -201,7 +183,7 @@ imports.addImport(List.class); } if (generateToString) { - imports.addImport(org.apache.commons.lang.builder.ToStringBuilder.class); + imports.addImport(org.apache.commons.lang3.builder.ToStringBuilder.class); } boolean sortAttribute = true; Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean install \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/only-zargo/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/only-zargo/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -97,7 +97,7 @@ <outputDirectory>target/generated-sources-xmi</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -108,7 +108,7 @@ <outputDirectory>target/generated-sources-xmi2</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -98,7 +98,7 @@ <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -110,7 +110,7 @@ <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -121,7 +121,7 @@ <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -133,7 +133,7 @@ <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -24,139 +24,144 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> - <version>2.0.0</version> +  +  +  - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${eugeneVersion}</version> - <scope>compile</scope> - </dependency> + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>testIncludeWithOnlyProtocol</artifactId> + <version>2.0.0</version> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>compile</scope> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> +  +  +  -  -  -  + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - <packaging>jar</packaging> +  +  +  - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> + <packaging>jar</packaging> -  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> + <properties> - <build> + <eugeneVersion>@pom.version@</eugeneVersion> - <plugins> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <executions> - <execution> - <id>Zargo to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>src/main/zargo:**/*.zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>src/main/zargo:**/*.zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>src/main/xmi:**/*.xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>src/main/xmi:**/*.xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <executions> + <execution> + <id>Zargo to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </project> Added: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1 @@ +clean generate-test-sources \ No newline at end of file Property changes on: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2012-08-14 15:03:58 UTC (rev 1158) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 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% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-test-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -24,203 +24,212 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> - <version>2.0.0</version> +  +  +  - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${eugeneVersion}</version> - <scope>compile</scope> - </dependency> + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>testIncludeWithOnlyProtocol</artifactId> + <version>2.0.0</version> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>compile</scope> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> +  +  +  -  -  -  + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - <packaging>jar</packaging> +  +  +  - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> + <packaging>jar</packaging> -  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> + <properties> - <build> + <eugeneVersion>@pom.version@</eugeneVersion> - <plugins> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <executions> - <execution> - <id>Zargo to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to object model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> -  - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> -  - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <executions> + <execution> + <id>Zargo to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to object model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> +  + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to state model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to object model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> +  + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to state model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </project> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -29,6 +29,10 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.Template; @@ -50,12 +54,12 @@ * <p/> * * @author tchemit <chemit(a)codelutin.com> - * @goal available-data - * @requiresProject true - * @requiresDirectInvocation true - * @requiresDependencyResolution test * @since 2.0.0 */ +@Mojo(name = "available-data", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.TEST) public class AvailableDataMojo extends AbstractMojo { /** @@ -74,46 +78,35 @@ * <p/> * <b>Note:</b> Let empty to display all data types. * - * @parameter expression="${dataTypes}" default-value="" * @since 2.0.0 */ + @Parameter(property = "dataTypes", defaultValue = "") protected String dataTypes; /** * All available models (obtain by plexus, keys are plexus roles, values * are a instance of corresponding model). - * - * @component role="org.nuiton.eugene.models.Model" */ + @Component(role = Model.class) protected Map<String, Model> modelTypes; - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelReader" - */ + /** All available writers introspects via plexus. */ protected Map<String, ModelReader<?>> modelReaders; - /** - * All available templates introspects via plexus - * - * @component role="org.nuiton.eugene.Template" - */ + /** All available templates introspects via plexus. */ + @Component(role = Template.class) protected Map<String, Template<?>> modelTemplates; - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.writer.ChainedFileWriter" - */ + /** All available writers introspects via plexus. */ + @Component(role = ChainedFileWriter.class) protected Map<String, ChainedFileWriter> writers; /** - * All available model properties providers introspects via plexus + * All available model properties providers introspects via plexus. * - * @component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" * @since 2.3.1 */ + @Component(role = ModelPropertiesUtil.ModelPropertiesProvider.class) protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> loadedProviders; Copied: branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java (from rev 1157, branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java) =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java (rev 0) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -0,0 +1,862 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 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% + */ + +package org.nuiton.eugene.plugin; + +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.MavenProject; +import org.apache.maven.settings.Settings; +import org.nuiton.eugene.DefaultTemplateConfiguration; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.models.Model; +import org.nuiton.eugene.plugin.writer.BaseChainedFileWriter; +import org.nuiton.eugene.plugin.writer.ModelChainedFileWriter; +import org.nuiton.eugene.plugin.writer.XmiChainedFileWriter; +import org.nuiton.eugene.writer.ChainedFileWriter; +import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; +import org.nuiton.eugene.writer.ChainedFileWriterData; +import org.nuiton.eugene.writer.ChainedFileWriterEntry; +import org.nuiton.eugene.writer.ChainedWriterEngine; +import org.nuiton.eugene.writer.WriterReport; +import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginWithEncoding; +import org.nuiton.util.StringUtil; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Eugene generator plugin (a.k.a generate mojo) + * <p/> + * Fill inputs and mojo will chained needed writer. + * <p/> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +@Mojo(name = "generate", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { + + /** + * Inputs files to used to generate the required model files. + * </p> + * An include has the following pattern : + * <pre> + * writer: + * </pre> + * when you want to use a specific writer with his default io values. + * <p/> + * Can also write : + * <pre> + * [writer:]directory:includes + * </pre> + * where {@code includes} is the pattern to find files from the directory + * given and must be terminated by the extension of files. + * <p/> + * Specifying the {@code writer} can be usefull when you want to use a + * writer for an unknown extension by any writer. + * <p/> + * Example : + * <pre> + * <inputs> + * <input>zargo:</input> + * <input>src/main/xmi2:**\/*.zargo</input> + * <input>zargo:src/main/xmi:**\/*.zargo2</input> + * </inputs> + * </pre> + * <p/> + * <b>Note:</b> If your using a single input, you can just write : + * <pre> + * <inputs>zargo</inputs> + * </pre> + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.inputs", required = true) + protected String[] inputs; + + /** + * List of input (protocol) not to treate separated by comma. + * <p/> + * Example : + * <pre> + * <skipInputs>xmi</skipInputs> + * <skipInputs>xmi,model</skipInputs> + * </pre> + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.skipInputs") + protected String skipInputs; + + /** + * Where to generate files. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.outputDirectory", defaultValue = "target/generated-sources", required = true) + protected File outputDirectory; + + /** + * Where to copy extracted files (when using class-path data). + * + * @since 2.1.3 + */ + @Parameter(property = "eugene.extractDirectory", defaultValue = "target/extracted-sources", required = true) + protected File extractDirectory; + + /** + * Ecrase les fichiers générés. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.overwrite", defaultValue = "false") + protected boolean overwrite; + + /** + * Pour activer le mode verbeux. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.verbose", defaultValue = "${maven.verbose}") + protected boolean verbose; + + /** + * Encoding to be used for generation of files. + * <p/> + * <b>Note:</b> If nothing is filled here, we will use the system + * property {@code file.encoding}. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.encoding", defaultValue = "${project.build.sourceEncoding}") + protected String encoding; + + /** + * A flag to mark the mojo to be used in a test phase. This will permits + * to add generated sources in test compile roots. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.testPhase", defaultValue = "false") + protected boolean testPhase; + + /** + * The type of model to be used. + * <p/> + * By default, use an {@code objectmodel}. + * + * @required + * @since 2.0.0 + */ + @Parameter(property = "eugene.modelType", defaultValue = "objectmodel", required = true) + protected String modelType; + + /** + * Properties to pass to writer. + * + * @parameter + * @since 2.0.0 + */ + @Parameter + protected Map<String, Object> properties; + + /** + * Ne génère rien, analyse juste la configuration. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.dryRun", defaultValue = "false") + protected boolean dryRun; + + /** + * Nom du paquetage pour les fichiers générés (xmi input sepcific). + * + * @since 2.0.0 + */ + @Parameter(property = "generator.fullPackagePath", defaultValue = "${project.groupId}.${project.artifactId}") + protected String fullPackagePath; + + /** + * Nom du resolver a utiliser pour les transformations xmi vers model + * (xmi input sepcific). + * + * @since 2.0.0 + */ + @Parameter(property = "generator.resolver", defaultValue = "org.nuiton.util.ResourceResolver") + protected String resolver; + + /** + * Templates à utiliser, séparés par des virgules pour les transformations + * depuis les models (model input sepcific). + * + * @since 0.50 + */ + @Parameter(property = "eugene.templates") + protected String templates; + + /** + * Templates à ne pas utiliser lors de la transformations des models + * (model input sepcific). + * + * @since 0.63 + */ + @Parameter(property = "eugene.excludeTemplates") + protected String[] excludeTemplates; + + /** + * Nom par défaut du paquetage généré (model input specific). + * + * @since 0.50 + */ + @Parameter(property = "eugene.defaultPackage", defaultValue = "${project.groupId}.${project.artifactId}") + protected String defaultPackage; + + /** + * List of packages to generate (comma separated). (model input specific). + * <p/> + * If the parameter is not filled, will generate all packages. + * + * @since 1.0.0-rc-8 + */ + @Parameter(property = "eugene.generatedPackages") + protected String generatedPackages; + + /** + * List of package to extract from xmi to models. (model input specific). + * <p/> + * If the parameter is not filled, will extract all packages. + * + * @since 1.0.0-rc-8 + */ + @Parameter(property = "eugene.extractedPackages", defaultValue = "${project.groupId}.${project.artifactId}") + protected String extractedPackages; + + /** + * Maven project. + * + * @since 2.0.0 + */ + @Component + protected MavenProject project; + + /** + * Le settings (pour obtenir le mode offline). + * + * @since 2.0.0 + */ + @Component + protected Settings settings; + + /** + * All available models (obtain by plexus, keys are plexus roles, + * values are a instance of corresponding model). + */ + @Component(role = Model.class) + protected Map<String, Model> _models; + + /** All available writers introspects via plexus. */ + @Component(role = ChainedFileWriter.class) + protected Map<String, ChainedFileWriter> writers; + + /** All available writers introspects via plexus. */ + @Component(role = ModelReader.class) + protected Map<String, ModelReader<?>> modelReaders; + + /** All available templates introspects via plexus. */ + @Component(role = Template.class) + protected Map<String, Template<?>> modelTemplates; + + /** + * All available model properties providers introspects via plexus. + * + * @since 2.3 + */ + @Component(role = ModelPropertiesUtil.ModelPropertiesProvider.class) + protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; + + /** The engine to compute {@link ChainedFileWriter} from inputs entries. */ + @Component(role = ChainedWriterEngine.class) + protected ChainedWriterEngine engine; + + /** fixed classloader */ + protected ClassLoader fixedClassLoader; + + @Override + protected void init() throws Exception { + + if (getLog().isDebugEnabled()) { + verbose = true; + } + + modelType = modelType.trim().toLowerCase(); + + // Check model type is accepted + // pouvoir associé un nom à un type de service). + Model model = _models.get(modelType); + if (model == null) { + throw new MojoExecutionException( + "No modelType named '" + modelType + "', use one of " + + _models.keySet()); + } + + if (inputs.length == 0) { + throw new MojoExecutionException( + "Must specify something to include using the includes " + + "property"); + } + //FIXME-TC20091217 use a configurator in plexus ? + // Actually we obtain a different instance of the mojo conflit with + // mojo and plexus :) + engine.setConfiguration(this); + + Set<ChainedFileWriter> availableWriters = engine.getAvailableWriters(); + + if (availableWriters.isEmpty()) { + throw new MojoExecutionException( + "Could not find any writer in class-path."); + } + + for (ChainedFileWriter writer : availableWriters) { + if (writer instanceof BaseChainedFileWriter) { + // add log support + ((BaseChainedFileWriter) writer).setLog(getLog()); + } + writer.setWriterReport(new WriterReport() { + @Override + public void addFile(String entry, File file, boolean b) { + super.addFile(entry, file, b); + if (b || isVerbose()) { + getLog().info("Will generate " + file); + } + if (getLog().isDebugEnabled()) { + getLog().debug(String.format("[%1$s] Will generate %2$s", entry, file)); + } + } + }); + } + + // detect top level writers + for (String include : inputs) { + + if (isVerbose()) { + getLog().info("Register include : " + include); + } + engine.registerInclude(include); + } + + if (engine.getSelectedWriters().isEmpty()) { + return; + } + + if (properties == null) { + properties = new LinkedHashMap<String, Object>(); + } + + if (engine.containsWriter("xmi")) { + + // add xmi writer support + + properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, + fullPackagePath); + properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); + properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); + } + + if (engine.containsWriter("model")) { + + // add model writer support + + properties.put(ModelChainedFileWriter.PROP_DEFAULT_PACKAGE, + defaultPackage); + properties.put(ModelChainedFileWriter.PROP_GENERATED_PACKAGES, + generatedPackages); + properties.put(ModelChainedFileWriter.PROP_TEMPLATES, templates); + properties.put(ModelChainedFileWriter.PROP_EXCLUDE_TEMPLATES, + getExcludeTemplatesAsString()); + properties.put(ModelChainedFileWriter.PROP_MODEL_PROPERTIES_PROVIDER, + getModelPropertiesProvider()); + + DefaultTemplateConfiguration configuration = + new DefaultTemplateConfiguration(); + configuration.setEncoding(getEncoding()); + configuration.setLoader(getClassLoader()); + configuration.setOverwrite(isOverwrite()); + configuration.setVerbose(isVerbose()); + properties.put(ModelChainedFileWriter.PROP_TEMPLATE_CONFIGURATION, + configuration); + } + } + + @Override + protected boolean checkSkip() { + if (engine.getSelectedWriters().isEmpty()) { + getLog().warn("No phase was detected, skip the goal."); + return false; + } + return true; + } + + @Override + protected void doAction() throws Exception { + if (dryRun) { + getLog().warn("dryRun property is set, no file will be generated."); + } + if (isVerbose()) { + if (isTestPhase()) { + getLog().info(" using testPhase"); + } + } + try { + + List<String> skipInputList = new ArrayList<String>(); + + if (!StringUtils.isEmpty(skipInputs)) { + + for (String s : skipInputs.split(",")) { + skipInputList.add(s.trim()); + } + } + + // launch writers in incoming order of dicovering of them + + for (ChainedFileWriter writer : engine.getSelectedWriters()) { + if (skipInputList.contains(writer.getInputProtocol())) { + getLog().info("Skip phase [" + writer.getInputProtocol() + + "] as required in skipInputs configuration."); + continue; + } + long t0 = System.nanoTime(); + int size = writer.getEntries().size(); + if (size == 1) { + getLog().info( + "Process phase [" + writer.getInputProtocol() + + "] for one entry."); + } else { + getLog().info( + "Process phase [" + writer.getInputProtocol() + + "] for " + size + " entries."); + } + if (dryRun || isVerbose()) { + for (ChainedFileWriterEntry entry : writer.getEntries()) { + getLog().info(" entry : " + entry); + } + if (dryRun) { + continue; + } + } + if (getLog().isDebugEnabled()) { + getLog().debug("Generating files and copying resources..."); + } + + // obtains data to react for this writer + ChainedFileWriterData data = engine.getData(writer); + + // launch generation + writer.generate(this, data); + + String message = reportGeneratedFiles(writer, t0); + getLog().info(message); + + if ("model".equals(writer.getInputProtocol())) { + + // must fix source compile roots + File outputDir = writer.getOutputDirectory( + getOutputDirectory(), isTestPhase()); + + fixCompileSourceRoots(outputDir); + } + } + + } finally { + // always clear everything to avoid side-effects in goal is + // invoked more than once + properties.clear(); + engine.clear(); + } + } + + + public String reportGeneratedFiles(ChainedFileWriter writer, long t0) { + WriterReport writerReport = writer.getWriterReport(); + int nbFiles = writerReport.getFilesCount(); + + if (nbFiles == 0) { + return "No file generated."; + } + + long delay = System.nanoTime() - t0; + if (nbFiles == 1) { + return "Generate one file in " + StringUtil.convertTime(delay) + "."; + } + return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; + } + + /** + * Add a single input to the {@link #inputs} property. + * <p/> + * <b>Note:</b> This is a convinient way to allow in pom to write + * <pre> + * <inputs>zargo</inputs> + * </pre> + * in stead of array notation : + * <pre> + * <inputs> + * <input>zargo:</input> + * </inputs> + * </pre> + * + * @param inputs unique input to add + */ + public void setInputs(String inputs) { + this.inputs = new String[]{inputs}; + } + + @Override + public File getOutputDirectory() { + return outputDirectory; + } + + @Override + public File getExtractDirectory() { + return extractDirectory; + } + + @Override + public Map<String, Object> getProperties() { + return properties; + } + + @Override + public ClassLoader getClassLoader() { + try { + return getFixedClassLoader(); + } catch (MojoExecutionException e) { + throw new IllegalStateException("could not obtain classLoader", e); + } + } + + @Override + public MavenProject getProject() { + return project; + } + + @Override + public void setProject(MavenProject project) { + this.project = project; + } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + @Override + public boolean isOverwrite() { + return overwrite; + } + + @Override + public boolean isOffline() { + return settings.isOffline(); + } + + @Override + public boolean isTestPhase() { + return testPhase; + } + + @Override + public String getModelType() { + return modelType; + } + + @Override + public Map<String, ChainedFileWriter> getWriters() { + return writers; + } + + @Override + public Map<String, ModelReader<?>> getModelReaders() { + return modelReaders; + } + + @Override + public Map<String, Template<?>> getModelTemplates() { + return modelTemplates; + } + + @Override + public File getBasedir() { + return getProject().getBasedir(); + } + + /** + * @return the string representation of excludesTemplates + * (separated by comma) + */ + protected String getExcludeTemplatesAsString() { + String result = ""; + for (int i = 0; i < excludeTemplates.length; i++) { + result += excludeTemplates[i]; + if (i != excludeTemplates.length - 1) { + result += ","; + } + } + return result; + } + + /** + * Prepare le classLoader a utiliser dans le generateur. + * <p/> + * Si le mojo est en phase de test {@link #testPhase} a été renseigné, + * target/classes est rajouté. + * <p/> + * Si des références à des sibling modules, ils seront rajoutés aussi. + * + * @return le class loader modifie + * @throws MojoExecutionException if any pb + */ + + public ClassLoader getFixedClassLoader() throws MojoExecutionException { + if (fixedClassLoader == null) { + Set<String> urlsAsString = new HashSet<String>(); + List<URL> urls = new ArrayList<URL>(); + try { + ClassLoader loader; + + if (testPhase) { + File extraClassPathDirectory = new File( + getProject().getBuild().getOutputDirectory()); + if (verbose) { + getLog().info("Add in generator's classLoader : " + + extraClassPathDirectory); + } + addDirectoryToUrlsList( + extraClassPathDirectory, + urls, + urlsAsString + ); + + addDirectoryToUrlsList( + new File(getProject().getBuild().getTestSourceDirectory()), + urls, + urlsAsString + ); + } else { + + addDirectoryToUrlsList( + new File(getProject().getBuild().getSourceDirectory()), + urls, + urlsAsString + ); + } + + if (project.getProjectReferences() != null) { + // this case is for multi-module when calling from a + // parent module + for (Object o : + project.getProjectReferences().entrySet()) { + Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; + MavenProject relatedProject = + (MavenProject) entry.getValue(); + if (verbose) { + getLog().info("Add project reference in " + + "generator's classLoader : '" + + relatedProject.getArtifact() + "'"); + } + //TODO il faudrait peut-etre aussi ajouter les + //TODO dependances ? + if (relatedProject.getArtifact().getFile() != null) { + addDirectoryToUrlsList( + relatedProject.getArtifact().getFile(), + urls, + urlsAsString + ); + } + } + } + if (!project.getArtifacts().isEmpty()) { + // this is a special case when artifacts were resolved + // (for example in site phase) + if (isVerbose()) { + getLog().info( + "Use resolved artifacts to build class-path"); + } + for (Object o : project.getArtifacts()) { + Artifact a = (Artifact) o; + if (!a.getScope().equals("provided")) { + addDirectoryToUrlsList( + a.getFile(), + urls, + urlsAsString + ); + } + } + } + // we ask to add the directory in classloader + loader = getClass().getClassLoader(); + if (isVerbose()) { + getLog().info("original classloader " + loader); + } + if (loader instanceof URLClassLoader) { + // on reinjecte les urls de loader de base + // car sinon on risque de ne pas retrouver les resources... + for (URL u : ((URLClassLoader) loader).getURLs()) { + addUrlToUrlsList(u, urls, urlsAsString); + if (isVerbose()) { + getLog().debug("original cp entry: " + u); + } + } + // et on force l'utilisation du classloader parent + // s'il existe + if (loader.getParent() != null) { + loader = loader.getParent(); + } + } + if (!urls.isEmpty()) { + loader = new URLClassLoader( + urls.toArray(new URL[urls.size()]), + loader); + } + if (isVerbose()) { + for (URL u : urls) { + getLog().info("cp entry: " + u); + } + } + fixedClassLoader = loader; + } catch (MalformedURLException e) { + throw new MojoExecutionException(e.getMessage()); + } finally { + urls.clear(); + urlsAsString.clear(); + } + } + return fixedClassLoader; + } + + /** + * permet d'ajout le répertoire de génération des fichiers java dans + * les répertoires de compilation du projet Maven. + * + * @param destDirGen le repertoire a traiter + */ + protected void fixCompileSourceRoots(File destDirGen) { + + //FIXME-TC20091215 : should never have a null project, this is not + //FIXME-TC20091215 : normal + if (project == null) { + // no project defined, can not fix anything + // this case could appears if we wanted to do some tests of the + // plugin + return; + } + + //TODO-TC20091016 should use AbstractPlugin api + if (isTestPhase()) { + if (!project.getTestCompileSourceRoots().contains( + destDirGen.getPath())) { + getLog().info("Add test compile source root : " + destDirGen); + project.addTestCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("Add test resource root :" + resources); + project.addTestResource(resources); + } + } else { + if (!project.getCompileSourceRoots().contains( + destDirGen.getPath())) { + getLog().info("Add compile source root : " + destDirGen); + project.addCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("Add resource root :" + resources); + project.addResource(resources); + } + } + } + + protected ModelPropertiesUtil.ModelPropertiesProvider getModelPropertiesProvider() throws MojoExecutionException { + + ModelPropertiesUtil.ModelPropertiesProvider provider; + + if (modelPropertiesProviders == null || + modelPropertiesProviders.isEmpty() || + isTestPhase()) { + + // could not find any model properties via plexus + // try to obtain them by ServiceLoader + + provider = ModelPropertiesUtil.newStore( + getFixedClassLoader(), + verbose + ); + } else { + provider = ModelPropertiesUtil.newStore( + modelPropertiesProviders.values(), + verbose + ); + } + return provider; + } +} Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2012-08-14 15:03:58 UTC (rev 1158) @@ -25,851 +25,39 @@ package org.nuiton.eugene.plugin; -import org.apache.commons.lang3.StringUtils; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.model.Resource; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.settings.Settings; -import org.nuiton.eugene.DefaultTemplateConfiguration; -import org.nuiton.eugene.ModelPropertiesUtil; -import org.nuiton.eugene.ModelReader; -import org.nuiton.eugene.Template; -import org.nuiton.eugene.models.Model; -import org.nuiton.eugene.plugin.writer.BaseChainedFileWriter; -import org.nuiton.eugene.plugin.writer.ModelChainedFileWriter; -import org.nuiton.eugene.plugin.writer.XmiChainedFileWriter; -import org.nuiton.eugene.writer.ChainedFileWriter; -import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; -import org.nuiton.eugene.writer.ChainedFileWriterData; -import org.nuiton.eugene.writer.ChainedFileWriterEntry; -import org.nuiton.eugene.writer.ChainedWriterEngine; -import org.nuiton.eugene.writer.WriterReport; -import org.nuiton.plugin.AbstractPlugin; -import org.nuiton.plugin.PluginWithEncoding; -import org.nuiton.util.StringUtil; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Smart file generator. * <p/> * Fill inputs and mojo will chained needed writer. * <p/> - * User: chemit - * Date: 24 nov. 2009 - * Time: 00:22:37 * - * @goal smart-generate - * @requiresProject true - * @requiresDependencyResolution compile + * @author tchemit <chemit(a)codelutin.com> + * Date: 24 nov. 2009 + * Time: 00:22:37 */ -public class SmartGenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { +@Mojo(name = "smart-generate", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +public class SmartGenerateMojo extends GenerateMojo { - /** - * Inputs files to used to generate the required model files. - * </p> - * An include has the following pattern : - * <pre> - * writer: - * </pre> - * when you want to use a specific writer with his default io values. - * <p/> - * Can also write : - * <pre> - * [writer:]directory:includes - * </pre> - * where {@code includes} is the pattern to find files from the directory - * given and must be terminated by the extension of files. - * <p/> - * Specifying the {@code writer} can be usefull when you want to use a - * writer for an unknown extension by any writer. - * <p/> - * Example : - * <pre> - * <inputs> - * <input>zargo:</input> - * <input>src/main/xmi2:**\/*.zargo</input> - * <input>zargo:src/main/xmi:**\/*.zargo2</input> - * </inputs> - * </pre> - * <p/> - * <b>Note:</b> If your using a single input, you can just write : - * <pre> - * <inputs>zargo</inputs> - * </pre> - * - * @parameter expression="${eugene.inputs}" - * @required - * @since 2.0.0 - */ - protected String[] inputs; - - /** - * List of input (protocol) not to treate separated by comma. - * <p/> - * Example : - * <pre> - * <skipInputs>xmi</skipInputs> - * <skipInputs>xmi,model</skipInputs> - * </pre> - * - * @parameter expression="${eugene.skipInputs}" - * @since 2.0.0 - */ - protected String skipInputs; - - /** - * Where to generate files. - * - * @parameter expression="${eugene.outputDirectory}" default-value="target/generated-sources" - * @required - * @since 2.0.0 - */ - protected File outputDirectory; - - /** - * Where to copy extracted files (when using class-path data). - * - * @parameter expression="${eugene.extractDirectory}" default-value="target/extracted-sources" - * @required - * @since 2.1.3 - */ - protected File extractDirectory; - - /** - * Ecrase les fichiers générés. - * - * @parameter expression="${eugene.overwrite}" default-value="false" - * @since 2.0.0 - */ - protected boolean overwrite; - - /** - * Pour activer le mode verbeux. - * - * @parameter expression="${eugene.verbose}" default-value="${maven.verbose}" - * @since 2.0.0 - */ - protected boolean verbose; - - /** - * Encoding to be used for generation of files. - * <p/> - * <b>Note:</b> If nothing is filled here, we will use the system - * property {@code file.encoding}. - * - * @parameter expression="${eugene.encoding}" default-value="${project.build.sourceEncoding}" - * @since 2.0.0 - */ - protected String encoding; - - /** - * A flag to mark the mojo to be used in a test phase. This will permits - * to add generated sources in test compile roots. - * - * @parameter expression="${eugene.testPhase}" default-value="false" - * @since 2.0.0 - */ - protected boolean testPhase; - - /** - * The type of model to be used. - * <p/> - * By default, use an {@code objectmodel}. - * - * @parameter expression="${eugene.modelType}" default-value="objectmodel" - * @required - * @since 2.0.0 - */ - protected String modelType; - - /** - * Properties to pass to writer. - * - * @parameter - * @since 2.0.0 - */ - protected Map<String, Object> properties; - - /** - * Ne génère rien, analyse juste la configuration. - * - * @parameter expression="${eugene.dryRun}" default-value="false" - * @since 2.0.0 - */ - protected boolean dryRun; - - /** - * Nom du paquetage pour les fichiers générés (xmi input sepcific). - * - * @parameter expression="${generator.fullPackagePath}" default-value="${project.groupId}.${project.artifactId}" - * @since 2.0.0 - */ - protected String fullPackagePath; - - /** - * Nom du resolver a utiliser pour les transformations xmi vers model - * (xmi input sepcific). - * - * @parameter expression="${generator.resolver}" default-value="org.nuiton.util.ResourceResolver" - * @since 2.0.0 - */ - protected String resolver; - - /** - * Templates à utiliser, séparés par des virgules pour les transformations - * depuis les models (model input sepcific). - * - * @parameter expression="${eugene.templates}" - * @since 0.50 - */ - protected String templates; - - /** - * Templates à ne pas utiliser lors de la transformations des models - * (model input sepcific). - * - * @parameter expression="${eugene.excludeTemplates}" - * @since 0.63 - */ - protected String[] excludeTemplates; - - /** - * Nom par défaut du paquetage généré (model input specific). - * - * @parameter expression="${eugene.defaultPackage}" default-value="${project.groupId}.${project.artifactId}" - * @since 0.50 - */ - protected String defaultPackage; - - /** - * List of packages to generate (comma separated). (model input specific). - * <p/> - * If the parameter is not filled, will generate all packages. - * - * @parameter expression="${eugene.generatedPackages}" - * @since 1.0.0-rc-8 - */ - protected String generatedPackages; - - /** - * List of package to extract from xmi to models. (model input specific). - * <p/> - * If the parameter is not filled, will extract all packages. - * - * @parameter expression="${eugene.extractedPackages}" default-value="${project.groupId}.${project.artifactId}" - * @since 1.0.0-rc-8 - */ - protected String extractedPackages; - - /** - * Maven project. - * - * @parameter default-value="${project}" - * @readonly - * @since 2.0.0 - */ - protected MavenProject project; - - /** - * Le settings (pour obtenir le mode offline). - * - * @parameter default-value="${settings}" - * @readonly - * @since 2.0.0 - */ - protected Settings settings; - - /** - * All available models (obtain by plexus, keys are plexus roles, - * values are a instance of corresponding model). - * - * @component role="org.nuiton.eugene.models.Model" - */ - protected Map<String, Model> _models; - - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.writer.ChainedFileWriter" - */ - protected Map<String, ChainedFileWriter> writers; - - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelReader" - */ - protected Map<String, ModelReader<?>> modelReaders; - - /** - * All available templates introspects via plexus - * - * @component role="org.nuiton.eugene.Template" - */ - protected Map<String, Template<?>> modelTemplates; - - /** - * All available model properties providers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" - * @since 2.3 - */ - protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; - - /** - * The engine to compute {@link ChainedFileWriter} from inputs entries. - * - * @component role="org.nuiton.eugene.writer.ChainedWriterEngine" - */ - protected ChainedWriterEngine engine; - - /** fixed classloader */ - protected ClassLoader fixedClassLoader; - @Override protected void init() throws Exception { - if (getLog().isDebugEnabled()) { - verbose = true; - } + getLog().warn("================================================================================"); + getLog().warn(""); + getLog().warn("Since version 2.5, smart-generate is deprecated (it will be removed in version 3.0)."); + getLog().warn("Prefer use now the generate goal."); + getLog().warn(""); + getLog().warn("See http://maven-site.nuiton.org/eugene/maven-eugene-plugin/generate-mojo.html"); + getLog().warn("See http://nuiton.org/issues/2251"); + getLog().warn(""); + getLog().warn("================================================================================"); - modelType = modelType.trim().toLowerCase(); - - // Check model type is accepted - // pouvoir associé un nom à un type de service). - Model model = _models.get(modelType); - if (model == null) { - throw new MojoExecutionException( - "No modelType named '" + modelType + "', use one of " + - _models.keySet()); - } - - if (inputs.length == 0) { - throw new MojoExecutionException( - "Must specify something to include using the includes " + - "property"); - } - //FIXME-TC20091217 use a configurator in plexus ? - // Actually we obtain a different instance of the mojo conflit with - // mojo and plexus :) - engine.setConfiguration(this); - - Set<ChainedFileWriter> availableWriters = engine.getAvailableWriters(); - - if (availableWriters.isEmpty()) { - throw new MojoExecutionException( - "Could not find any writer in class-path."); - } - - for (ChainedFileWriter writer : availableWriters) { - if (writer instanceof BaseChainedFileWriter) { - // add log support - ((BaseChainedFileWriter) writer).setLog(getLog()); - } - writer.setWriterReport(new WriterReport() { - @Override - public void addFile(String entry, File file, boolean b) { - super.addFile(entry, file, b); - if (b || isVerbose()) { - getLog().info("Will generate " + file); - } - if (getLog().isDebugEnabled()) { - getLog().debug(String.format("[%1$s] Will generate %2$s", entry, file)); - } - } - }); - } - - // detect top level writers - for (String include : inputs) { - - if (isVerbose()) { - getLog().info("Register include : " + include); - } - engine.registerInclude(include); - } - - if (engine.getSelectedWriters().isEmpty()) { - return; - } - - if (properties == null) { - properties = new LinkedHashMap<String, Object>(); - } - - if (engine.containsWriter("xmi")) { - - // add xmi writer support - - properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, - fullPackagePath); - properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); - properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); - } - - if (engine.containsWriter("model")) { - - // add model writer support - - properties.put(ModelChainedFileWriter.PROP_DEFAULT_PACKAGE, - defaultPackage); - properties.put(ModelChainedFileWriter.PROP_GENERATED_PACKAGES, - generatedPackages); - properties.put(ModelChainedFileWriter.PROP_TEMPLATES, templates); - properties.put(ModelChainedFileWriter.PROP_EXCLUDE_TEMPLATES, - getExcludeTemplatesAsString()); - properties.put(ModelChainedFileWriter.PROP_MODEL_PROPERTIES_PROVIDER, - getModelPropertiesProvider()); - - DefaultTemplateConfiguration configuration = - new DefaultTemplateConfiguration(); - configuration.setEncoding(getEncoding()); - configuration.setLoader(getClassLoader()); - configuration.setOverwrite(isOverwrite()); - configuration.setVerbose(isVerbose()); - properties.put(ModelChainedFileWriter.PROP_TEMPLATE_CONFIGURATION, - configuration); - } + super.init(); } - @Override - protected boolean checkSkip() { - if (engine.getSelectedWriters().isEmpty()) { - getLog().warn("No phase was detected, skip the goal."); - return false; - } - return true; - } - - @Override - protected void doAction() throws Exception { - if (dryRun) { - getLog().warn("dryRun property is set, no file will be generated."); - } - if (isVerbose()) { - if (isTestPhase()) { - getLog().info(" using testPhase"); - } - } - try { - - List<String> skipInputList = new ArrayList<String>(); - - if (!StringUtils.isEmpty(skipInputs)) { - - for (String s : skipInputs.split(",")) { - skipInputList.add(s.trim()); - } - } - - // launch writers in incoming order of dicovering of them - - for (ChainedFileWriter writer : engine.getSelectedWriters()) { - if (skipInputList.contains(writer.getInputProtocol())) { - getLog().info("Skip phase [" + writer.getInputProtocol() + - "] as required in skipInputs configuration."); - continue; - } - long t0 = System.nanoTime(); - int size = writer.getEntries().size(); - if (size == 1) { - getLog().info( - "Process phase [" + writer.getInputProtocol() + - "] for one entry."); - } else { - getLog().info( - "Process phase [" + writer.getInputProtocol() + - "] for " + size + " entries."); - } - if (dryRun || isVerbose()) { - for (ChainedFileWriterEntry entry : writer.getEntries()) { - getLog().info(" entry : " + entry); - } - if (dryRun) { - continue; - } - } - if (getLog().isDebugEnabled()) { - getLog().debug("Generating files and copying resources..."); - } - - // obtains data to react for this writer - ChainedFileWriterData data = engine.getData(writer); - - // launch generation - writer.generate(this, data); - - String message = reportGeneratedFiles(writer, t0); - getLog().info(message); - - if ("model".equals(writer.getInputProtocol())) { - - // must fix source compile roots - File outputDir = writer.getOutputDirectory( - getOutputDirectory(), isTestPhase()); - - fixCompileSourceRoots(outputDir); - } - } - - } finally { - // always clear everything to avoid side-effects in goal is - // invoked more than once - properties.clear(); - engine.clear(); - } - } - - - public String reportGeneratedFiles(ChainedFileWriter writer, long t0) { - WriterReport writerReport = writer.getWriterReport(); - int nbFiles = writerReport.getFilesCount(); - - if (nbFiles == 0) { - return "No file generated."; - } - - long delay = System.nanoTime() - t0; - if (nbFiles == 1) { - return "Generate one file in " + StringUtil.convertTime(delay) + "."; - } - return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; - } - - /** - * Add a single input to the {@link #inputs} property. - * <p/> - * <b>Note:</b> This is a convinient way to allow in pom to write - * <pre> - * <inputs>zargo</inputs> - * </pre> - * in stead of array notation : - * <pre> - * <inputs> - * <input>zargo:</input> - * </inputs> - * </pre> - * - * @param inputs unique input to add - */ - public void setInputs(String inputs) { - this.inputs = new String[]{inputs}; - } - - @Override - public File getOutputDirectory() { - return outputDirectory; - } - - @Override - public File getExtractDirectory() { - return extractDirectory; - } - - @Override - public Map<String, Object> getProperties() { - return properties; - } - - @Override - public ClassLoader getClassLoader() { - try { - return getFixedClassLoader(); - } catch (MojoExecutionException e) { - throw new IllegalStateException("could not obtain classLoader", e); - } - } - - @Override - public MavenProject getProject() { - return project; - } - - @Override - public void setProject(MavenProject project) { - this.project = project; - } - - @Override - public boolean isVerbose() { - return verbose; - } - - @Override - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - @Override - public String getEncoding() { - return encoding; - } - - @Override - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - @Override - public boolean isOverwrite() { - return overwrite; - } - - @Override - public boolean isOffline() { - return settings.isOffline(); - } - - @Override - public boolean isTestPhase() { - return testPhase; - } - - @Override - public String getModelType() { - return modelType; - } - - @Override - public Map<String, ChainedFileWriter> getWriters() { - return writers; - } - - @Override - public Map<String, ModelReader<?>> getModelReaders() { - return modelReaders; - } - - @Override - public Map<String, Template<?>> getModelTemplates() { - return modelTemplates; - } - - @Override - public File getBasedir() { - return getProject().getBasedir(); - } - - /** - * @return the string representation of excludesTemplates - * (separated by comma) - */ - protected String getExcludeTemplatesAsString() { - String result = ""; - for (int i = 0; i < excludeTemplates.length; i++) { - result += excludeTemplates[i]; - if (i != excludeTemplates.length - 1) { - result += ","; - } - } - return result; - } - - /** - * Prepare le classLoader a utiliser dans le generateur. - * <p/> - * Si le mojo est en phase de test {@link #testPhase} a été renseigné, - * target/classes est rajouté. - * <p/> - * Si des références à des sibling modules, ils seront rajoutés aussi. - * - * @return le class loader modifie - * @throws MojoExecutionException if any pb - */ - - public ClassLoader getFixedClassLoader() throws MojoExecutionException { - if (fixedClassLoader == null) { - Set<String> urlsAsString = new HashSet<String>(); - List<URL> urls = new ArrayList<URL>(); - try { - ClassLoader loader; - - if (testPhase) { - File extraClassPathDirectory = new File( - getProject().getBuild().getOutputDirectory()); - if (verbose) { - getLog().info("Add in generator's classLoader : " + - extraClassPathDirectory); - } - addDirectoryToUrlsList( - extraClassPathDirectory, - urls, - urlsAsString - ); - - addDirectoryToUrlsList( - new File(getProject().getBuild().getTestSourceDirectory()), - urls, - urlsAsString - ); - } else { - - addDirectoryToUrlsList( - new File(getProject().getBuild().getSourceDirectory()), - urls, - urlsAsString - ); - } - - if (project.getProjectReferences() != null) { - // this case is for multi-module when calling from a - // parent module - for (Object o : - project.getProjectReferences().entrySet()) { - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; - MavenProject relatedProject = - (MavenProject) entry.getValue(); - if (verbose) { - getLog().info("Add project reference in " + - "generator's classLoader : '" + - relatedProject.getArtifact() + "'"); - } - //TODO il faudrait peut-etre aussi ajouter les - //TODO dependances ? - if (relatedProject.getArtifact().getFile() != null) { - addDirectoryToUrlsList( - relatedProject.getArtifact().getFile(), - urls, - urlsAsString - ); - } - } - } - if (!project.getArtifacts().isEmpty()) { - // this is a special case when artifacts were resolved - // (for example in site phase) - if (isVerbose()) { - getLog().info( - "Use resolved artifacts to build class-path"); - } - for (Object o : project.getArtifacts()) { - Artifact a = (Artifact) o; - if (!a.getScope().equals("provided")) { - addDirectoryToUrlsList( - a.getFile(), - urls, - urlsAsString - ); - } - } - } - // we ask to add the directory in classloader - loader = getClass().getClassLoader(); - if (isVerbose()) { - getLog().info("original classloader " + loader); - } - if (loader instanceof URLClassLoader) { - // on reinjecte les urls de loader de base - // car sinon on risque de ne pas retrouver les resources... - for (URL u : ((URLClassLoader) loader).getURLs()) { - addUrlToUrlsList(u, urls, urlsAsString); - if (isVerbose()) { - getLog().debug("original cp entry: " + u); - } - } - // et on force l'utilisation du classloader parent - // s'il existe - if (loader.getParent() != null) { - loader = loader.getParent(); - } - } - if (!urls.isEmpty()) { - loader = new URLClassLoader( - urls.toArray(new URL[urls.size()]), - loader); - } - if (isVerbose()) { - for (URL u : urls) { - getLog().info("cp entry: " + u); - } - } - fixedClassLoader = loader; - } catch (MalformedURLException e) { - throw new MojoExecutionException(e.getMessage()); - } finally { - urls.clear(); - urlsAsString.clear(); - } - } - return fixedClassLoader; - } - - /** - * permet d'ajout le répertoire de génération des fichiers java dans - * les répertoires de compilation du projet Maven. - * - * @param destDirGen le repertoire a traiter - */ - protected void fixCompileSourceRoots(File destDirGen) { - - //FIXME-TC20091215 : should never have a null project, this is not - //FIXME-TC20091215 : normal - if (project == null) { - // no project defined, can not fix anything - // this case could appears if we wanted to do some tests of the - // plugin - return; - } - - //TODO-TC20091016 should use AbstractPlugin api - if (isTestPhase()) { - if (!project.getTestCompileSourceRoots().contains( - destDirGen.getPath())) { - getLog().info("Add test compile source root : " + destDirGen); - project.addTestCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add test resource root :" + resources); - project.addTestResource(resources); - } - } else { - if (!project.getCompileSourceRoots().contains( - destDirGen.getPath())) { - getLog().info("Add compile source root : " + destDirGen); - project.addCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add resource root :" + resources); - project.addResource(resources); - } - } - } - - protected ModelPropertiesUtil.ModelPropertiesProvider getModelPropertiesProvider() throws MojoExecutionException { - - ModelPropertiesUtil.ModelPropertiesProvider provider; - - if (modelPropertiesProviders == null || - modelPropertiesProviders.isEmpty() || - isTestPhase()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = ModelPropertiesUtil.newStore( - getFixedClassLoader(), - verbose - ); - } else { - provider = ModelPropertiesUtil.newStore( - modelPropertiesProviders.values(), - verbose - ); - } - return provider; - } } Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/example.rst.vm =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/example.rst.vm 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/example.rst.vm 2012-08-14 15:03:58 UTC (rev 1158) @@ -71,7 +71,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -117,7 +117,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -134,7 +134,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -150,7 +150,7 @@ <templates>org.nuiton.topia.generator.BeanTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/usage.rst =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/usage.rst 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/usage.rst 2012-08-14 15:03:58 UTC (rev 1158) @@ -32,7 +32,7 @@ .. contents:: -smart-generate +generate -------------- Ce 'goal' permet de lancer une génération intelligente, en chaînant les @@ -76,7 +76,7 @@ <inputs>zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -92,7 +92,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -117,7 +117,7 @@ <inputs>classpath:zargo:/myzargo:.*\.zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -144,7 +144,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -164,7 +164,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -232,7 +232,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -255,7 +255,7 @@ <skipInputs>xmi,model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -287,7 +287,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -324,7 +324,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -403,25 +403,18 @@ Génération 'stupide' de zargo vers xmi sans chaînage des générations. -Utilisez plutôt le 'goal' *smart-generate*. +Utilisez plutôt le 'goal' *generate*. xmi2objectmodel --------------- Génération 'stupide' de xmi vers objectmodel sans chaînage des générations. -Utilisez plutôt le 'goal' *smart-generate*. +Utilisez plutôt le 'goal' *generate*. xmi2statemodel -------------- Génération 'stupide' de xmi vers statemodel sans chaînage des générations. -Utilisez plutôt le 'goal' *smart-generate*. - -generate --------- - -Génération 'stupide' de model vers java et autres sans chaînage des générations. - -Utilisez plutôt le 'goal' *smart-generate*. +Utilisez plutôt le 'goal' *generate*. Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/example.rst.vm =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/example.rst.vm 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/example.rst.vm 2012-08-14 15:03:58 UTC (rev 1158) @@ -74,7 +74,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -119,7 +119,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -136,7 +136,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -152,7 +152,7 @@ <templates>org.nuiton.topia.generator.BeanTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/usage.rst =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/usage.rst 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/rst/usage.rst 2012-08-14 15:03:58 UTC (rev 1158) @@ -37,7 +37,7 @@ This page describes the usage of the goals of the eugene plugin. -smart-generate +generate -------------- This goal permits to launch a smart (understood as intelligent) generation, @@ -80,7 +80,7 @@ <inputs>zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -97,7 +97,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -118,7 +118,7 @@ <inputs>zargo:src/main/myzargo2:**/*.zargo2</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -157,7 +157,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -180,7 +180,7 @@ <skipInputs>xmi,model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -212,7 +212,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -249,7 +249,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -328,25 +328,18 @@ 'Stupid' generation from zargo to xmi files with no chained stuff. -Prefer using the *smart-generate* goal. +Prefer using the *generate* goal. xmi2objectmodel --------------- 'Stupid' generation from xmi files to object model files with no chained stuff. -Prefer using the *smart-generate* goal. +Prefer using the *generate* goal. xmi2statemodel -------------- 'Stupid' generation from xmi files to state model files with no chained stuff. -Prefer using the *smart-generate* goal. - -generate --------- - -'Stupid' generation from model files to java and other files with no chained stuff. - -Prefer using the *smart-generate* goal. +Prefer using the *generate* goal. Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_en.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_en.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_en.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,68 +26,74 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - <links> - <item name="[fr" href="fr/index.html" /> - <item name="en]" href="index.html" /> - </links> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu ref="parent"/> - - <menu name="User"> - <item href="index.html" name="Index"/> - <item href="usage.html" name="Usage"/> - <item href="example.html" name="Examples"/> - <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"/> - <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> - <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> - <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> - <item name="generate-model-files" href="generate-model-files-mojo.html"/> - <item name="generate" href="generate-mojo.html"/> - <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> - <menu name="Download"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <footer> + <menu ref="parent"/> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="User"> + <item href="index.html" name="Index"/> + <item href="usage.html" name="Usage"/> + <item href="example.html" name="Examples"/> + <item name="Goals" href="plugin-info.html"> + <item name="generate" href="generate-mojo.html"/> + <item name="available-data" href="available-data-mojo.html"/> + <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> + <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> + <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> + <item name="generate-model-files" + href="generate-model-files-mojo.html"/> + <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu name="Download"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> - </body> + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_fr.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_fr.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/eugene-maven-plugin/src/site/site_fr.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,72 +26,79 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - <links> - <item name="[fr" href="index.html"/> - <item name="en]" href="../index.html"/> - </links> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> -  -  - <menu name="Parent Projet"> - <item name="Eugene" href="../../fr/index.html"/> - </menu> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="usage.html" name="Utilisation"/> - <item href="example.html" name="Examples"/> - <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"/> - <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> - <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> - <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> - <item name="generate-model-files" href="generate-model-files-mojo.html"/> - <item name="generate" href="generate-mojo.html"/> - <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> - <menu ref="reports"/> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item href="usage.html" name="Utilisation"/> + <item href="example.html" name="Examples"/> + <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"/> + <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> + <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> + <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> + <item name="generate-model-files" + href="generate-model-files-mojo.html"/> + <item name="generate" href="generate-mojo.html"/> + <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> - <footer> + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu ref="reports"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <footer> - </body> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/eugene-2.4.3/pom.xml =================================================================== --- branches/eugene-2.4.3/pom.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/pom.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -34,11 +34,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.6</version> </parent> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> <modules> <module>eugene</module> @@ -278,6 +278,13 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> @@ -301,7 +308,7 @@ <id>bpoussin</id> <email>poussin(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> <role>Debian packager</role> @@ -313,7 +320,7 @@ <id>athimel</id> <email>thimel(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -324,7 +331,7 @@ <id>jruchaud</id> <email>ruchaud(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -335,7 +342,7 @@ <id>echatellier</id> <email>chatellier(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -344,7 +351,7 @@ <developer> <name>Stéphane Chorlet</name> <id>schorlet</id> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -355,7 +362,7 @@ <id>tchemit</id> <email>chemit(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -366,7 +373,7 @@ <id>fdesbois</id> <email>fdesbois(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -384,13 +391,13 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>  - <antVersion>1.8.4</antVersion> - <jrstPluginVersion>1.5</jrstPluginVersion> +  +   <locales>en,fr</locales> Modified: branches/eugene-2.4.3/src/site/site_en.xml =================================================================== --- branches/eugene-2.4.3/src/site/site_en.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/src/site/site_en.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,101 +26,110 @@ <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <publishDate position="right" /> - <version position="right" /> + <publishDate position="right"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/logos/restructuredtext-logo.png"/> + </poweredBy> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - </links> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/index.html"/> + </breadcrumbs> - <menu name="Documentation"> - <item name="French version" href="fr/index.html" /> - <item name="Home" href="index.html" /> - <item name="Introduction" href="01-introduction.html" /> - <item name="ObjectModel" href="02-objectmodel.html" /> - <item name="Generation process" href="03-generation.html" /> - <item name="Templates" href="04-templates.html" /> - <item name="Execution" href="05-execution.html" /> - <item name="Advanced functionalities" href="06-fonctionnalites-avancees.html" /> - <item name="Glossary" href="07-glossaire.html" /> - <item name="FAQ" href="08-FAQ.html" /> - </menu> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu name="Project"> - <item name="Home" href="http://nuiton.org/projects/show/eugene" /> - <item name="Download" href="http://nuiton.org/projects/eugene/files" /> - <item name="Trackers" href="http://nuiton.org/projects/eugene/issues" /> - </menu> + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Links"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - <item name="ArgoUML" href="http://argouml.tigris.org/"/> - <item name="UML" href="http://www.uml.org/"/> - <item name="XMI" href="http://www.omg.org/spec/XMI/"/> - </menu> - - <menu ref="modules"/> + <menu name="Documentation"> + <item name="French version" href="fr/index.html"/> + <item name="Home" href="index.html"/> + <item name="Introduction" href="01-introduction.html"/> + <item name="ObjectModel" href="02-objectmodel.html"/> + <item name="Generation process" href="03-generation.html"/> + <item name="Templates" href="04-templates.html"/> + <item name="Execution" href="05-execution.html"/> + <item name="Advanced functionalities" + href="06-fonctionnalites-avancees.html"/> + <item name="Glossary" href="07-glossaire.html"/> + <item name="FAQ" href="08-FAQ.html"/> + </menu> - <menu ref="reports"/> + <menu name="Project"> + <item name="Home" href="http://nuiton.org/projects/show/eugene"/> + <item name="Download" href="http://nuiton.org/projects/eugene/files"/> + <item name="Trackers" href="http://nuiton.org/projects/eugene/issues"/> + </menu> - <footer> + <menu name="Links"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + <item name="ArgoUML" href="http://argouml.tigris.org/"/> + <item name="UML" href="http://www.uml.org/"/> + <item name="XMI" href="http://www.omg.org/spec/XMI/"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu ref="modules"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/eugene-2.4.3/src/site/site_fr.xml =================================================================== --- branches/eugene-2.4.3/src/site/site_fr.xml 2012-08-14 13:35:39 UTC (rev 1157) +++ branches/eugene-2.4.3/src/site/site_fr.xml 2012-08-14 15:03:58 UTC (rev 1158) @@ -26,107 +26,117 @@ <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <publishDate position="right" /> - <version position="right" /> + <publishDate position="right"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/logos/restructuredtext-logo.png"/> + </poweredBy> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/index.html"/> + </breadcrumbs> - <menu name="Documentation"> - <item name="English version" href="../index.html" /> - <item name="Accueil" href="index.html" /> - <item name="Introduction" href="01-introduction.html" /> - <item name="ObjectModel" href="02-objectmodel.html" /> - <item name="Processus de génération" href="03-generation.html" /> - <item name="Templates" href="04-templates.html" /> - <item name="Execution" href="05-execution.html" /> - <item name="Fonctionnalités avancées" href="06-fonctionnalites-avancees.html" /> - <item name="Glossaire" href="07-glossaire.html" /> - <item name="FAQ" href="08-FAQ.html" /> - </menu> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu name="Projet"> - <item name="Accueil" href="http://nuiton.org/projects/show/eugene" /> - <item name="Téléchargement" href="http://nuiton.org/projects/eugene/files" /> - <item name="Trackers" href="http://nuiton.org/projects/eugene/issues" /> - </menu> + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Liens"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - <item name="ArgoUML" href="http://argouml.tigris.org/"/> - <item name="UML" href="http://www.uml.org/"/> - <item name="XMI" href="http://www.omg.org/spec/XMI/"/> - </menu> + <menu name="Documentation"> + <item name="English version" href="../index.html"/> + <item name="Accueil" href="index.html"/> + <item name="Introduction" href="01-introduction.html"/> + <item name="ObjectModel" href="02-objectmodel.html"/> + <item name="Processus de génération" href="03-generation.html"/> + <item name="Templates" href="04-templates.html"/> + <item name="Execution" href="05-execution.html"/> + <item name="Fonctionnalités avancées" + href="06-fonctionnalites-avancees.html"/> + <item name="Glossaire" href="07-glossaire.html"/> + <item name="FAQ" href="08-FAQ.html"/> + </menu> -  - <menu ref="modules"/> -  -  -  -  -  + <menu name="Projet"> + <item name="Accueil" href="http://nuiton.org/projects/show/eugene"/> + <item name="Téléchargement" + href="http://nuiton.org/projects/eugene/files"/> + <item name="Trackers" href="http://nuiton.org/projects/eugene/issues"/> + </menu> - <menu ref="reports"/> + <menu name="Liens"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + <item name="ArgoUML" href="http://argouml.tigris.org/"/> + <item name="UML" href="http://www.uml.org/"/> + <item name="XMI" href="http://www.omg.org/spec/XMI/"/> + </menu> - <footer> +  + <menu ref="modules"/> +  +  +  +  +  - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu ref="reports"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r1157 - in branches: . eugene-2.4.3
by tchemit＠users.nuiton.org 14 Aug '12

14 Aug '12

Author: tchemit Date: 2012-08-14 15:35:39 +0200 (Tue, 14 Aug 2012) New Revision: 1157 Url: http://nuiton.org/repositories/revision/eugene/1157 Log: branche to release version 2.4.3 without feature 107 (see http://nuiton.org/issues/107) Added: branches/eugene-2.4.3/ Property changes on: branches/eugene-2.4.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

r1156 - trunk
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:50:10 +0200 (Tue, 07 Aug 2012) New Revision: 1156 Url: http://nuiton.org/repositories/revision/eugene/1156 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 10:18:34 UTC (rev 1155) +++ trunk/pom.xml 2012-08-07 07:50:10 UTC (rev 1156) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -34,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <artifactId>eugene</artifactId> @@ -519,14 +517,12 @@ <phase>pre-site</phase> <configuration> <tasks> - <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" - failonerror="false" overwrite="true"> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> <include name="**/*.xsd"/> </fileset> </copy> - <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" - failonerror="false" overwrite="true"> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> <include name="**/*.dtd"/> </fileset>

1 0