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

r901 - trunk
by tchemit＠users.nuiton.org 10 May '10

10 May '10

Author: tchemit Date: 2010-05-10 12:00:26 +0200 (Mon, 10 May 2010) New Revision: 901 Url: http://nuiton.org/repositories/revision/eugene/901 Log: use extension from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-09 17:10:24 UTC (rev 900) +++ trunk/pom.xml 2010-05-10 10:00:26 UTC (rev 901) @@ -278,15 +278,6 @@ <build> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-6</version> - </extension> - </extensions> - <pluginManagement> <plugins>

1 0

r900 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 09 May '10

09 May '10

Author: tchemit Date: 2010-05-09 19:10:24 +0200 (Sun, 09 May 2010) New Revision: 900 Url: http://nuiton.org/repositories/revision/eugene/900 Log: Add constantPrefix tagValue to specify a constant prefix on generated constant Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-09 12:33:53 UTC (rev 899) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-09 17:10:24 UTC (rev 900) @@ -42,6 +42,11 @@ public static final String STEREOTYPE_BEAN = "bean"; /** + * tag value to add on constants enumeration (or other incoming dev) + * a prefix to constant to generate. + */ + public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; + /** * dependency to add constants in interfaces via an enumeration. * * The literals of enumeration will be the value, and constant names will Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-09 12:33:53 UTC (rev 899) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-09 17:10:24 UTC (rev 900) @@ -107,11 +107,22 @@ ObjectModelEnumeration constants = (ObjectModelEnumeration) classifier; + // look if there is a constant_prefix tag value + String prefix = JavaGeneratorUtil.findTagValue( + JavaGeneratorUtil.TAG_CONSTANT_PREFIX, + constants, + null + ); + + if (prefix==null) { + prefix = ""; + } + // add all literal of dependency as constants in interface Collection<String> literals = constants.getLiterals(); for (String literal : literals) { - String constantName = getConstantName(literal); + String constantName = prefix + getConstantName(literal); addConstant(resultInterface, constantName,

1 0

r899 - trunk
by tchemit＠users.nuiton.org 09 May '10

09 May '10

Author: tchemit Date: 2010-05-09 14:33:53 +0200 (Sun, 09 May 2010) New Revision: 899 Url: http://nuiton.org/repositories/revision/eugene/899 Log: Utilisation de mavenpom4redmine 2.1.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-09 12:30:10 UTC (rev 898) +++ trunk/pom.xml 2010-05-09 12:33:53 UTC (rev 899) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.3</version> + <version>2.1.4</version> </parent> <artifactId>eugene</artifactId>

1 0

r898 - trunk
by tchemit＠users.nuiton.org 09 May '10

09 May '10

Author: tchemit Date: 2010-05-09 14:30:10 +0200 (Sun, 09 May 2010) New Revision: 898 Url: http://nuiton.org/repositories/revision/eugene/898 Log: use locales property instead of siteLocales Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-09 11:04:27 UTC (rev 897) +++ trunk/pom.xml 2010-05-09 12:30:10 UTC (rev 898) @@ -267,15 +267,13 @@  <projectId>eugene</projectId> - <javadoc.version>2.7</javadoc.version> <ant.version>1.7.1</ant.version> <processor.version>1.0.3</processor.version> <nuiton-utils.version>1.2.2</nuiton-utils.version> - <helper.version>1.2.4</helper.version>  - <siteLocales>en,fr</siteLocales> + <locales>en,fr</locales> </properties> <build>

1 0

r897 - trunk
by tchemit＠users.nuiton.org 09 May '10

09 May '10

Author: tchemit Date: 2010-05-09 13:04:27 +0200 (Sun, 09 May 2010) New Revision: 897 Url: http://nuiton.org/repositories/revision/eugene/897 Log: Evolution #584: Use maven-helper-plugin 1.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-08 17:07:11 UTC (rev 896) +++ trunk/pom.xml 2010-05-09 11:04:27 UTC (rev 897) @@ -272,7 +272,7 @@ <processor.version>1.0.3</processor.version> <nuiton-utils.version>1.2.2</nuiton-utils.version> - <helper.version>1.2.4-SNAPSHOT</helper.version> + <helper.version>1.2.4</helper.version>  <siteLocales>en,fr</siteLocales>

1 0

r896 - trunk
by tchemit＠users.nuiton.org 08 May '10

08 May '10

Author: tchemit Date: 2010-05-08 19:07:11 +0200 (Sat, 08 May 2010) New Revision: 896 Url: http://nuiton.org/repositories/revision/eugene/896 Log: make project deployable with maven 3.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-08 16:54:58 UTC (rev 895) +++ trunk/pom.xml 2010-05-08 17:07:11 UTC (rev 896) @@ -267,8 +267,9 @@  <projectId>eugene</projectId> + <javadoc.version>2.7</javadoc.version> <ant.version>1.7.1</ant.version> - + <processor.version>1.0.3</processor.version> <nuiton-utils.version>1.2.2</nuiton-utils.version> <helper.version>1.2.4-SNAPSHOT</helper.version> @@ -279,6 +280,15 @@ <build> + <extensions> +  + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-6</version> + </extension> + </extensions> + <pluginManagement> <plugins>

