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

[Lutingenerator-commits] r511 - in maven-eugene-plugin/trunk: . src/site
by tchemit＠users.labs.libre-entreprise.org 17 May '09

17 May '09

Author: tchemit Date: 2009-05-17 14:46:04 +0000 (Sun, 17 May 2009) New Revision: 511 Modified: maven-eugene-plugin/trunk/pom.xml maven-eugene-plugin/trunk/src/site/site.xml Log: premier jet d'un pom compatible central Modified: maven-eugene-plugin/trunk/pom.xml =================================================================== --- maven-eugene-plugin/trunk/pom.xml 2009-05-17 14:45:57 UTC (rev 510) +++ maven-eugene-plugin/trunk/pom.xml 2009-05-17 14:46:04 UTC (rev 511) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1-SNAPSHOT</version> </parent> <artifactId>maven-eugene-plugin</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1-SNAPSHOT</version>  <dependencies> @@ -21,7 +21,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -60,6 +60,7 @@ <name>Plugin maven Eugene</name> <inceptionYear>2006</inceptionYear> <description>maven plugin to use the eugene library</description> + <url>http://www.nuiton.org/embedded/${project.artifactId}</url>   @@ -70,9 +71,6 @@ <ant.version>1.7.1</ant.version> -  - <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutingenerator/htdocs</site.deploy.url> - </properties> <build> @@ -97,7 +95,7 @@ <pluginManagement> <plugins> - <plugin> +  </plugins> </pluginManagement> @@ -126,21 +124,17 @@   -  - <repositories> - <repository> - <id>nuiton-repository</id> - <name>NuitonRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/${project.artifactId}/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutingenerator/${project.artifactId}/trunk</developerConnection> +  +  +  + </scm> + </project> Modified: maven-eugene-plugin/trunk/src/site/site.xml =================================================================== --- maven-eugene-plugin/trunk/src/site/site.xml 2009-05-17 14:45:57 UTC (rev 510) +++ maven-eugene-plugin/trunk/src/site/site.xml 2009-05-17 14:46:04 UTC (rev 511) @@ -4,9 +4,9 @@ <publishDate format="dd/MM/yyyy"/> <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.0-alpha-1</version> </skin> <bannerLeft> @@ -27,9 +27,9 @@ <body> <links> <item name="Eugene" href="http://lutingenerator.labs.libre-entreprise.org/eugene"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> +  </links> <menu name="Utilisateur">

1 0

[Lutingenerator-commits] r510 - in eugene/trunk: . src/site
by tchemit＠users.labs.libre-entreprise.org 17 May '09

17 May '09

Author: tchemit Date: 2009-05-17 14:45:57 +0000 (Sun, 17 May 2009) New Revision: 510 Modified: eugene/trunk/pom.xml eugene/trunk/src/site/site.xml Log: premier jet d'un pom compatible central Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-17 02:54:25 UTC (rev 509) +++ eugene/trunk/pom.xml 2009-05-17 14:45:57 UTC (rev 510) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1-SNAPSHOT</version>  <dependencies> @@ -21,7 +21,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0-alpha-1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -105,6 +105,7 @@ <description>Efficient Universal Generator.</description> <inceptionYear>2004</inceptionYear> + <url>http://www.nuiton.org/embedded/${project.artifactId}</url>   @@ -112,9 +113,6 @@ <packaging>jar</packaging> <properties> - -  - <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutingenerator/htdocs</site.deploy.url> </properties> @@ -134,7 +132,7 @@ <pluginManagement> <plugins> - <plugin> +  </plugins> </pluginManagement> @@ -225,22 +223,18 @@ </developer> </developers> -  - <repositories> - <repository> - <id>nuiton-repository</id> - <name>NuitonRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/${project.artifactId}/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutingenerator/${project.artifactId}/trunk</developerConnection> + +  +  +  + </scm> <profiles>  @@ -260,11 +254,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>attach-assembly</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> + <id>attach-assemblies</id> </execution> </executions> </plugin> Modified: eugene/trunk/src/site/site.xml =================================================================== --- eugene/trunk/src/site/site.xml 2009-05-17 02:54:25 UTC (rev 509) +++ eugene/trunk/src/site/site.xml 2009-05-17 14:45:57 UTC (rev 510) @@ -4,9 +4,9 @@ <publishDate format="dd/MM/yyyy"/> <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.0-alpha-1</version> </skin> <bannerLeft> @@ -27,9 +27,9 @@ <body> <links> <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> +  </links> <menu name="Utilisateur">

1 0

[Lutingenerator-commits] r509 - eugene/trunk
by tchemit＠users.labs.libre-entreprise.org 17 May '09

17 May '09

Author: tchemit Date: 2009-05-17 02:54:25 +0000 (Sun, 17 May 2009) New Revision: 509 Modified: eugene/trunk/pom.xml Log: l'url de depot ne peut pas etre calcule, car si on a pas mavenpom en local, ... Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-17 02:53:48 UTC (rev 508) +++ eugene/trunk/pom.xml 2009-05-17 02:54:25 UTC (rev 509) @@ -230,7 +230,7 @@ <repository> <id>nuiton-repository</id> <name>NuitonRepository</name> - <url>${repository.home.url}</url> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy>

1 0

[Lutingenerator-commits] r508 - maven-eugene-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 17 May '09

17 May '09

