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

r1005 - in trunk/eugene/src/main: resources/xsd xsl
by tchemit＠users.nuiton.org 27 Nov '10

27 Nov '10

Author: tchemit Date: 2010-11-28 00:26:43 +0100 (Sun, 28 Nov 2010) New Revision: 1005 Url: http://nuiton.org/repositories/revision/eugene/1005 Log: Evolution #1110: Expose dtd and xsd of objectmodel on site Evolution #1111: Update objectmodel xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd =================================================================== --- trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 23:26:43 UTC (rev 1005) @@ -35,6 +35,7 @@ <xsd:element name="enumeration" type="enumeration"/> </xsd:choice> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="version" type="xsd:string" use="optional"/> </xsd:complexType> <xsd:complexType name="classifier"> @@ -48,6 +49,7 @@ </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="package" type="xsd:string" use="required"/> + <xsd:attribute name="extern" type="xsd:boolean" use="optional"/> </xsd:complexType> <xsd:complexType name="class"> @@ -94,6 +96,7 @@ <xsd:attribute name="maxMultiplicity" type="xsd:integer" use="optional"/> <xsd:attribute name="navigable" type="xsd:boolean" use="optional"/> <xsd:attribute name="ordering" type="xsd:string" use="optional"/> + <xsd:attribute name="defaultValue" type="xsd:string" use="optional"/> </xsd:complexType> <xsd:complexType name="operation"> @@ -101,6 +104,7 @@ <xsd:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="returnParameter" type="returnParameter" minOccurs="1" maxOccurs="1"/> <xsd:element name="exceptionParameter" type="exceptionParameter" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="tagValue" type="tagValue" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="visibility" type="xsd:string" use="optional"/> Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-27 23:26:43 UTC (rev 1005) @@ -25,13 +25,15 @@ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt" xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns="http://nuiton.org/eugene/objectModel/v1" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" - xmlns:UML="org.omg.xmi.namespace.UML" xmlns:UML2="org.omg.xmi.namespace.UML2"> + xmlns:UML="org.omg.xmi.namespace.UML" + xmlns:UML2="org.omg.xmi.namespace.UML2"> <xsl:output method="xml" encoding="UTF-8" @@ -53,12 +55,13 @@ <xsl:template match="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement"> <xsl:element name="objectModel"> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="../@name"/> </xsl:attribute>  - <xsl:attribute name="version"> + <xsl:attribute name="version" xsi:nill=""> <xsl:variable name="versionTagId"> <xsl:value-of select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:TagDefinition[@name='version']/(a)xmi.id"/> </xsl:variable> Modified: trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-27 23:26:43 UTC (rev 1005) @@ -25,11 +25,13 @@ --> <xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xslt" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xalan="http://xml.apache.org/xslt" xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns="http://nuiton.org/eugene/objectModel/v1" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML"> @@ -49,6 +51,7 @@ <xsl:template match="uml:Model"> <xsl:element name="objectModel"> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="@name" /> </xsl:attribute>

1 0

r1004 - in trunk: . eugene/src/main/resources/xsd
by tchemit＠users.nuiton.org 27 Nov '10

27 Nov '10

Author: tchemit Date: 2010-11-27 23:09:33 +0100 (Sat, 27 Nov 2010) New Revision: 1004 Url: http://nuiton.org/repositories/revision/eugene/1004 Log: Evolution #1110: Expose dtd and xsd of objectmodel on site Fix objectmodel xsd (add targetNamespace attribute) Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd trunk/pom.xml Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd =================================================================== --- trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 17:50:05 UTC (rev 1003) +++ trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 22:09:33 UTC (rev 1004) @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?>  -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nuiton.org/eugene/objectModel/v1"> <xsd:complexType name="objectModel" mixed="true"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-27 17:50:05 UTC (rev 1003) +++ trunk/pom.xml 2010-11-27 22:09:33 UTC (rev 1004) @@ -389,6 +389,14 @@ <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-7</version> + </extension> + + </extensions> <pluginManagement> <plugins> @@ -444,4 +452,50 @@ <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> +  + <artifactId>maven-antrun-plugin</artifactId> + <executions> + + <execution> + <id>xsd-to-site</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> + <fileset dir="${basedir}/eugene/src/main/resources/xsd"> + <include name="**/*.xsd"/> + </fileset> + </copy> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> + <fileset dir="${basedir}/eugene/src/main/resources/dtd"> + <include name="**/*.dtd"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

1 0

r1003 - in trunk: eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/models/object maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org 27 Nov '10

27 Nov '10