1 0

r895 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 08 May '10

08 May '10

Author: tchemit Date: 2010-05-08 18:54:58 +0200 (Sat, 08 May 2010) New Revision: 895 Url: http://nuiton.org/repositories/revision/eugene/895 Log: add headers Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java 2010-05-08 16:52:40 UTC (rev 894) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java 2010-05-08 16:54:58 UTC (rev 895) @@ -1,23 +1,23 @@ /* * #%L * EUGene :: EUGene - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2004 - 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 + * 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 + * + * 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% Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java 2010-05-08 16:52:40 UTC (rev 894) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java 2010-05-08 16:54:58 UTC (rev 895) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 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.java; import org.apache.commons.logging.Log;

1 0

r894 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 08 May '10

08 May '10

Author: tchemit Date: 2010-05-08 18:52:40 +0200 (Sat, 08 May 2010) New Revision: 894 Url: http://nuiton.org/repositories/revision/eugene/894 Log: add log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-08 16:52:09 UTC (rev 893) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-08 16:52:40 UTC (rev 894) @@ -54,6 +54,10 @@ @Override public void transformFromClass(ObjectModelClass clazz) { if (!canGenerate(clazz)) { + + if (log.isDebugEnabled()) { + log.debug("Skip generation for "+clazz.getQualifiedName()); + } return; } @@ -63,7 +67,7 @@ if (log.isDebugEnabled()) { log.debug("will generate "+ resultClass.getQualifiedName()); } - + ObjectModelClass resultClassImpl = generateImpl(clazz, resultClass); if (log.isDebugEnabled()) { @@ -75,7 +79,7 @@ resultClass.getQualifiedName()); } } - + addSuperClass(clazz, resultClass, resultClassImpl); addInterfaces(clazz, resultClass); @@ -102,7 +106,7 @@ createPropertyChangeSupport(resultClass); boolean hasAMultipleProperty = containsMutiple(properties); - + // Add helper operations if (hasAMultipleProperty) { createGetChildMethod(resultClass);

1 0

r893 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 08 May '10

08 May '10

Author: tchemit Date: 2010-05-08 18:52:09 +0200 (Sat, 08 May 2010) New Revision: 893 Url: http://nuiton.org/repositories/revision/eugene/893 Log: improve code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-05-08 16:51:38 UTC (rev 892) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-05-08 16:52:09 UTC (rev 893) @@ -152,8 +152,9 @@ * @param destDir dossier de destination pour le fichier généré * @param type type explicite d'ObjectModel */ - private void generateFromElements(Collection<? extends ObjectModelElement> elements, File destDir, - ObjectModelType type) { + private void generateFromElements(Collection<? extends ObjectModelElement> elements, + File destDir, + ObjectModelType type) { for (ObjectModelElement element : elements) { String filename = ""; @@ -189,8 +190,10 @@ * @param filename nom du fichier de sortie * @param type type d'ObjectModel */ - protected void generateFromElement(Object element, File destDir, String filename, - ObjectModelType type) { + protected void generateFromElement(Object element, + File destDir, + String filename, + ObjectModelType type) { // on a maintenant une restriction des elements a generer // c'est à dire un filtrage par package @@ -211,27 +214,33 @@ } try { StringWriter out = new StringWriter(); + MonitorWriter monitorOut = new MonitorWriter(out); + try { + switch (type) { + case OBJECT_MODEL: + generateFromModel(monitorOut, (ObjectModel) element); + break; + case OBJECT_MODEL_CLASSIFIER: + generateFromClassifier(monitorOut, (ObjectModelClassifier) element); + break; + case OBJECT_MODEL_INTERFACE: + generateFromInterface(monitorOut, (ObjectModelInterface) element); + break; + case OBJECT_MODEL_CLASS: + generateFromClass(monitorOut, (ObjectModelClass) element); + break; + case OBJECT_MODEL_ENUMERATION: + generateFromEnumeration(monitorOut, (ObjectModelEnumeration) element); + break; + } - switch (type) { - case OBJECT_MODEL: - generateFromModel(monitorOut,(ObjectModel)element); - break; - case OBJECT_MODEL_CLASSIFIER: - generateFromClassifier(monitorOut, (ObjectModelClassifier)element); - break; - case OBJECT_MODEL_INTERFACE: - generateFromInterface(monitorOut, (ObjectModelInterface)element); - break; - case OBJECT_MODEL_CLASS: - generateFromClass(monitorOut, (ObjectModelClass)element); - break; - case OBJECT_MODEL_ENUMERATION: - generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); - break; + write(outputFile, monitorOut); + + } finally { + monitorOut.close(); } - write(outputFile, monitorOut); } catch (Exception eee) { log.warn("Erreur lors de la génération du fichier " + outputFile); @@ -245,8 +254,9 @@ /** * Test if given element can be generated. * - * An element can be generated if his package is in the {@link #generatedPackages} list - * or if {@link #generatedPackages} is null or empty. + * An element can be generated if his package is in the + * {@link #generatedPackages} list or if {@link #generatedPackages} is + * null or empty. * * @param element element to test * @return generation allowed @@ -285,7 +295,8 @@ * @param packageName le nom du paquetage * @return le repertoire correspondant au paquetage */ - public String getFilenameForPackage(ObjectModel model, String packageName) { + public String getFilenameForPackage(ObjectModel model, + String packageName) { return packageName.replace('.', File.separatorChar); } @@ -326,21 +337,27 @@ // return enumeration.getQualifiedName().replace('.', File.separatorChar); } - public void generateFromModel(Writer output, ObjectModel model) throws IOException { + public void generateFromModel(Writer output, + ObjectModel model) throws IOException { } - public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + public void generateFromInterface(Writer output, + ObjectModelInterface interfacez) throws IOException { } - public void generateFromEnum(Writer output, ObjectModelEnumeration interfacez) throws IOException { + public void generateFromEnum(Writer output, + ObjectModelEnumeration interfacez) throws IOException { } - public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { + public void generateFromClass(Writer output, + ObjectModelClass clazz) throws IOException { } - public void generateFromClassifier(Writer output, ObjectModelClassifier clazz) throws IOException { + public void generateFromClassifier(Writer output, + ObjectModelClassifier clazz) throws IOException { } - public void generateFromEnumeration(Writer output, ObjectModelEnumeration enumeration) throws IOException { + public void generateFromEnumeration(Writer output, + ObjectModelEnumeration enumeration) throws IOException { } }