Author: tchemit Date: 2009-05-17 02:53:48 +0000 (Sun, 17 May 2009) New Revision: 508 Modified: maven-eugene-plugin/trunk/pom.xml Log: l'url de depot ne peut pas etre calcule, car si on a pas mavenpom en local, ... Modified: maven-eugene-plugin/trunk/pom.xml =================================================================== --- maven-eugene-plugin/trunk/pom.xml 2009-05-16 07:45:17 UTC (rev 507) +++ maven-eugene-plugin/trunk/pom.xml 2009-05-17 02:53:48 UTC (rev 508) @@ -131,7 +131,7 @@ <repository> <id>nuiton-repository</id> <name>NuitonRepository</name> - <url>${repository.home.url}</url> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2-nuiton</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy>

1 0

[Lutingenerator-commits] r507 - eugene/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 16 May '09

16 May '09

Author: tchemit Date: 2009-05-16 07:45:17 +0000 (Sat, 16 May 2009) New Revision: 507 Modified: eugene/trunk/src/site/site.xml Log: use project organization in site Modified: eugene/trunk/src/site/site.xml =================================================================== --- eugene/trunk/src/site/site.xml 2009-05-15 12:58:47 UTC (rev 506) +++ eugene/trunk/src/site/site.xml 2009-05-16 07:45:17 UTC (rev 507) @@ -29,7 +29,7 @@ <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="Nuiton" href="http://www.nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> </links> <menu name="Utilisateur">

1 0

[Lutingenerator-commits] r506 - maven-eugene-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 15 May '09

15 May '09

Author: tchemit Date: 2009-05-15 12:58:47 +0000 (Fri, 15 May 2009) New Revision: 506 Modified: maven-eugene-plugin/trunk/pom.xml Log: use mavenpom Modified: maven-eugene-plugin/trunk/pom.xml =================================================================== --- maven-eugene-plugin/trunk/pom.xml 2009-05-15 12:46:06 UTC (rev 505) +++ maven-eugene-plugin/trunk/pom.xml 2009-05-15 12:58:47 UTC (rev 506) @@ -7,12 +7,11 @@   <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.nuiton</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -68,19 +67,11 @@ <packaging>maven-plugin</packaging> <properties> - - <maven.version>2.0.10</maven.version> + <ant.version>1.7.1</ant.version> - - <redmine.project>eugene</redmine.project> -  - <labs.id>39</labs.id> - <labs.project>lutingenerator</labs.project> - <helper.version>1.0.0-SNAPSHOT</helper.version> - <helper.licenseName>lgpl_v3</helper.licenseName> - <site.home.url>http://lutingenerator.labs.libre-entreprise.org</site.home.url> - <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> +  + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutingenerator/htdocs</site.deploy.url> </properties> @@ -135,19 +126,12 @@   -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  +  <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy>

1 0

[Lutingenerator-commits] r505 - eugene/trunk
by tchemit＠users.labs.libre-entreprise.org 15 May '09

15 May '09

Author: tchemit Date: 2009-05-15 12:46:06 +0000 (Fri, 15 May 2009) New Revision: 505 Modified: eugene/trunk/pom.xml Log: add junit dep Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-15 12:44:24 UTC (rev 504) +++ eugene/trunk/pom.xml 2009-05-15 12:46:06 UTC (rev 505) @@ -89,6 +89,13 @@ </exclusions> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> + </dependencies>

1 0

[Lutingenerator-commits] r504 - eugene/trunk
by tchemit＠users.labs.libre-entreprise.org 15 May '09

15 May '09

Author: tchemit Date: 2009-05-15 12:44:24 +0000 (Fri, 15 May 2009) New Revision: 504 Modified: eugene/trunk/pom.xml Log: use mavenpom + and nuiton-utils Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-14 12:26:12 UTC (rev 503) +++ eugene/trunk/pom.xml 2009-05-15 12:44:24 UTC (rev 504) @@ -7,17 +7,11 @@   <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> -  + <version>1.0.0-SNAPSHOT</version> </parent> -  - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -26,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuitonutil</artifactId> + <artifactId>nuiton-utils</artifactId> <version>1.1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -112,15 +106,8 @@ <properties> - <redmine.project>eugene</redmine.project> - -  - <labs.id>39</labs.id> - <labs.project>lutingenerator</labs.project> - <helper.version>1.0.0-SNAPSHOT</helper.version> - <helper.licenseName>lgpl_v3</helper.licenseName> - <site.home.url>http://lutingenerator.labs.libre-entreprise.org</site.home.url> - <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> +  + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutingenerator/htdocs</site.deploy.url> </properties> @@ -172,13 +159,6 @@   -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> -  <developers> <developer> @@ -238,12 +218,12 @@ </developer> </developers> -  +  <repositories> <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy>

1 0

[Lutingenerator-commits] r503 - in maven-eugene-plugin/trunk: . src/main/java/org/nuiton/eugene/plugin src/main/java/org/nuiton/eugene/plugin/helper src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org 14 May '09

14 May '09