Author: tchemit Date: 2010-11-27 18:50:05 +0100 (Sat, 27 Nov 2010) New Revision: 1003 Url: http://nuiton.org/repositories/revision/eugene/1003 Log: Evolution #1109: Add verbose flag in ModelReader (used after with eugene.verbose maven pom properties in the plugin) fix tag values import (when using tagValue) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-27 15:55:17 UTC (rev 1002) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-27 17:50:05 UTC (rev 1003) @@ -47,6 +47,16 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource; + protected boolean verbose; + + public boolean isVerbose() { + return verbose; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + protected void setLastModifiedSource(File... files) { for (File file : files) { if (file.lastModified() > getLastModifiedSource()) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-27 15:55:17 UTC (rev 1002) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-27 17:50:05 UTC (rev 1003) @@ -26,16 +26,7 @@ package org.nuiton.eugene.models.object; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.List; -import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,9 +43,20 @@ import org.nuiton.util.RecursiveProperties; import org.nuiton.util.StringUtil; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * To read object model files into an memory object model. - * + * <p/> * Created: 26 oct. 2009 * * @author fdesbois <fdesbois(a)codelutin.com> @@ -65,7 +67,7 @@ private static final Log log = LogFactory.getLog(ObjectModelReader.class); - public static final String TAGVALUE = "tagvalue"; + public static final String TAGVALUE = "tagvalue"; public static final String STEREOTYPE = "stereotype"; @@ -78,7 +80,7 @@ /** * Pattern to define tag values authorized at classifier level in the model * properties file. - * + * <p/> * L'expression réguliere match les chaines de type * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] * fr.isisfish.entities.Population.class.stereotype=entity @@ -89,7 +91,7 @@ * fr.isisfish.entities.Population.operation.getRegion.tagvalue.pk=... */ protected Pattern propertiesPattern = Pattern - .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype|tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?"); + .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype|tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?$"); /** * Pattern to define tag values authorized at model level in the model @@ -98,15 +100,15 @@ * @since 2.2.1 */ protected Pattern modelTagValuePattern = Pattern - .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); + .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); public static final String MODEL = "model"; /** * @param files les noms des fichiers existant contenant du XML représentant - * des ObjectModel. Il est automatiquement recherche un fichier de - * propriété associé a ce fichier pour pouvoir ajouter des - * stereotype ou des tag value sur les class, attribute ou operation + * des ObjectModel. Il est automatiquement recherche un fichier de + * propriété associé a ce fichier pour pouvoir ajouter des + * stereotype ou des tag value sur les class, attribute ou operation */ @Override public ObjectModel read(File... files) { @@ -140,14 +142,14 @@ if (!propFile.exists()) { if (log.isInfoEnabled()) { log.info("Pas de fichier de propriete " + propFile - + " associé au model"); + + " associé au model"); } } else { if (log.isInfoEnabled()) { log.info("Lecture du fichier de propriete " + propFile - + " associé au model"); + + " associé au model"); } - loadModelPropertiesFile(propFile, model); + loadTagValues(propFile, model); } } if (log.isDebugEnabled()) { @@ -164,22 +166,22 @@ * attributes if needed. * * @param clazz where the attribute need to be find - * @param name attribute name to find + * @param name attribute name to find * @return the attribute found or null */ protected ObjectModelAttribute getAttribute(ObjectModelClass clazz, String name) { - ObjectModelAttribute result = clazz.getAttribute(name); + ObjectModelAttribute result = clazz.getAttribute(name); // Ano #619 : FD-2010-05-17 : Specific case for Association class : // check on participant attributes if (result == null && clazz instanceof ObjectModelAssociationClassImpl) { if (log.isDebugEnabled()) { log.debug("Attribute " + name + " not found from " + - clazz.getQualifiedName() +" association class. " + - "Will check participants..."); + clazz.getQualifiedName() + " association class. " + + "Will check participants..."); } - ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)clazz; + ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) clazz; for (ObjectModelAttribute participant : assoc.getParticipantsAttributes()) { if (participant.getName().equals(name)) { result = participant; @@ -190,7 +192,8 @@ return result; } - public Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + public Properties loadTagValues(File propFile, ObjectModel model) { + Properties prop = new RecursiveProperties(); try { FileInputStream inStream = new FileInputStream(propFile); @@ -205,9 +208,17 @@ + propFile, eee); } } - // on ajoute les proprietes du fichier associe au model - for (Enumeration<Object> e = prop.keys(); e.hasMoreElements();) { - String key = (String) e.nextElement(); + + // number of sucessfull imported tag values into model + int numberImportedTagValues = 0; + + // get all the tagvalues keys and sort them + List<String> keys = new ArrayList<String>(); + CollectionUtils.addAll(keys, prop.keys()); + Collections.sort(keys); + + // for each tag value try to import in in model + for (String key : keys) { String value = prop.getProperty(key); if (key.startsWith(MODEL)) { @@ -223,15 +234,6 @@ continue; } String tag = matcher.group(2); -// if (!key.startsWith("model.tagvalue.") || -// !key.startsWith("model.tagValue.")) { -// if (log.isWarnEnabled()) { -// log.warn("Invalid tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); -// } -// continue; -// } -// String tag = key.substring("model.tagvalue.".length()); - ObjectModelImpl modelImpl = (ObjectModelImpl) model; if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { @@ -239,7 +241,11 @@ // property modelImpl.setVersion(value); } + if (isVerbose()) { + log.info("import model tag value " + key); + } modelImpl.addTagValue(tag, value); + numberImportedTagValues++; continue; } @@ -264,7 +270,7 @@ String target = matcher.group(2); String targetName = matcher.group(3); // type is stereotype or tagvalue - String type = matcher.group(4); + String type = matcher.group(4).toLowerCase(); String tag = matcher.group(5); if (log.isDebugEnabled()) { @@ -346,8 +352,18 @@ } } + if (isVerbose()) { + log.info("import tag value " + key + " --> " + fqn + ":" + target + ":" + targetName + ":" + type + ":" + tag+" = " + value); + } + numberImportedTagValues++; } - + if (log.isInfoEnabled()) { + log.info(numberImportedTagValues + " tag values were succesfull imported from " + propFile); + } + int nbFailed = prop.size() - numberImportedTagValues; + if (nbFailed > 0 && isVerbose()) { + log.info(nbFailed + " tag values failed to be imported from " + propFile); + } return prop; } } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-27 15:55:17 UTC (rev 1002) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-27 17:50:05 UTC (rev 1003) @@ -282,6 +282,8 @@ if (configuration.isVerbose()) { getLog().info("Will read " + filesToRead.length + " model(s)."); } + + getModelReader().setVerbose(configuration.isVerbose()); // read memory model from all files models Model model = getModelReader().read(filesToRead);

1 0

r1002 - in trunk: eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/models/object eugene/src/main/java/org/nuiton/eugene/writer maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator
by tchemit＠users.nuiton.org 27 Nov '10

27 Nov '10