1 0

r892 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org 08 May '10

08 May '10

Author: tchemit Date: 2010-05-08 18:51:38 +0200 (Sat, 08 May 2010) New Revision: 892 Url: http://nuiton.org/repositories/revision/eugene/892 Log: improve code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-05-08 16:51:07 UTC (rev 891) +++ trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-05-08 16:51:38 UTC (rev 892) @@ -25,25 +25,23 @@ package org.nuiton.eugene; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.Model; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; -import org.nuiton.eugene.models.Model; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * AbstractGenerator - * + * <p/> * Created: 28 oct. 2009 * + * @author fdesbois <fdesbois(a)codelutin.com> * @param <M> type of Model - * - * @author fdesbois <fdesbois(a)codelutin.com> */ public abstract class AbstractGenerator<M extends Model> extends Template<M> { @@ -109,7 +107,7 @@ protected boolean isNewerThanSource(File file) { if (log.isDebugEnabled()) { log.debug("source date: " + getLastModifiedSource() - + " file date: " + file.lastModified() + "(" + file + ")"); + + " file date: " + file.lastModified() + " (" + file + ")"); } return file.lastModified() > getLastModifiedSource(); } @@ -120,7 +118,7 @@ /** * Test if given package is allowed for generation. - * + * <p/> * An element can be generated if his package is in the * {@link #generatedPackages} list or if {@link #generatedPackages} is null * or empty. @@ -166,43 +164,57 @@ } protected void write(File outputFile, MonitorWriter out) { - File write0utputFile = outputFile; - if (out.isModified()) { - try { - write0utputFile = outputFile.getCanonicalFile(); - if (!write0utputFile.getParentFile().exists()) { - boolean b = write0utputFile.getParentFile().mkdirs(); - if (!b) { - throw new IllegalStateException( - "could not create directory " + - write0utputFile.getParentFile()); - } + if (!out.isModified()) { + if (log.isDebugEnabled()) { + log.debug("skip generation of " + outputFile + ", No content."); + } + return; + } + try { + outputFile = outputFile.getCanonicalFile(); + + if (!outputFile.getParentFile().exists()) { + boolean b = outputFile.getParentFile().mkdirs(); + if (!b) { + throw new IllegalStateException( + "could not create directory " + + outputFile.getParentFile()); } + } - Writer output; - - String encoding = getEncoding(); - FileOutputStream stream = new FileOutputStream(write0utputFile); - if (encoding != null) { - if (log.isDebugEnabled()) { - log.debug("Force encoding to " + encoding + " : " + this); - } - output = new OutputStreamWriter(stream, encoding); - } else { - output = new OutputStreamWriter(stream); + Writer output = getWriter(outputFile); + try { + if (log.isDebugEnabled()) { + log.debug("Will generate file " + outputFile); } - try { - output.write(out.getBuffer().toString()); - } finally { - output.close(); - } - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Unable to write file : " + write0utputFile.getAbsolutePath(), eee); - } - throw new RuntimeException(eee); + output.write(out.getBuffer().toString()); + } finally { + output.close(); } + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn("Unable to write file : " + + outputFile.getAbsolutePath(), eee); + } + throw new RuntimeException(eee); } } + + protected Writer getWriter(File outputFile) throws IOException { + + FileOutputStream stream = new FileOutputStream(outputFile); + Writer output; + String encoding = getEncoding(); + if (encoding != null) { + if (log.isDebugEnabled()) { + log.debug("Force encoding to " + encoding + " : " + this); + } + output = new OutputStreamWriter(stream, encoding); + } else { + output = new OutputStreamWriter(stream); + } + return output; + + } }

1 0