Author: tchemit Date: 2009-05-14 12:26:12 +0000 (Thu, 14 May 2009) New Revision: 503 Added: maven-eugene-plugin/trunk/src/site/rst/index.rst Removed: maven-eugene-plugin/trunk/src/site/rst/fr/ Modified: maven-eugene-plugin/trunk/pom.xml maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2ObjectModel.java maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2StateModel.java maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/helper/ResourceResolver.java maven-eugene-plugin/trunk/src/site/site.xml Log: migrate to nuiton Modified: maven-eugene-plugin/trunk/pom.xml =================================================================== --- maven-eugene-plugin/trunk/pom.xml 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/pom.xml 2009-05-14 12:26:12 UTC (rev 503) @@ -68,14 +68,20 @@ <packaging>maven-plugin</packaging> <properties> -  - <labs.id>39</labs.id> + + <maven.version>2.0.10</maven.version> + <ant.version>1.7.1</ant.version> + + <redmine.project>eugene</redmine.project> -  +  + <labs.id>39</labs.id> <labs.project>lutingenerator</labs.project> + <helper.version>1.0.0-SNAPSHOT</helper.version> + <helper.licenseName>lgpl_v3</helper.licenseName> + <site.home.url>http://lutingenerator.labs.libre-entreprise.org</site.home.url> + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> - <maven.version>2.0.10</maven.version> - <ant.version>1.7.1</ant.version> </properties> <build> @@ -153,39 +159,4 @@ </repository> </repositories> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - </profiles> - - </project> Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java 2009-05-14 12:26:12 UTC (rev 503) @@ -14,7 +14,6 @@ * 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>. ##%*/ - package org.nuiton.eugene.plugin; import java.io.File; @@ -47,174 +46,156 @@ */ public class CopyVersionFiles extends AbstractMojo implements FileFilter { - /** - * Fichiers objectModel a lire pour determiner la version. - * - * @parameter expression="${generator.includes}" default-value="*.*model" - * @since 0.51 - */ - protected String includes; - - /** - * Répertoire source où sont situer les modeles. - * - * @parameter expression="${generator.srcGenDest}" alias="srcGenDest" default-value="target/generated-sources/models" - * @since 0.51 - */ - protected File srcDirGen; - - /** + /** + * Fichiers objectModel a lire pour determiner la version. + * + * @parameter expression="${generator.includes}" default-value="*.*model" + * @since 0.51 + */ + protected String includes; + /** + * Répertoire source où sont situer les modeles. + * + * @parameter expression="${generator.srcGenDest}" alias="srcGenDest" default-value="target/generated-sources/models" + * @since 0.51 + */ + protected File srcDirGen; + /** * Répertoire sources des fichiers générés à copier. * * @parameter expression="${generator.destDirGen}" default-value="target/generated-sources/java" * @since 0.51 */ protected File destDirGen; - - /** - * Le dossier de destination des fichiers copiés. - * - * Doit contenir un nom de modele : <tt>%MODELNAME%</tt> - * - * @parameter expression="${generator.copyVersionDir}" - * @since 0.51 - * @required - */ - protected String copyVersionDir; + /** + * Le dossier de destination des fichiers copiés. + * + * Doit contenir un nom de modele : <tt>%MODELNAME%</tt> + * + * @parameter expression="${generator.copyVersionDir}" + * @since 0.51 + * @required + */ + protected String copyVersionDir; + /** + * Les mappings a sauvegarder + * + * @parameter expression="${generator.copyVersionFiles}" + * @since 0.51 + * @required + */ + protected String copyVersionFiles; + /** + * Ecrase les fichiers deja presents ? + * + * @parameter expression="${generator.copyOverwrite}" default-value="false" + * @since 0.51 + */ + protected boolean copyOverwrite = false; + /** + * Version trouvee dans les fichiers objectModel. + * + * Type string, parce que elle peut avoir la forme "1.3.2" par exemple + */ + protected String versionFound = null; + /** + * Nom du model sauvegarde + */ + protected String modelNameFound = null; + /** + * Maven logger + */ + protected Log logger; + /** + * Dossier incluant le nom de la version + */ + protected File fVersionDir; - /** - * Les mappings a sauvegarder - * - * @parameter expression="${generator.copyVersionFiles}" - * @since 0.51 - * @required - */ - protected String copyVersionFiles; + @Override + public void execute() throws MojoExecutionException, MojoFailureException { - /** - * Ecrase les fichiers deja presents ? - * - * @parameter expression="${generator.copyOverwrite}" default-value="false" - * @since 0.51 - */ - protected boolean copyOverwrite = false; + // get log + logger = getLog(); - /** - * Version trouvee dans les fichiers objectModel. - * - * Type string, parce que elle peut avoir la forme "1.3.2" par exemple - */ - protected String versionFound = null; + // find version and model name + findVersionAndModelName(); - /** - * Nom du model sauvegarde - */ - protected String modelNameFound = null; + if (versionFound == null || !versionFound.matches("[0-9]+(\\.[0-9]+)*")) { + versionFound = "0"; + logger.info("No version found in model files, setting version to '" + versionFound + "'"); + } else { + logger.info("Version '" + versionFound + "' found in model description"); + } - /** - * Maven logger - */ - protected Log logger; + String destDir = copyVersionDir.replace("%MODELNAME%", modelNameFound) + File.separator + versionFound; + fVersionDir = new File(destDir); - /** - * Dossier incluant le nom de la version - */ - protected File fVersionDir; + boolean doCopy = true; - /* - * (non-Javadoc) - * - * @see org.apache.maven.plugin.Mojo#execute() - */ - public void execute() throws MojoExecutionException, MojoFailureException { + if (!copyOverwrite) { + doCopy = !checkExistence(); + } + if (doCopy) { + copyAction(); + } + } - // get log - logger = getLog(); - - // find version and model name - findVersionAndModelName(); - - if (versionFound == null || !versionFound.matches("[0-9]+(\\.[0-9]+)*")) { - versionFound = "0"; - logger.info("No version found in model files, setting version to '" - + versionFound + "'"); - } else { - logger.info("Version '" + versionFound - + "' found in model description"); - } - - String destDir = copyVersionDir.replace("%MODELNAME%", modelNameFound) - + File.separator + versionFound; - fVersionDir = new File(destDir); - - boolean doCopy = true; - - if (!copyOverwrite) { - doCopy = !checkExistence(); - } - if (doCopy) - copyAction(); - } - - /** - * Check if previous saved files are already present + /** + * Check if previous saved files are already present * @return <code>true</code> if already present,<code>false</code> otherwise. */ - protected boolean checkExistence() { + protected boolean checkExistence() { - boolean exist = false; + boolean exist = false; - if (fVersionDir.exists() && fVersionDir.listFiles().length > 0) { - logger.warn("[COPY] Warning saved files for version '" - + versionFound + "' and name '" + modelNameFound - + "' already exists"); - logger.warn("[COPY] Copy won't be done unless copyOverwrite " - + "parameter is set to 'true' or version is updated"); + if (fVersionDir.exists() && fVersionDir.listFiles().length > 0) { + logger.warn("[COPY] Warning saved files for version '" + versionFound + "' and name '" + modelNameFound + "' already exists"); + logger.warn("[COPY] Copy won't be done unless copyOverwrite " + "parameter is set to 'true' or version is updated"); - exist = true; - } + exist = true; + } - return exist; - } + return exist; + } - /** - * Copy hibernate files. - * - * Using ant task - */ - protected void copyAction() { - // creation du repertoire - fVersionDir.mkdirs(); + /** + * Copy hibernate files. + * + * Using ant task + */ + protected void copyAction() { + // creation du repertoire + fVersionDir.mkdirs(); - /* Création d'un projet ant */ - Project project = createProject(); + /* Création d'un projet ant */ + Project project = createProject(); - /* Création de la tâche ant Copy */ - Copy copy = new Copy(); - copy.setProject(project); - copy.setTaskName("Copy ressources"); + /* Création de la tâche ant Copy */ + Copy copy = new Copy(); + copy.setProject(project); + copy.setTaskName("Copy ressources"); - /* Configuration */ - copy.setTodir(fVersionDir); - copy.setOverwrite(true); + /* Configuration */ + copy.setTodir(fVersionDir); + copy.setOverwrite(true); - FileSet fileSet = new FileSet(); - fileSet.setDir(destDirGen); - fileSet.setIncludes(copyVersionFiles); - copy.addFileset(fileSet); - + FileSet fileSet = new FileSet(); + fileSet.setDir(destDirGen); + fileSet.setIncludes(copyVersionFiles); + copy.addFileset(fileSet); + /* Execution */ - copy.execute(); - } + copy.execute(); + } - /** - * Find version and name in object model files - */ - protected void findVersionAndModelName() { + /** + * Find version and name in object model files + */ + protected void findVersionAndModelName() { - File srcModelDir = srcDirGen; + File srcModelDir = srcDirGen; - File[] modelFiles = srcModelDir.listFiles(this); + File[] modelFiles = srcModelDir.listFiles(this); for (File modelFile : modelFiles) { SAXReader saxR = new SAXReader(); @@ -234,34 +215,29 @@ logger.error("Can't read document", e); } } - } + } - protected Project createProject() { - /* Création d'un projet ant */ - Project project = new Project(); + protected Project createProject() { + /* Création d'un projet ant */ + Project project = new Project(); - BuildLogger logger = new NoBannerLogger(); - logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); - logger.setOutputPrintStream(System.out); - logger.setErrorPrintStream(System.err); + BuildLogger log = new NoBannerLogger(); + log.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); + log.setOutputPrintStream(System.out); + log.setErrorPrintStream(System.err); - project.init(); - project.getBaseDir(); - project.addBuildListener(logger); - return project; - } + project.init(); + project.getBaseDir(); + project.addBuildListener(log); + return project; + } - /* - * (non-Javadoc) - * - * @see java.io.FileFilter#accept(java.io.File) - */ - public boolean accept(File arg0) { - String fullPath = arg0.getAbsolutePath(); - // regex - String regexInclude = includes.replaceAll("\\.", "\\.").replaceAll( - "([^\\*])\\*([^\\*])", "$1[^/]*$2").replaceAll("\\*\\*", ".*") - + "$"; - return fullPath.matches(regexInclude); - } + @Override + public boolean accept(File arg0) { + String fullPath = arg0.getAbsolutePath(); + // regex + String regexInclude = includes.replaceAll("\\.", "\\.").replaceAll( + "([^\\*])\\*([^\\*])", "$1[^/]*$2").replaceAll("\\*\\*", ".*") + "$"; + return fullPath.matches(regexInclude); + } } Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-05-14 12:26:12 UTC (rev 503) @@ -14,7 +14,6 @@ * 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>. ##%*/ - package org.nuiton.eugene.plugin; import java.io.File; @@ -33,7 +32,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.nuiton.eugene.Generator; /** @@ -60,7 +59,6 @@ * @since 0.50 */ protected MavenProject project; - /** * Répertoire source. * @@ -68,7 +66,6 @@ * @since 0.50 */ protected File srcDirGen; - /** * Répertoire cible * @@ -76,7 +73,6 @@ * @since 0.50 */ protected File destDirGen; - /** * Templates à utiliser, séparés par des virgules. * @@ -85,7 +81,6 @@ * @since 0.50 */ protected String templates; - /** * Templates à ne pas utiliser. * @@ -93,7 +88,6 @@ * @since 0.63 */ protected String[] excludeTemplates; - /** * Fichier à inclure. * @@ -101,7 +95,6 @@ * @since 0.50 */ protected String includes; - /** * Nom par défaut du paquetage généré. * @@ -109,7 +102,6 @@ * @since 0.50 */ protected String defaultPackage; - /** * Ecrase les fichiers générés * @@ -117,7 +109,6 @@ * @since 0.50 */ private boolean overwrite = false; - /** * An extra directory to be added to the classpath. * @@ -125,7 +116,6 @@ * @since 0.63 */ protected File extraClassPathDirectory; - /** * Encoding to be used for generation of files. * @@ -133,7 +123,6 @@ * @since 0.60 */ protected String encoding; - /** * A flag to mark themojo to be used in a test phase. This will permits to add generated sources in test compile roots. * @@ -175,14 +164,11 @@ generators.add(generator); } catch (InstantiationException e) { - throw new MojoFailureException("Can't instantiate generator : " - + templateName, e); + throw new MojoFailureException("Can't instantiate generator : " + templateName, e); } catch (IllegalAccessException e) { - throw new MojoFailureException("Can't access generator : " - + templateName, e); + throw new MojoFailureException("Can't access generator : " + templateName, e); } catch (ClassNotFoundException e) { - throw new MojoFailureException("Can't found generator : " - + templateName, e); + throw new MojoFailureException("Can't found generator : " + templateName, e); } } @@ -216,8 +202,7 @@ includePattern = includePattern.replaceAll("\\*", ".*"); // log java regex - getLog().debug("Search for " + includePattern + " in " - + srcDirGen.getAbsolutePath()); + getLog().debug("Search for " + includePattern + " in " + srcDirGen.getAbsolutePath()); List<File> currentFiles = FileUtil.find(srcDirGen, includePattern, recursive); @@ -237,8 +222,7 @@ List<File> modelFiles) { for (Generator generator : generators) { - getLog().info("Apply " + generator.getClass().getSimpleName() - + " generator"); + getLog().info("Apply " + generator.getClass().getSimpleName() + " generator"); for (File modelFile : modelFiles) { getLog().debug(" on " + modelFile.getAbsolutePath()); @@ -302,22 +286,18 @@ ClassLoader loader = null; if (extraClassPathDirectory != null) { getLog().info( - "Add extra directory in generator's classLoader : " - + extraClassPathDirectory); + "Add extra directory in generator's classLoader : " + extraClassPathDirectory); urls.add(extraClassPathDirectory.toURI().toURL()); } if (project.getProjectReferences() != null) { // this case is for multi-module when calling from a parent module for (Object o : project.getProjectReferences().entrySet()) { - Entry entry = (Entry) o; - MavenProject relatedProject = (MavenProject) entry - .getValue(); + Entry<?, ?> entry = (Entry<?, ?>) o; + MavenProject relatedProject = (MavenProject) entry.getValue(); getLog().info( - "Add project reference in generator's classLoader : '" - + relatedProject.getArtifact() + "'"); + "Add project reference in generator's classLoader : '" + relatedProject.getArtifact() + "'"); //TODO il faudrait peut-etre aussi ajouter les dependances ? - urls.add(relatedProject.getArtifact().getFile().toURI() - .toURL()); + urls.add(relatedProject.getArtifact().getFile().toURI().toURL()); } } if (!project.getArtifacts().isEmpty()) { Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java 2009-05-14 12:26:12 UTC (rev 503) @@ -14,7 +14,6 @@ * 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>. ##%*/ - package org.nuiton.eugene.plugin; import java.io.File; @@ -38,8 +37,8 @@ import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.types.FileSet; import org.nuiton.eugene.plugin.helper.ResourceResolver; -import org.codelutin.util.FileUtil; -import org.codelutin.util.Resource; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; /** * Converti les fichiers XMI en fichier Model via une transformation XSLT a @@ -62,7 +61,6 @@ * @since 0.50 */ protected File srcDirXmi; - /** * Répertoire cible des fichiers générés * @@ -70,7 +68,6 @@ * @since 0.50 */ protected File destDirModel; - /** * Nom du paquetage pour les fichiers générés * @@ -78,7 +75,6 @@ * @since 0.50 */ protected String fullPackagePath; - /** * Nom du paquetage à généré * @@ -86,7 +82,6 @@ * @since 0.50 */ protected String extractedPackages; - /** * Ecrase les fichiers générés * @@ -102,23 +97,24 @@ } protected void actionXsl() throws MojoExecutionException { - + getLog().info("Processing XSL tranformation"); - getLog().info(" processing from " + srcDirXmi); + getLog().info(" processing from " + srcDirXmi); getLog().info(" processing to " + destDirModel); getLog().info(" with fullPackagePath = " + fullPackagePath); getLog().info(" with extractedPackages = " + extractedPackages); - + List<File> files = FileUtil.getFilteredElements(srcDirXmi, new FileFilter() { + + @Override public boolean accept(File pathname) { - return pathname != null - && pathname.getName().endsWith(".xmi"); + return pathname != null && pathname.getName().endsWith(".xmi"); } }, false); destDirModel.mkdirs(); - + TransformerFactory factory = TransformerFactory.newInstance(); URIResolver resolver = new ResourceResolver(); URL xsl = Resource.getURL(getStyleSheet()); @@ -131,19 +127,18 @@ getLog().info("file up-to-date : " + result); continue; } - Transformer transformer = factory - .newTransformer(new StreamSource(xsl.openStream())); - + Transformer transformer = factory.newTransformer(new StreamSource(xsl.openStream())); + // add parameter transformer.setParameter("fullPackagePath", fullPackagePath); transformer.setParameter("extraPackages", extractedPackages); - + transformer.setURIResolver(resolver); transformer.transform(new StreamSource(file), new StreamResult( new FileOutputStream(result))); - - + + } catch (Exception e) { throw new MojoExecutionException(e.getMessage(), e); } Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2ObjectModel.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2ObjectModel.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2ObjectModel.java 2009-05-14 12:26:12 UTC (rev 503) @@ -27,26 +27,19 @@ */ public class Xmi2ObjectModel extends Xmi2Model { - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#execute() - */ - @Override - public void execute() throws MojoExecutionException, MojoFailureException { - getLog().info("Conversion of XMI files into ObjectModel"); - super.execute(); - } + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + getLog().info("Conversion of XMI files into ObjectModel"); + super.execute(); + } - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#getExtention() - */ - public String getExtension() { - return "objectmodel"; - } + @Override + public String getExtension() { + return "objectmodel"; + } - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#getStyleSheet() - */ - protected String getStyleSheet() { - return "xmi1.2ToObjectModel.xsl"; - } + @Override + protected String getStyleSheet() { + return "xmi1.2ToObjectModel.xsl"; + } } Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2StateModel.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2StateModel.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/Xmi2StateModel.java 2009-05-14 12:26:12 UTC (rev 503) @@ -14,7 +14,6 @@ * 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>. ##%*/ - package org.nuiton.eugene.plugin; import org.apache.maven.plugin.MojoExecutionException; @@ -27,26 +26,19 @@ */ public class Xmi2StateModel extends Xmi2Model { - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#execute() - */ - @Override - public void execute() throws MojoExecutionException, MojoFailureException { - getLog().info("Conversion of XMI files into StateModel"); - super.execute(); - } - - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#getExtention() - */ - protected String getExtension() { - return "statemodel"; - } + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + getLog().info("Conversion of XMI files into StateModel"); + super.execute(); + } - /* - * @see org.nuiton.eugene.plugin.Xmi2Model#getStyleSheet() - */ - protected String getStyleSheet() { - return "xmi1.2ToStateModel.xsl"; - } + @Override + protected String getExtension() { + return "statemodel"; + } + + @Override + protected String getStyleSheet() { + return "xmi1.2ToStateModel.xsl"; + } } Modified: maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/helper/ResourceResolver.java =================================================================== --- maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/helper/ResourceResolver.java 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/main/java/org/nuiton/eugene/plugin/helper/ResourceResolver.java 2009-05-14 12:26:12 UTC (rev 503) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; /** * ResourceResolver is a URIResolver for XSL transformation. <br/> Copied: maven-eugene-plugin/trunk/src/site/rst/index.rst (from rev 501, maven-eugene-plugin/trunk/src/site/rst/fr/index.rst) =================================================================== (Binary files differ) Property changes on: maven-eugene-plugin/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Modified: maven-eugene-plugin/trunk/src/site/site.xml =================================================================== --- maven-eugene-plugin/trunk/src/site/site.xml 2009-05-14 12:26:03 UTC (rev 502) +++ maven-eugene-plugin/trunk/src/site/site.xml 2009-05-14 12:26:12 UTC (rev 503) @@ -28,6 +28,7 @@ <links> <item name="Eugene" href="http://lutingenerator.labs.libre-entreprise.org/eugene"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> </links> @@ -44,18 +45,14 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> -  - <menu ref="reports"/> </body>