Author: tchemit Date: 2010-11-27 16:55:17 +0100 (Sat, 27 Nov 2010) New Revision: 1002 Url: http://nuiton.org/repositories/revision/eugene/1002 Log: - Anomalie #1105: Clone classifier is not correct and can't work... - Anomalie #1106: Transformer api is not correct (can not use the previous transformer in the applyTemplate method) - Evolution #1107: Improve MetaTransformer api - improve @author on my files Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -25,26 +25,25 @@ 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.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Abstract meta transformer which contains some templates to apply to an * incoming model. - * + * <p/> * Using the {@link #getExcludeTemplates()} to restrict use of some templates. - * + * <p/> * Created: 20 déc. 2009 * + * @author tchemit <chemit(a)codelutin.com> * @param <M> type of Model - * - * @author Tony Chemit <chemit(a)codelutin.com> * @since 2.0.0 */ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractGenerator<M> { @@ -52,30 +51,132 @@ private static final Log log = LogFactory.getLog(AbstractMetaTransformer.class); - private final Class<? extends Template<M>>[] transformers; + /** + * Transformers to apply before using templates. + * <p/> + * It will replace each time the input model by the generated output model. + * + * @since 2.2.1 + */ + protected Class<? extends Transformer<M, M>>[] transformerTypes; + /** + * Templates to apply to the model. + * + * @since 2.2.1, replace the old transformers field. + */ + protected Class<? extends Template<M>>[] templateTypes; + + protected AbstractMetaTransformer() { + } + + /** + * @param templateTypes templates to apply on model + * @deprecated since 2.2.1, prefer use the default constructor, the invoke + * setters {@link #setTemplateTypes(Class[])} and + * {@link #setTransformerTypes(Class[])}. + */ + @Deprecated public AbstractMetaTransformer( - Class<? extends Template<M>>... transformers) { - this.transformers = transformers; + Class<? extends Template<M>>... templateTypes) { + this.templateTypes = templateTypes; } + /** + * Validates the incoming given {@code model}. + * + * <b>Note :</b> If model is not valid, then nothing will be apply on the model + * (no transformer nor templates) in the {@link #applyTemplate(Model, File)}. + * + * @param model the incoming model to validate + * @return {@code true} if model is valid, {@code false} otherwise. + */ protected abstract boolean validateModel(M model); + public Class<? extends Transformer<M, M>>[] getTransformerTypes() { + return transformerTypes; + } + + public Class<? extends Template<M>>[] getTemplateTypes() { + return templateTypes; + } + + public void setTransformerTypes(Class<? extends Transformer<M, M>>... transformerTypes) { + this.transformerTypes = transformerTypes; + } + + public void setTemplateTypes(Class<? extends Template<M>>... templateTypes) { + this.templateTypes = templateTypes; + } + @Override public void applyTemplate(M model, File destDir) throws IOException { boolean isValid = validateModel(model); if (!isValid) { - //On n'empeche pas la génération si le modèle n'est pas valide - + // Can not generate is model is not valid return; } - List<Template<M>> templates = getTemplates(); + // obtain transformers instances + List<Transformer<M, M>> transformers = + getInstances(getTransformerTypes()); + // transforme model to obtain the final model used by templates + M currentModel = applyTransformers(model, transformers); + + // obtains templates instances + List<Template<M>> templates = getInstances(getTemplateTypes()); + + // apply templates to model + applyTemplates(currentModel, templates, destDir); + } + + /** + * given an incoming {@code model}, chain transformations of the mode + * using the given {@code transformers}. + * + * Will aplly the transformers in the order given by the list, using as + * incoming model to a transformer the last (or incoming for the first transformer) + * model. + * + * @param model incoming model to transform + * @param transformers list of transformers to apply to the model + * @return the final transformed model + * @since 2.2.1 + */ + protected M applyTransformers(M model, + List<? extends Transformer<M, M>> transformers) { + M currentModel = model; + for (Transformer<M, M> template : transformers) { + if (log.isDebugEnabled()) { + log.debug("call transformer : " + + template.getClass().getSimpleName()); + } + // transform from the current model + template.transform(currentModel); + + // current model become the transformed model + currentModel = template.getOutputModel(); + } + return currentModel; + } + + /** + * Generates to the given {@code destination directory} using the given + * templates on the incoming given {@code model}. + * + * @param model the incoming model to be used by templates + * @param templates templates to apply the incoming model + * @param destDir the destination directory where to generate + * @throws IOException if any IO errors while generating files + * @since 2.2.1 + */ + protected void applyTemplates(M model, + List<? extends Template<M>> templates, + File destDir) throws IOException { for (Template<M> template : templates) { - // log if (log.isDebugEnabled()) { log.debug("call template : " + template.getClass().getSimpleName()); @@ -84,9 +185,57 @@ } } + protected <T extends Template<M>> List<T> getInstances(Class<? extends T>[] types) { + List<T> result = new ArrayList<T>(); + if (types != null) { + for (Class<? extends T> generatorClass : types) { + T generator; + if (getExcludeTemplates().contains(generatorClass.getName())) { + + // exclude generator + if (log.isInfoEnabled()) { + log.info("exclude generator " + generatorClass); + } + continue; + } + + // instanciate the template + try { + generator = generatorClass.newInstance(); + + // init template + generator.setConfiguration(getConfiguration()); + + if (generator instanceof AbstractGenerator) { + ((AbstractGenerator) generator).setParent(this); + } +// if (generator instanceof Transformer) { +// generator.setProperties(properties); +// } + + // will use it + result.add(generator); + } catch (Exception e) { + + if (log.isErrorEnabled()) { + log.error("Could not instanciate template " + + generatorClass, e); + } + throw new RuntimeException(e); + } + } + } + return result; + } + + /** + * @return the instances of templates to apply to the model. + * @deprecated since 2.2.1, prefer use the {@link #getInstances(Class[])} + */ + @Deprecated protected List<Template<M>> getTemplates() { List<Template<M>> result = new ArrayList<Template<M>>(); - for (Class<? extends Template<M>> generatorClass : getTransformers()) { + for (Class<? extends Template<M>> generatorClass : templateTypes) { Template<M> generator; if (getExcludeTemplates().contains(generatorClass.getName())) { // exclude generator @@ -101,7 +250,7 @@ // init template generator.setConfiguration(getConfiguration()); - + if (generator instanceof AbstractGenerator) { ((AbstractGenerator<M>) generator).setParent(this); } @@ -122,7 +271,12 @@ return result; } + /** + * @return the template types to apply + * @deprecated since 2.2.1, use the method {@link #getTemplateTypes()} instead. + */ + @Deprecated public Class<? extends Template<M>>[] getTransformers() { - return transformers; + return templateTypes; } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -28,6 +28,9 @@ import java.io.File; import java.io.IOException; import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.Model; /** @@ -42,6 +45,9 @@ public abstract class Transformer<I extends Model, O extends Model> extends Template<I> { + /** Logger */ + private static final Log log = LogFactory.getLog(Transformer.class); + /** * Output generator, to generate files from Output model. * @@ -80,7 +86,10 @@ */ protected void init(I model) { this.model = model; - previousTransformer = initPreviousTransformer(); + // tchemit 2010-11-26 : this is not the good place to init a previous + // transformer : once coming here, we lost our chance to use the previousTransformer +// previousTransformer = initPreviousTransformer(); + outputTemplate = initOutputTemplate(); // build output template configuration @@ -92,7 +101,7 @@ new DefaultTemplateConfiguration(properties); // push back to outputPropertie the all configuration - //FIXME tchemit 20100516 Should rethink this... + //FIXME tchemit 2010-05-16 Should rethink this... outputProperties = properties; outputTemplate.setConfiguration(outconfig); @@ -168,16 +177,27 @@ */ @Override public void applyTemplate(I model, File destDir) throws IOException { - // previous transformation + + // init previous transformer + previousTransformer = initPreviousTransformer(); + + // previous transformation if (previousTransformer != null) { + + if (isVerbose()) { + log.info("Use previousTransformer " + previousTransformer); + } // transformation only, no application of next template previousTransformer.transform(model); - // current transformation + + // current transformation from the ouput model of previous transformer transform(previousTransformer.getOutputModel()); } else { - // current transformation + + // current transformation directly from the incoming model transform(model); } + // after template application getOutputTemplate().applyTemplate(getOutputModel(), destDir); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -37,7 +37,7 @@ * <p/> * Created: 17 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Revision$ * <p/> * Mise a jour: $Date$ par : Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -36,7 +36,7 @@ /** * Created: 17 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Revision$ * <p/> * Mise a jour: $Date$ par : Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -25,6 +25,7 @@ package org.nuiton.eugene.java; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -369,6 +370,17 @@ } /** + * Adds a navigable flag to the given {@code attribute}. + * + * @param attribute the attribute on which the navigable flag will be setted + * @param navigable the navigable flag to set + * @since 2.2.1 + */ + public void setNavigable(ObjectModelAttribute attribute, boolean navigable) { + builder.setNavigable(attribute, navigable); + } + + /** * Adds a comment to the given {@code element}. * * @param element the element on which the comment will be added. @@ -451,9 +463,7 @@ addException(outputOperation, exception); } - for (Map.Entry<String, String> tagValue : source.getTagValues().entrySet()) { - addTagValue(destination, tagValue.getKey(), tagValue.getValue()); - } + cloneTagValues(source, outputOperation); return outputOperation; } @@ -474,7 +484,13 @@ ObjectModelClassifier destination, boolean cloneDocumentation, ObjectModelModifier... modifiers) { - ObjectModelOperation outputOperation = cloneOperationSignature(source, destination, cloneDocumentation, modifiers); + ObjectModelOperation outputOperation = cloneOperationSignature( + source, + destination, + cloneDocumentation, + modifiers + ); + setOperationBody(outputOperation, source.getBodyCode()); return outputOperation; } @@ -498,9 +514,7 @@ source.getName(), source.getType(), source.getDefaultValue(), modifiers); - for (Map.Entry<String, String> tagValue : source.getTagValues().entrySet()) { - addTagValue(outputAttribute, tagValue.getKey(), tagValue.getValue()); - } + cloneTagValues(source, outputAttribute); if (cloneDocumentation) { setDocumentation(outputAttribute, source.getDocumentation()); @@ -512,9 +526,41 @@ setMinMultiplicity(outputAttribute, source.getMinMultiplicity()); setMaxMultiplicity(outputAttribute, source.getMaxMultiplicity()); + setNavigable(outputAttribute,source.isNavigable()); return outputAttribute; } + + /** + * Copy all tag values fro the given {@code source} to the given + * {@code destination}. + * + * @param source the source element + * @param destination the destination element + * @since 2.2.1 + */ + protected void cloneTagValues(ObjectModelElement source, + ObjectModelElement destination) { + Map<String, String> tags = source.getTagValues(); + for (Map.Entry<String, String> entry : tags.entrySet()) { + addTagValue(destination,entry.getKey(),entry.getValue()); + } + } + + /** + * + * @param source + * @param destination + * @since 2.2.1 + */ + protected void cloneStereotypes(ObjectModelClassifier source, + ObjectModelClassifier destination) { + + Collection<String> stereotypes = source.getStereotypes(); + for (String stereotype : stereotypes) { + addStereotype(destination,stereotype); + } + } /** * copy attributes, interfaces declartion and operation of a given classifier @@ -526,14 +572,41 @@ * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} * * @param source the classifier to clone from the source model - * @param destination + * @param destination where to clone the given source one * @param copyDocumentation flag to add documentation if some found in model * @since 2.1.2 + * @deprecated since 2.2.1, prefer use the {@link #cloneClass(ObjectModelClass, boolean)} method */ + @Deprecated protected void copyClassifier(ObjectModelClassifier source, ObjectModelClassifier destination, boolean copyDocumentation) { - + + cloneClassifier(source, destination, copyDocumentation); + } + + /** + * copy attributes, interfaces declartion and operation of a given classifier + * into another classifier. + * + * class-specific, enumeration-specific and interface-specific features + * of the given classifier <strong>will not</strong> be present in the clone. + * To copy those specific elements, use + * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} + * + * @param source the classifier to clone from the source model + * @param destination where to clone the given source one + * @param copyDocumentation flag to add documentation if some found in model + * @since 2.2.1 + */ + protected void cloneClassifier(ObjectModelClassifier source, + ObjectModelClassifier destination, + boolean copyDocumentation) { + + cloneTagValues(source, destination); + + cloneStereotypes(source, destination); + for (ObjectModelAttribute attribute : source.getAttributes()) { cloneAttribute(attribute, destination, copyDocumentation); } @@ -547,6 +620,7 @@ } } + /** * creates a clone of the given {@code source} class in the output model * and clones attributes, inheritence declarations and operations into the @@ -559,9 +633,10 @@ */ public ObjectModelClass cloneClass(ObjectModelClass source, boolean cloneDocumentation) { - ObjectModelClass outputClass = createClass(source.getName(), - source.getPackageName()); - copyClassifier(source, outputClass, cloneDocumentation); + ObjectModelClass outputClass = + createClass(source.getName(), source.getPackageName()); + + cloneClassifier(source, outputClass, cloneDocumentation); if (source.getSuperclasses().size() > 1) { log.warn(source.getQualifiedName() + " has multiple inheritence, some of them will be ignored"); @@ -573,13 +648,15 @@ // TODO 20100812 bleny is there something to do with discriminator for superClass ? } - for (ObjectModelClassifier innerClassifier : source.getInnerClassifiers()) { - ObjectModelClassifier innerClassifierClone = cloneClassifier(innerClassifier, cloneDocumentation); - addInnerClassifier(outputClass, - ObjectModelType.OBJECT_MODEL_CLASSIFIER, - innerClassifierClone.getName()); + if (!CollectionUtils.isEmpty(source.getInnerClassifiers())) { + for (ObjectModelClassifier classifier : source.getInnerClassifiers()) { + ObjectModelClassifier innerClassifierClone = + cloneClassifier(classifier, cloneDocumentation); + addInnerClassifier(outputClass, + ObjectModelType.OBJECT_MODEL_CLASSIFIER, + innerClassifierClone.getName()); + } } - return outputClass; } @@ -595,9 +672,10 @@ */ public ObjectModelInterface cloneInterface(ObjectModelInterface source, boolean cloneDocumentation) { - ObjectModelInterface outputInterface = createInterface(source.getName(), source.getPackageName()); + ObjectModelInterface outputInterface = + createInterface(source.getName(), source.getPackageName()); - copyClassifier(source, outputInterface, cloneDocumentation); + cloneClassifier(source, outputInterface, cloneDocumentation); // nothing more to do. copyClassifier already done the job return outputInterface; @@ -618,7 +696,7 @@ ObjectModelEnumeration outputEnumeration = createEnumeration(source.getName(), source.getPackageName()); - copyClassifier(source, outputEnumeration, cloneDocumentation); + cloneClassifier(source, outputEnumeration, cloneDocumentation); for (String literal : source.getLiterals()) { addLiteral(outputEnumeration, literal); @@ -759,7 +837,7 @@ addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); boolean useI18n = false; for (ObjectModelAttribute attr : input.getAttributes()) { - //TC-20100225 only treate navigable relations + //tchemit-20100225 only treate navigable relations if (attr.isNavigable()) { useI18n=true; addI18n(buffer, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -686,4 +686,17 @@ impl.setMaxMultiplicity(multiplicity); } + + /** + * Set the navigable flag of an attribute in the model. + * + * @param attribute where the navigable flag will be setted + * @param navigable navigable flag value to set + * @since 2.2.1 + */ + public void setNavigable(ObjectModelAttribute attribute, + boolean navigable) { + ObjectModelAttributeImpl impl = (ObjectModelAttributeImpl) attribute; + impl.setNavigable(navigable); + } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -32,7 +32,7 @@ * <p/> * Created: 04 mars. 2010 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Revision$ * @since 2.0.0 */ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -40,7 +40,7 @@ * <p/> * Created: 17 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Revision$ * @since 2.0.0 */ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -48,7 +48,7 @@ * <p/> * Created: 17 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.writer.ChainedWriterEngine" role-hint="default" * @since 2.0.0 Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2010-11-26 17:24:18 UTC (rev 1001) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2010-11-27 15:55:17 UTC (rev 1002) @@ -46,7 +46,7 @@ * * Created: 17 avril 2009 * -* @author tony Chemit <chemit(a)codelutin.com> +* @author tchemit <chemit(a)codelutin.com> * @version $Revision$ * * Mise a jour: $Date$

