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

r605 - in trunk: eugene maven-eugene-plugin
by echatellier＠users.nuiton.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 09:43:54 +0200 (Fri, 21 Aug 2009) New Revision: 605 Modified: trunk/eugene/changelog.txt trunk/maven-eugene-plugin/changelog.txt Log: Update changelog Modified: trunk/eugene/changelog.txt =================================================================== --- trunk/eugene/changelog.txt 2009-08-20 15:50:53 UTC (rev 604) +++ trunk/eugene/changelog.txt 2009-08-21 07:43:54 UTC (rev 605) @@ -1,4 +1,5 @@ 1.0.0 xxx xxx + * Add multiple models loading and restricted package generation * Add Enumeration support * Add Dependency support * Add ImportsManager Modified: trunk/maven-eugene-plugin/changelog.txt =================================================================== --- trunk/maven-eugene-plugin/changelog.txt 2009-08-20 15:50:53 UTC (rev 604) +++ trunk/maven-eugene-plugin/changelog.txt 2009-08-21 07:43:54 UTC (rev 605) @@ -1,4 +1,5 @@ 1.0.0 xxx xxx + * Add multiple models loading and restricted package generation * Recode EugenePlugin without ant * Move to org.nuiton groupid * Rename project to Eugene

1 0

r604 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 17:50:53 +0200 (Thu, 20 Aug 2009) New Revision: 604 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: fix stupid digester bug on log level debug ! Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-08-20 15:03:58 UTC (rev 603) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-08-20 15:50:53 UTC (rev 604) @@ -270,7 +270,7 @@ } if (log.isDebugEnabled()) { for (ObjectModelClass m : objectModel.getClasses()) { - log.debug("loaded class in objectmodel : " + m); + log.debug("loaded class in objectmodel : " + m.getName()); } } try {

1 0

r603 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 17:03:58 +0200 (Thu, 20 Aug 2009) New Revision: 603 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java Log: fix visibility of enum (used in a protected method so must be at least protected...) :public will be Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java 2009-08-20 15:00:42 UTC (rev 602) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java 2009-08-20 15:03:58 UTC (rev 603) @@ -29,7 +29,7 @@ * * @version $Revision: 496 $ */ -enum ObjectModelType { +public enum ObjectModelType { OBJECT_MODEL, OBJECT_MODEL_ENUMERATION, OBJECT_MODEL_CLASSIFIER, OBJECT_MODEL_CLASS, OBJECT_MODEL_INTERFACE }

1 0

r602 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 17:00:42 +0200 (Thu, 20 Aug 2009) New Revision: 602 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: add log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-08-20 14:57:30 UTC (rev 601) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-08-20 15:00:42 UTC (rev 602) @@ -268,6 +268,11 @@ } } } + if (log.isDebugEnabled()) { + for (ObjectModelClass m : objectModel.getClasses()) { + log.debug("loaded class in objectmodel : " + m); + } + } try { generate(objectModel, destDir); } catch (IOException eee) {

1 0

r601 - trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 16:57:30 +0200 (Thu, 20 Aug 2009) New Revision: 601 Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java Log: fix when using more than one model together Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-08-20 14:04:51 UTC (rev 600) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-08-20 14:57:30 UTC (rev 601) @@ -251,12 +251,15 @@ for (Generator generator : generators) { getLog().info("Apply " + generator.getClass().getSimpleName() + " generator"); - for (File modelFile : modelFiles) { - getLog().debug(" on " + modelFile.getAbsolutePath()); + //TC-20090829 fix when loading more than one model together... + generator.generate(modelFiles.toArray(new File[modelFiles.size()]), destDirGen); - // generation - generator.generate(modelFile, destDirGen); - } +// for (File modelFile : modelFiles) { +// getLog().debug(" on " + modelFile.getAbsolutePath()); +// +// // generation +// generator.generate(modelFile, destDirGen); +// } } }

1 0

r600 - in trunk/eugene/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by echatellier＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: echatellier Date: 2009-08-20 16:04:51 +0200 (Thu, 20 Aug 2009) New Revision: 600 Added: trunk/eugene/src/test/java/org/nuiton/eugene/ObjectModelGeneratorTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java Log: Ajout d'un test unitaire sur la restriction de la generation des packages Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 13:49:22 UTC (rev 599) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 14:04:51 UTC (rev 600) @@ -212,7 +212,7 @@ for (String generatedPackage : generatedPackages) { // cas egalité parfaites - if (packageName.equals(generatedPackage)) { + if (packageName != null && packageName.equals(generatedPackage)) { canGenerate = true; } @@ -221,7 +221,7 @@ if (!localGeneratedPackage.endsWith(".")) { localGeneratedPackage += "."; } - if (packageName.startsWith(localGeneratedPackage)) { + if (packageName != null && packageName.startsWith(localGeneratedPackage)) { canGenerate = true; } Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-08-20 13:49:22 UTC (rev 599) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-08-20 14:04:51 UTC (rev 600) @@ -33,10 +33,10 @@ * Test class for Generator Ant task. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 18 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class GeneratorTaskTest { Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: trunk/eugene/src/test/java/org/nuiton/eugene/ObjectModelGeneratorTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/ObjectModelGeneratorTest.java (rev 0) +++ trunk/eugene/src/test/java/org/nuiton/eugene/ObjectModelGeneratorTest.java 2009-08-20 14:04:51 UTC (rev 600) @@ -0,0 +1,96 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.nuiton.eugene; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.junit.Test; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelElementImpl; + +/** + * Test des fonctions de ObjectModelGenerator. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ObjectModelGeneratorTest { + + @Test + public void testCanGenerate() { + + ObjectModelGenerator generator = new ObjectModelGenerator(); + + // test with null generated list + Assert.assertTrue(generator.canGenerateElement(new ObjectModelElementImpl())); + Assert.assertTrue(generator.canGenerateElement(new ObjectModelClassImpl())); + + List<String> generatedPackages = new ArrayList<String>(); + generatedPackages.add("org.nuiton.eugene"); + + generator.setGeneratedPackages(generatedPackages); + + // Still true + Assert.assertTrue(generator.canGenerateElement(new ObjectModelElementImpl())); + // become false + Assert.assertFalse(generator.canGenerateElement(new ObjectModelClassImpl())); + + ObjectModelClassImpl testClass = new ObjectModelClassImpl(); + testClass.setPackage("org.nuiton.eugene"); + Assert.assertTrue(generator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton"); + Assert.assertFalse(generator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene.entities"); + Assert.assertTrue(generator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene2"); + Assert.assertFalse(generator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene2.entities"); + Assert.assertFalse(generator.canGenerateElement(testClass)); + + // test avec les generators recursifs + // sans faire de set sur le fils + ObjectModelGenerator childGenerator = new ObjectModelGenerator(generator); + + testClass.setPackage("org.nuiton.eugene"); + Assert.assertTrue(childGenerator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton"); + Assert.assertFalse(childGenerator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene.entities"); + Assert.assertTrue(childGenerator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene2"); + Assert.assertFalse(childGenerator.canGenerateElement(testClass)); + + testClass.setPackage("org.nuiton.eugene2.entities"); + Assert.assertFalse(childGenerator.canGenerateElement(testClass)); + + } +} Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/ObjectModelGeneratorTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision

1 0

r599 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 15:49:22 +0200 (Thu, 20 Aug 2009) New Revision: 599 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java Log: fix setter name Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 13:48:09 UTC (rev 598) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 13:49:22 UTC (rev 599) @@ -100,7 +100,7 @@ * * @param generatedPackages list of package to generate */ - public void SetGeneratedPackages(List<String> generatedPackages) { + public void setGeneratedPackages(List<String> generatedPackages) { this.generatedPackages = generatedPackages; }

1 0

r598 - trunk/eugene/src/main/java/org/nuiton/eugene
by echatellier＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: echatellier Date: 2009-08-20 15:48:09 +0200 (Thu, 20 Aug 2009) New Revision: 598 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ChildGenerator.java Log: Gestion des parent pour la restiction des package de generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ChildGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-08-20 13:31:07 UTC (rev 597) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-08-20 13:48:09 UTC (rev 598) @@ -73,6 +73,19 @@ return lastModified; } + @Override + protected boolean canGeneratePackage(String packageName) { + boolean canGenerate = true; + + if (parent == null) { + canGenerate = super.canGeneratePackage(packageName); + } else { + canGenerate = parent.canGeneratePackage(packageName); + } + + return canGenerate; + } + public void setParent(Generator parent) { this.parent = parent; setEncoding(parent.getEncoding());

1 0

r597 - trunk/eugene/src/main/java/org/nuiton/eugene
by echatellier＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: echatellier Date: 2009-08-20 15:31:07 +0200 (Thu, 20 Aug 2009) New Revision: 597 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java Log: Test que le package a tester commence par un des elements de la liste (ce n'est pas une ?\195?\169galit?\195?\169 parfaite) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 13:30:28 UTC (rev 596) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-08-20 13:31:07 UTC (rev 597) @@ -201,13 +201,33 @@ */ protected boolean canGeneratePackage(String packageName) { boolean canGenerate = true; - + // if not generation restriction, generate everything - if (generatedPackages != null && !generatedPackages.isEmpty() - && !generatedPackages.contains(packageName)) { + if (generatedPackages != null && !generatedPackages.isEmpty()) { canGenerate = false; + + // on doit donc tester que le package courant + // soit est egal a un des element de la liste + // soit commence par ca + for (String generatedPackage : generatedPackages) { + + // cas egalité parfaites + if (packageName.equals(generatedPackage)) { + canGenerate = true; + } + + // cas commence par (on ajout un point à la fin) + String localGeneratedPackage = generatedPackage; + if (!localGeneratedPackage.endsWith(".")) { + localGeneratedPackage += "."; + } + if (packageName.startsWith(localGeneratedPackage)) { + canGenerate = true; + } + + } } - + return canGenerate; } }

1 0

r596 - trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 15:30:28 +0200 (Thu, 20 Aug 2009) New Revision: 596 Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java Log: add excludeXmis parameter to exlude some xmi files (should really be improved...) Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java 2009-08-20 13:28:46 UTC (rev 595) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java 2009-08-20 13:30:28 UTC (rev 596) @@ -74,6 +74,13 @@ */ protected File srcDirXmi; /** + * Des noms de fichiers xmi qu'on veut pas traiter... + * + * @parameter expression="${generator.excludeXmis}" + * @since 1.0.0-rc-8 + */ + protected String excludeXmis; + /** * Répertoire cible des fichiers générés * * @parameter alias="srcGenDest" expression="${generator.srcGenDest}" default-value="target/generated-sources/models" @@ -193,8 +200,18 @@ ClassLoader fixedClassLoader = fixClassLoader(); + List<String> excludeXmisAsList = new ArrayList<String>(); + if (excludeXmis != null && !excludeXmis.isEmpty()) { + for (String s : excludeXmis.split(",")) { + excludeXmisAsList.add(s); + } + } for (File file : files) { try { + if (excludeXmisAsList.contains(file.getName())) { + getLog().info("skip excluded xmi : "+file); + continue; + } if (getLog().isDebugEnabled()) { getLog().debug("treate file : " + file); }

1 0