1 0

[Lutingenerator-commits] r502 - in eugene/trunk: . src/main/java/org/nuiton/eugene src/site src/test/java/org/nuiton/eugene src/test/java/org/nuiton/eugene/models/state src/test/java/org/nuiton/eugene/models/ui/javaxml src/test/java/org/nuiton/eugene/models/xml src/test/java/org/nuiton/eugene/xmi/objectmodel src/test/java/org/nuiton/eugene/xmi/util
by tchemit＠users.labs.libre-entreprise.org 14 May '09

14 May '09

Author: tchemit Date: 2009-05-14 12:26:03 +0000 (Thu, 14 May 2009) New Revision: 502 Modified: eugene/trunk/pom.xml eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java eugene/trunk/src/site/site.xml eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java Log: migrate to nuiton Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/pom.xml 2009-05-14 12:26:03 UTC (rev 502) @@ -10,9 +10,14 @@ <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> <version>3.5.4</version> +  </parent> +  <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -20,9 +25,9 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuitonutil</artifactId> + <version>1.1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -107,13 +112,16 @@ <properties> -  - <labs.id>39</labs.id> + <redmine.project>eugene</redmine.project> -  +  + <labs.id>39</labs.id> <labs.project>lutingenerator</labs.project> + <helper.version>1.0.0-SNAPSHOT</helper.version> + <helper.licenseName>lgpl_v3</helper.licenseName> + <site.home.url>http://lutingenerator.labs.libre-entreprise.org</site.home.url> + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> - <lutinutil.version>1.0.6</lutinutil.version> </properties> <build> @@ -259,22 +267,7 @@ </activation> <build> <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - +  <plugin> <artifactId>maven-assembly-plugin</artifactId> Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -53,7 +53,7 @@ @Override public boolean getOverwrite() { - boolean overwrite = false; + boolean overwrite; if (parent == null) { overwrite = super.getOverwrite(); } else { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java 2009-05-14 12:26:03 UTC (rev 502) @@ -44,8 +44,8 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; -import org.codelutin.util.Resource; -import org.codelutin.util.ZipUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ZipUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -246,9 +246,6 @@ this.resolver = resolver; } - /** - * {@inheritDoc} - */ @Override public void execute() throws BuildException { @@ -572,6 +569,7 @@ return version; } + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-14 12:26:03 UTC (rev 502) @@ -80,6 +80,8 @@ /** * + * @param qualifiedName + * @return */ public static String getFilenameFromQualifiedName(String qualifiedName) { return qualifiedName.replace('.', File.separatorChar); @@ -87,6 +89,8 @@ /** * return all classifiers belonging to the given package recursively. The Collection may be empty. + * @param model + * @param packageName * @see ObjectModelClassifier * * @return a Collection containing all classifiers belonging to the given package recursively. @@ -103,6 +107,8 @@ } /** + * @param attribute + * @return * @see #getAttributeType(ObjectModelParameter, boolean) */ public static String getAttributeType(ObjectModelParameter attribute) { @@ -114,6 +120,7 @@ * ou le type defini si la cardinalité n'est pas multiple * * @param attribute + * @param useGenerics * @return attribute type */ public static String getAttributeType(ObjectModelParameter attribute, @@ -137,6 +144,7 @@ /** * Indicates if the specified attribute has a primitive type (byte, boolean, ...) + * @param attribute * @return true if the attribute has a primitive type */ public static boolean isPrimitiveAttributeType( @@ -153,6 +161,7 @@ /** * return an init value for the specified attribute + * @param attribute * @return a String with the corresponding attribute init value */ public static String getInitValue(ObjectModelAttribute attribute) { @@ -257,7 +266,8 @@ } /** - * Retourne la chaine de caractere dont on a besoin pour la declaration + * @param params + * @return la chaine de caractere dont on a besoin pour la declaration * des parametres d'une methode. */ public static String getMethodParameterDeclaration( @@ -275,7 +285,8 @@ } /** - * Retourne la chaine de caractere qui represente chaque nom de parametre + * @param params + * @return la chaine de caractere qui represente chaque nom de parametre * separer par des ','. */ public static String getMethodParameterListName( @@ -292,7 +303,8 @@ } /** - *@return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d + * @param attribute + * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d * si MaxMultiplicity == -1 ou > 1 */ public static boolean isNMultiplicity(ObjectModelAttribute attribute) { @@ -304,6 +316,7 @@ } /** + * @param attribute * @return true is the multiplicity of the given attribute is exactly 1 */ public static boolean isOneMultiplicity(ObjectModelAttribute attribute) { @@ -316,6 +329,8 @@ /** * + * @param word + * @return */ public static String toUpperCaseFirstLetter(String word) { return capitalize(word); @@ -333,12 +348,15 @@ /** * + * @param word + * @return */ public static String toLowerCaseFirstLetter(String word) { return word.substring(0, 1).toLowerCase() + word.substring(1); } /** + * @param attribute * @return true if the given attribute is a composition (composant of the reverse attribute) */ public static boolean isComposition(ObjectModelAttribute attribute) { @@ -421,7 +439,8 @@ } /** - * Retourne la chaine de caractere dont on a besoin pour la declaration + * @param operation + * @return la chaine de caractere dont on a besoin pour la declaration * des parametres d'une methode. */ public static String getOperationParametersListDeclaration( @@ -441,7 +460,8 @@ } /** - * Retourne la chaine de caractere qui represente chaque nom de parametre + * @param operation + * @return la chaine de caractere qui represente chaque nom de parametre * separer par des ','. */ public static String getOperationParametersListName( @@ -459,7 +479,8 @@ } /** - * Renvoie sous forme de String la liste des déclarations des attributes d'une classe donnée + * @param clazz + * @return sous forme de String la liste des déclarations des attributes d'une classe donnée */ public static String getClassAttributesListDeclaration( ObjectModelClass clazz) { @@ -547,6 +568,8 @@ * serialVersionUID. Exemple, returns "123456789L". * This id will change only if the type or the order of an attribute * changes. + * @param clazz + * @return the generated serialVersionUID */ public static String computeSerialVersionUID(ObjectModelClass clazz) { String query = clazz.getQualifiedName() + "#"; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java 2009-05-14 12:26:03 UTC (rev 502) @@ -38,6 +38,7 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter boolean modified = false; + //FIXME : ca sert a quoi duplique cette propriete qui existe dans FilterWriter ? StringWriter out = null; public MonitorWriter(StringWriter out) { @@ -53,16 +54,19 @@ return modified; } + @Override public void write(int c) throws IOException { super.write(c); modified = true; } + @Override public void write(char[] cbuf, int off, int len) throws IOException { super.write(cbuf, off, len); modified = true; } + @Override public void write(String str, int off, int len) throws IOException { super.write(str, off, len); modified = true; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -43,9 +43,9 @@ import org.nuiton.eugene.models.object.xml.ObjectModelImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; import org.nuiton.eugene.models.object.xml.ObjectModelImplTagValue; -import org.codelutin.util.FileUtil; -import org.codelutin.util.RecursiveProperties; -import org.codelutin.util.StringUtil; +import org.nuiton.util.FileUtil; +import org.nuiton.util.RecursiveProperties; +import org.nuiton.util.StringUtil; import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.xml.sax.SAXException; @@ -124,6 +124,7 @@ * @param destDir le répertoire dans lequel il faudra mettre les fichiers * générés */ + @Override public void generate(File[] files, File destDir) { setLastModifiedSource(files); ObjectModel objectModel = new ObjectModelImpl(); @@ -414,7 +415,9 @@ /** * Par defaut cette methode retourne le getName du model. Si l'on souhaite * utiliser la methode generateFromModel il vaut mieux surcharger cette - * m?thode + * methode + * @param model + * @return */ public String getFilenameForModel(ObjectModel model) { return model.getName(); @@ -423,6 +426,9 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param model + * @param packageName + * @return */ public String getFilenameForPackage(ObjectModel model, String packageName) { return packageName.replace('.', File.separatorChar); @@ -431,6 +437,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param interfacez + * @return */ public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar); @@ -439,6 +447,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param clazz + * @return */ public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar); @@ -447,6 +457,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param clazz + * @return */ public String getFilenameForClassifier(ObjectModelClassifier clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar); Modified: eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -32,8 +32,8 @@ import org.nuiton.eugene.models.state.StateModelStateChart; import org.nuiton.eugene.models.state.xml.DigesterStateModelRuleSet; import org.nuiton.eugene.models.state.xml.StateModelImpl; -import org.codelutin.util.FileUtil; -import org.codelutin.util.RecursiveProperties; +import org.nuiton.util.FileUtil; +import org.nuiton.util.RecursiveProperties; import org.xml.sax.SAXException; /** @@ -123,6 +123,7 @@ /** * Try to load property file, associated to current statemodel file * + * @param stateModelFile * @param stateModel */ protected void loadPropertyFile(File stateModelFile, @@ -170,6 +171,7 @@ * * @param stateModel Le modele d'état * @param destDir le dossier de destination + * @throws IOException */ public void generate(StateModel stateModel, File destDir) throws IOException { @@ -252,6 +254,7 @@ * * @param state * the state + * @param packageName * @return the filename */ public String getFilenameFromState(StateModelState state, String packageName) { @@ -266,6 +269,7 @@ * the output writer * @param state * the state + * @throws IOException */ public void generateFromState(Writer monitorOut, StateModelState state) throws IOException { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -32,7 +32,7 @@ import org.nuiton.eugene.models.ui.UIModelProperty; import org.nuiton.eugene.models.ui.impl.UIModelImpl; import org.nuiton.eugene.models.ui.javaxml.JavaXMLParser; -import org.codelutin.util.ResourceNotFoundException; +import org.nuiton.util.ResourceNotFoundException; import org.dom4j.DocumentException; import org.xml.sax.SAXException; @@ -63,6 +63,7 @@ return model; } + @Override public void generate(File[] tabUIFilesName, File destDir) { setLastModifiedSource(tabUIFilesName); for (int i = 0; i < tabUIFilesName.length; i++) { @@ -136,7 +137,8 @@ * Par defaut cette methode retourne le getName du model. Si l'on souhaite * utiliser la methode generateFromUIModel il vaut mieux surcharger cette * methode - */ + * @return le getName du model + */ public String getFilenameForUIModel(UIModel model) { return model.getRoot().getName().concat(".java"); } Modified: eugene/trunk/src/site/site.xml =================================================================== --- eugene/trunk/src/site/site.xml 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/site/site.xml 2009-05-14 12:26:03 UTC (rev 502) @@ -28,6 +28,7 @@ <links> <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> </links> @@ -36,15 +37,15 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" name="Javadoc (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" name="Bundle sans sources (zip)"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" name="Bundle complêt (zip)"/> </menu> Modified: eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.Test; /** Modified: eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -3,7 +3,6 @@ import java.io.Serializable; import java.util.List; -import org.nuiton.eugene.ImportsManager; import junit.framework.TestCase; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -27,7 +27,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Test; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,7 @@ import java.util.Map; import org.nuiton.eugene.StateModelGenerator; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -18,13 +18,13 @@ package org.nuiton.eugene.models.ui.javaxml; import java.io.File; -import java.util.ArrayList; +import java.util.List; import org.nuiton.eugene.models.ui.UIModel; import org.nuiton.eugene.models.ui.impl.UIModelChildImpl; import org.nuiton.eugene.models.ui.impl.UIModelEventImpl; import org.nuiton.eugene.models.ui.impl.UIModelObjectImpl; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Test; @@ -83,10 +83,10 @@ Assert.assertEquals(object.getType(), "java.awt.GridBagLayout"); // test sur un event de l'enfant - ArrayList children = (ArrayList) ui.getRoot().getChildren(); + List<?> children = (List<?>) ui.getRoot().getChildren(); UIModelChildImpl child = (UIModelChildImpl) children.get(0); - ArrayList events = (ArrayList) child.getObject().getEvents(); + List<?> events = (List<?>) child.getObject().getEvents(); UIModelEventImpl event = (UIModelEventImpl) events.get(0); Assert.assertEquals(event.getAction(), "actionPerformed"); @@ -94,7 +94,7 @@ // test sur constraint de l'enfant UIModelObjectImpl constraint = (UIModelObjectImpl) child.getConstraint().getValue(); - ArrayList argConstraint = (ArrayList) constraint.getArguments(); + List<?> argConstraint = (List<?>) constraint.getArguments(); Assert.assertEquals(constraint.getType(), "java.awt.GridBagConstraints"); @@ -104,14 +104,14 @@ Assert.assertTrue(child.getObject().getChildren().size() == 0); // test sur une contrainte string (BorderLayout) - ArrayList children1 = (ArrayList) ui1.getRoot().getChildren(); + List<?> children1 = (List<?>) ui1.getRoot().getChildren(); UIModelChildImpl child1 = (UIModelChildImpl) children1.get(0); Object constraint1 = child1.getConstraint().getValue(); Assert.assertEquals(constraint1, "Center"); // test sur le nombre d'enfants d'une Frame est correct - ArrayList children2 = (ArrayList) ui2.getRoot().getChildren(); + List<?> children2 = (List<?>) ui2.getRoot().getChildren(); Assert.assertTrue(children2.size() == 1); // test sur une contrainte d'un panel genere Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,7 @@ import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Test; /** Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,6 @@ import java.net.URISyntaxException; import java.net.URL; -import java.util.Collection; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -34,7 +33,7 @@ import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.xmi.util.ResourceResolver; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -66,6 +65,7 @@ * Apply XSLT Transformation. * * @param xmiFile + * @param modelFile * @return transformed file * @throws IOException * @throws TransformerException Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -39,7 +39,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.xmi.util.ResourceResolver; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java 2009-05-14 12:26:03 UTC (rev 502) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; /** * ResourceResolver is a URIResolver for XSL transformation. <br/>

1 0