1 0

r1001 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 18:24:18 +0100 (Fri, 26 Nov 2010) New Revision: 1001 Url: http://nuiton.org/repositories/revision/eugene/1001 Log: fix tag value detection at model level Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 18:40:54 UTC (rev 1000) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-26 17:24:18 UTC (rev 1001) @@ -98,7 +98,7 @@ * @since 2.2.1 */ protected Pattern modelTagValuePattern = Pattern - .compile("model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)+)"); + .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); public static final String MODEL = "model"; @@ -190,7 +190,7 @@ return result; } - protected Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + public Properties loadModelPropertiesFile(File propFile, ObjectModel model) { Properties prop = new RecursiveProperties(); try { FileInputStream inStream = new FileInputStream(propFile);

1 0

r1000 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 19:40:54 +0100 (Thu, 25 Nov 2010) New Revision: 1000 Url: http://nuiton.org/repositories/revision/eugene/1000 Log: Anomalie #1100: User not warned when an entry of the model properties file can not be attached Evolution #1098: Improve tagValue detection Evolution #1099: Can use tagvalue or now also tagValue in model properties file Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 09:04:45 UTC (rev 999) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 18:40:54 UTC (rev 1000) @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.List; +import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.digester.Digester; @@ -50,7 +51,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.RecursiveProperties; import org.nuiton.util.StringUtil; -import org.xml.sax.SAXException; /** * To read object model files into an memory object model. @@ -76,6 +76,9 @@ public static final String CLASS = "class"; /** + * Pattern to define tag values authorized at classifier level in the model + * properties file. + * * L'expression réguliere match les chaines de type * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] * fr.isisfish.entities.Population.class.stereotype=entity @@ -86,8 +89,17 @@ * fr.isisfish.entities.Population.operation.getRegion.tagvalue.pk=... */ protected Pattern propertiesPattern = Pattern - .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation)\\.)(?:([_a-z0-9][_a-zA-Z0-9]*)\\.)?(?:(stereotype|tagvalue)\\.?)([_a-z0-9][_a-zA-Z0-9]*)?"); + .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype|tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?"); + /** + * Pattern to define tag values authorized at model level in the model + * properties file. + * + * @since 2.2.1 + */ + protected Pattern modelTagValuePattern = Pattern + .compile("model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)+)"); + public static final String MODEL = "model"; /** @@ -114,14 +126,10 @@ try { digester.push(model); model = (ObjectModel) digester.parse(file); - } catch (IOException e) { + } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Unable to parse ObjectModel input file : " + file, e); } - } catch (SAXException e) { - if (log.isWarnEnabled()) { - log.warn("Unable to parse ObjectModel input file : " + file, e); - } } // recherche est charge le fichier propriete associe au modele @@ -129,7 +137,6 @@ String ext = FileUtil.extension(file); String name = FileUtil.basename(file, "." + ext); File propFile = new File(dir, name + ".properties"); - RecursiveProperties prop = new RecursiveProperties(); if (!propFile.exists()) { if (log.isInfoEnabled()) { log.info("Pas de fichier de propriete " + propFile @@ -140,145 +147,7 @@ log.info("Lecture du fichier de propriete " + propFile + " associé au model"); } - try { - FileInputStream inStream = new FileInputStream(propFile); - try { - prop.load(inStream); - } finally { - inStream.close(); - } - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible de lire le fichier de propriete " - + propFile, eee); - } - } - - // on ajoute les proprietes du fichier associe au model - for (Enumeration<Object> e = prop.keys(); e.hasMoreElements();) { - String key = (String) e.nextElement(); - String value = prop.getProperty(key); - - if (key.startsWith(MODEL)) { - - // model tag value - - if (!key.startsWith("model.tagvalue.")) { - if (log.isWarnEnabled()) { - log.warn("only tagvalue is allowed on model in properties"); - } - continue; - } - String tag = key.substring("model.tagvalue.".length()); - - ObjectModelImpl modelImpl = (ObjectModelImpl) model; - if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { - - // push directly the version in the model version - // property - modelImpl.setVersion(value); - } - ObjectModelImplTagValue tagvalue = new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - modelImpl.addTagValue(tagvalue); - continue; - } - - // element tag value - Matcher matcher = propertiesPattern.matcher(key); - - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "'"); - } - - if (matcher.find()) { - // fqn is fully qualified name of class - String fqn = matcher.group(1); - fqn = StringUtil.substring(fqn, 0, -1); // remove ended - // . - // target is class, attribute or operation - String target = matcher.group(2); - String targetName = matcher.group(3); - // type is stereotype or tagvalue - String type = matcher.group(4); - String tag = matcher.group(5); - - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "' => " - + "fqn:" + fqn + " target:" + target - + " targetName:" + targetName - + " type:" + type + " tag:" + tag); - } - - ObjectModelClassifier omc = model.getClassifier(fqn); - if (omc == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find classifier for " + - fqn + " from tag value " + key); - } - continue; - } - - if (!(omc instanceof ObjectModelClassifierImpl)) { - // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message - if (log.isWarnEnabled()) { - log.warn("Can't add properties to model, " + - "it's not an " + - "ObjectModelClassifierImpl : " + - omc.getQualifiedName()); - } - continue; - } - - List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); - if (CLASS.equals(target)) { - elems.add(omc); - } else if (ATTRIBUTE.equals(target)) { - - ObjectModelAttribute attr = - getAttribute((ObjectModelClass)omc, targetName); - elems.add(attr); - - } else if (OPERATION.equals(target)) { - elems.addAll(omc.getOperations(targetName)); - } - for (Object elem1 : elems) { - if (elem1 == null) { - if (log.isWarnEnabled()) { - log.warn("can not attach tagValue " + - key + " on a null element."); - } - continue; - } - ObjectModelElementImpl elem = - (ObjectModelElementImpl) elem1; - if (STEREOTYPE.equals(type)) { - // pour les stereotypes - ObjectModelImplRef stereotype = new ObjectModelImplRef(); - stereotype.setName(value); - elem.addStereotype(stereotype); - continue; - } - - if (TAGVALUE.equals(type)) { - // pour les tagvalues - ObjectModelImplTagValue tagvalue = - new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - if (log.isDebugEnabled()) { - log.debug("tagValue:" + tagvalue - + ", tag:" + tag - + ", value:" + value - + ", element:" + elem); - } - elem.addTagValue(tagvalue); - - } - } - } - } + loadModelPropertiesFile(propFile, model); } } if (log.isDebugEnabled()) { @@ -287,13 +156,6 @@ } } return model; - /*try { - generate(objectModel, destDir); - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Unable to generate for file", eee); - } - }*/ } /** @@ -327,4 +189,165 @@ } return result; } + + protected Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + Properties prop = new RecursiveProperties(); + try { + FileInputStream inStream = new FileInputStream(propFile); + try { + prop.load(inStream); + } finally { + inStream.close(); + } + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible de lire le fichier de propriete " + + propFile, eee); + } + } + // on ajoute les proprietes du fichier associe au model + for (Enumeration<Object> e = prop.keys(); e.hasMoreElements();) { + String key = (String) e.nextElement(); + String value = prop.getProperty(key); + + if (key.startsWith(MODEL)) { + + // model tag value + + Matcher matcher = modelTagValuePattern.matcher(key); + + if (!matcher.find()) { + if (log.isWarnEnabled()) { + log.warn("Invalid model tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); + } + continue; + } + String tag = matcher.group(2); +// if (!key.startsWith("model.tagvalue.") || +// !key.startsWith("model.tagValue.")) { +// if (log.isWarnEnabled()) { +// log.warn("Invalid tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); +// } +// continue; +// } +// String tag = key.substring("model.tagvalue.".length()); + + ObjectModelImpl modelImpl = (ObjectModelImpl) model; + if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { + + // push directly the version in the model version + // property + modelImpl.setVersion(value); + } + modelImpl.addTagValue(tag, value); + continue; + } + + // element tag value + Matcher matcher = propertiesPattern.matcher(key); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "'"); + } + + if (!matcher.find()) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : syntax is not correct."); + } + continue; + } + + String fqn = matcher.group(1); + fqn = StringUtil.substring(fqn, 0, -1); // remove ended + // . + // target is class, attribute or operation + String target = matcher.group(2); + String targetName = matcher.group(3); + // type is stereotype or tagvalue + String type = matcher.group(4); + String tag = matcher.group(5); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "' => " + + "fqn:" + fqn + " target:" + target + + " targetName:" + targetName + + " type:" + type + " tag:" + tag); + } + + ObjectModelClassifier omc = model.getClassifier(fqn); + if (omc == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + + "] : Could not find classifier for " + fqn); + } + continue; + } + + //todo tchemit 2010-11-25 : what does it mean ? every thing extends ObjectModelClassifierImpl + if (!(omc instanceof ObjectModelClassifierImpl)) { + // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message + if (log.isWarnEnabled()) { + log.warn("Can't add properties to model, " + + "it's not an " + + "ObjectModelClassifierImpl : " + + omc.getQualifiedName()); + } + continue; + } + + List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); + if (CLASS.equals(target)) { + elems.add(omc); + } else if (ATTRIBUTE.equals(target)) { + + ObjectModelAttribute attr = + getAttribute((ObjectModelClass) omc, targetName); + elems.add(attr); + + } else if (OPERATION.equals(target)) { + elems.addAll(omc.getOperations(targetName)); + } + + if (elems.isEmpty()) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : Could not find any element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "'."); + } + } + for (Object elem1 : elems) { + if (elem1 == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : Element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "' is null."); + } + continue; + } + ObjectModelElementImpl elem = + (ObjectModelElementImpl) elem1; + if (STEREOTYPE.equals(type)) { + // pour les stereotypes + ObjectModelImplRef stereotype = new ObjectModelImplRef(); + stereotype.setName(value); + elem.addStereotype(stereotype); + continue; + } + + if (TAGVALUE.equals(type)) { + // pour les tagvalues + ObjectModelImplTagValue tagvalue = + new ObjectModelImplTagValue(); + tagvalue.setName(tag); + tagvalue.setValue(value); + if (log.isDebugEnabled()) { + log.debug("tagValue:" + tagvalue + + ", tag:" + tag + + ", value:" + value + + ", element:" + elem); + } + elem.addTagValue(tagvalue); + + } + } + } + + return prop; + } }

1 0

r999 - in trunk/eugene/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 10:04:45 +0100 (Thu, 25 Nov 2010) New Revision: 999 Url: http://nuiton.org/repositories/revision/eugene/999 Log: Evolution #1096: Add method GeneratorUtil.removeGenericsDefinition Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-23 16:49:52 UTC (rev 998) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-25 09:04:45 UTC (rev 999) @@ -557,13 +557,30 @@ /** * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. * See JUnit test for matching expressions. - * + * * @param str FullQualifiedName for an attribute type (for exemple) * @return the simple name associated to the str given */ public static String getSimpleName(String str) { + String result = getSimpleName(str, false); + return result; + } + + /** + * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. + * See JUnit test for matching expressions. + * + * @param str FullQualifiedName for an attribute type (for exemple) + * @param removeGenericDefinition a flag to remove any generic definition at the beginning of the expression + * @return the simple name associated to the str given + * @since 2.2.1 + */ + public static String getSimpleName(String str, boolean removeGenericDefinition) { + if (removeGenericDefinition) { + str = removeGenericDefinition(str); + } // variable array type - boolean variableArrayType=false; + boolean variableArrayType = false; if (str.endsWith("...")) { variableArrayType = true; str = str.substring(0, str.length() - 3); @@ -580,6 +597,53 @@ } /** + * Remove any generics definition at the beginning of a string. + * <p/> + * For example : + * <pre> + * <T> T -> T + * </pre> + * + * @param str the string to parse + * @return the string without any + * @since 2.2.1 + */ + public static String removeGenericDefinition(String str) { + + // always trim the string + String result = str.trim(); + + if (!result.startsWith("<")) { + + // not starting by a generics definition, no treatment to do + return str; + } + + int i = 0; + for (int length = result.length(), count = 0; i < length; i++) { + char c = result.charAt(i); + if ('<' == c) { + count++; + } else if ('>' == c) { + count--; + } + if (count == 0) { + break; + } + } + + // the i position was on the last closing caracter, can safely + // remove until this position + 1 + result = result.substring(i + 1); + + // remove any starting spaces + while (result.startsWith(" ")) { + result = result.substring(1); + } + return result; + } + + /** * Parse a fully qualified generic java type, and extract each * imbricated types. * Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-23 16:49:52 UTC (rev 998) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-25 09:04:45 UTC (rev 999) @@ -26,18 +26,16 @@ package org.nuiton.eugene; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; -import static org.junit.Assert.*; +import java.util.Set; + +import static org.junit.Assert.assertEquals; + /** * * @author fdesbois @@ -49,22 +47,6 @@ public GeneratorUtilTest() { } - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test public void testGetOperationParametersListName() { log.info("getOperationParametersListName"); @@ -121,6 +103,7 @@ assertEquals("String param1, Date param2", result); } + /** * Test of getSimpleName method, of class GeneratorUtil. */ @@ -140,6 +123,12 @@ log.info(str + " -> " + result); assertEquals(expResult, result); + str = "<T> java.util.List<T>"; + expResult = "<T> List<T>"; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; expResult = "List<? extends Bonzoms>"; result = GeneratorUtil.getSimpleName(str); @@ -214,7 +203,196 @@ assertEquals(expResult, result); } + /** + * Test of getSimpleName method with removing generics definition, + * of class GeneratorUtil. + */ @Test + public void testGetSimpleNameAndRemoveGenericsDefinition() { + log.info("getSimpleName"); + + String str = "List"; + String expResult = "List"; + String result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Regex"; + expResult = "Regex"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T> java.util.List<T>"; + expResult = "List<T>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + expResult = "List<? extends Bonzoms>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<org.chorem.jtimer.Jtimer>"; + expResult = "List<Jtimer>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Set<java.util.Collection<java.util.Collection<java.util.Collection" + + "<java.lang.String>>>>"; + expResult = "Set<Collection<Collection<Collection<String>>>>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Map<org.chorem.jtimer.Jtimer, java.util.Collection<java.lang.String>>"; + expResult = "Map<Jtimer, Collection<String>>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "new java.util.HashMap<org.chorem.jtimer.Jtimer, T extends java.lang.String>()"; + expResult = "new HashMap<Jtimer, T extends String>()"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<O>"; + expResult = "Class<O>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "2.0"; + expResult = "2.0"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "\"eric.chatellier\""; + expResult = "\"eric.chatellier\""; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T extends org.nuiton.topia.TopiaEntity, D extends org.nuiton.topia.TopiaDAO<? super T>> D"; + expResult = "D"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Object..."; + expResult = "Object..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.lang.Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + } + + + /** + * Test of removeGenericDefinition method, of class GeneratorUtil. + */ + @Test + public void testRemoveGenericDefinition() { + log.info("removeGenericDefinition"); + + String str = "List"; + String expResult = "List"; + String result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Regex"; + expResult = "java.util.Regex"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T> java.util.List<T>"; + expResult = "java.util.List<T>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + + str = " <T> java.util.List<T> "; + expResult = "java.util.List<T>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + expResult = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<org.chorem.jtimer.Jtimer>"; + expResult = "java.util.List<org.chorem.jtimer.Jtimer>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<O>"; + expResult = "Class<O>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "2.0"; + expResult = "2.0"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "\"eric.chatellier\""; + expResult = "\"eric.chatellier\""; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T extends org.nuiton.topia.TopiaEntity, D extends org.nuiton.topia.TopiaDAO<? super T>> D"; + expResult = "D"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Object..."; + expResult = "Object..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.lang.Class<A>..."; + expResult = "java.lang.Class<A>..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + } + + @Test public void testGetTypesList() { String str = "List"; Set<String> results = GeneratorUtil.getTypesList(str);

1 0

r998 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 23 Nov '10

23 Nov '10

Author: tchemit Date: 2010-11-23 17:49:52 +0100 (Tue, 23 Nov 2010) New Revision: 998 Url: http://nuiton.org/repositories/revision/eugene/998 Log: Anomalie #1092: Annotations not generated on attributes Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-11-22 14:09:37 UTC (rev 997) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-11-23 16:49:52 UTC (rev 998) @@ -389,12 +389,7 @@ }*/ } -// String annotation = attr.getTagValue(TAG_ANNOTATION); -// if (annotation != null && annotation.length() > 0) { -///* <%=annotation%> -//*/ -// } - + generateAnnotations(output, clazz, attr); String attrName = attr.getName(); String attrVisibility = attr.getVisibility(); String attrType = GeneratorUtil.getSimpleName(attr.getType());

1 0

r997 - trunk
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 15:09:37 +0100 (Mon, 22 Nov 2010) New Revision: 997 Url: http://nuiton.org/repositories/revision/eugene/997 Log: use i18n 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:29:35 UTC (rev 996) +++ trunk/pom.xml 2010-11-22 14:09:37 UTC (rev 997) @@ -380,7 +380,7 @@ <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion>  <locales>en,fr</locales>

1 0

r996 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:29:35 +0100 (Sun, 21 Nov 2010) New Revision: 996 Url: http://nuiton.org/repositories/revision/eugene/996 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 10:05:46 UTC (rev 995) +++ trunk/pom.xml 2010-11-21 14:29:35 UTC (rev 996) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>eugene</artifactId>

1 0