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

r1286 - in trunk: eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/java/extension eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 15:53:23 +0200 (Thu, 11 Jul 2013) New Revision: 1286 Url: http://nuiton.org/projects/eugene/repository/revisions/1286 Log: fixes #2738: Improve api to add annotations Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotationParameter.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -25,9 +25,12 @@ package org.nuiton.eugene.java; +import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.extension.ObjectModelAnnotation; +import org.nuiton.eugene.java.extension.ObjectModelAnnotationParameter; import org.nuiton.eugene.java.extension.AnnotationsManager; import org.nuiton.eugene.java.extension.AnnotationsManagerExtension; import org.nuiton.eugene.java.extension.CodesManager; @@ -48,6 +51,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; +import javax.lang.model.SourceVersion; import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -295,25 +299,37 @@ * * @param classifier where the annotation will be added. * @param element element on which add annotation - * @param annotation annotation to add + * @param annotationType type of annotation to add + * @return the instanciated annotation */ - public void addAnnotation(ObjectModelClassifier classifier, + public ObjectModelAnnotation addAnnotation(ObjectModelClassifier classifier, ObjectModelElement element, - String annotation) { - if (annotation == null) { - return; - } + String annotationType) { + Preconditions.checkNotNull("Can't add a null annotation"); + Preconditions.checkArgument(SourceVersion.isName(annotationType),"Annotation type must be a valid type , but was: "+annotationType); +// if (annotation == null) { +// return; +// } AnnotationsManager manager = annotationsManagerExtension.getManager(classifier); - annotation = annotation.trim(); +// annotation = annotation.trim(); + ObjectModelAnnotation annotation = new ObjectModelAnnotation(annotationType); manager.addAnnotation(element, annotation); if (log.isDebugEnabled()) { log.debug("Add annotation for <" + classifier.getQualifiedName() + ":" + element.getName() + "> : " + annotation); } + return annotation; } + public ObjectModelAnnotation addAnnotationParameter(ObjectModelAnnotation annotation, + String parameterName, + Object parameterValue) { + annotation.addParameter(new ObjectModelAnnotationParameter(parameterName, parameterValue)); + return annotation; + } + /** * Set the superclass of an other class. Only one superclass can be set * to the class. Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -25,6 +25,8 @@ package org.nuiton.eugene.java; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -32,6 +34,8 @@ import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.extension.AnnotationsManagerExtension; import org.nuiton.eugene.java.extension.ImportsManagerExtension; +import org.nuiton.eugene.java.extension.ObjectModelAnnotation; +import org.nuiton.eugene.java.extension.ObjectModelAnnotationParameter; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -222,17 +226,44 @@ AnnotationsManagerExtension managers = getModel().getExtension( AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, AnnotationsManagerExtension.class); - String[] annotations = managers.getAnnotations(clazz,element); - for (String annotation : annotations) { - if (!annotation.trim().startsWith("@")) { - // add @ prefix - annotation = "@" + annotation.trim(); + List<ObjectModelAnnotation> annotations = + managers.getAnnotations(clazz, element); + for (ObjectModelAnnotation annotation : annotations) { +// if (!annotation.trim().startsWith("@")) { +// // add @ prefix +// annotation = "@" + annotation.trim(); +// } + StringBuilder annotationBuilder= new StringBuilder("@"+annotation.getType()); + List<ObjectModelAnnotationParameter> annotationParameters = annotation.getParameters(); + if (CollectionUtils.isNotEmpty(annotationParameters)) { + annotationBuilder.append('('); + List<String> params = Lists.newArrayList(); + for (ObjectModelAnnotationParameter annotationParameter : annotationParameters) { + String paramStr = annotationParameter.getName()+" = "; + Object value = annotationParameter.getValue(); + if (value instanceof String) { + paramStr+="\""+value+"\""; + } else if (value instanceof Enum) { + Enum anEnum = (Enum) value; + + paramStr += anEnum.getClass().getSimpleName() + "." + value; + } + else { + paramStr+= value.toString(); + } + params.add(paramStr); + } + Joiner.on(", ").appendTo(annotationBuilder, params); + + annotationBuilder.append(')'); } + String annotationStr =annotationBuilder.toString(); + if (element instanceof ObjectModelOperation || element instanceof ObjectModelAttribute) { /*{<%=prefix%>}*/ - annotation = " "+annotation; + annotationStr = " "+annotationStr; } -/*{<%=annotation%>}*/ +/*{<%=annotationStr%>}*/ if (element instanceof ObjectModelClassifier || element instanceof ObjectModelOperation || element instanceof ObjectModelAttribute) { /*{ }*/ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -32,6 +32,7 @@ import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.Template; +import org.nuiton.eugene.java.extension.ObjectModelAnnotation; import org.nuiton.eugene.java.extension.ImportsManager; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -122,18 +123,16 @@ * Add the {@link Generated} annotation to the given {@link ObjectModelClassifier} * * @param element the element to be generated on which the annotation will be added + * @since 2.7 */ // TODO AThimel 06/07/13 Maybe be skipped by configuration ? protected void addGeneratedAnnotation(ObjectModelClassifier element) { - addImport(element, Generated.class); - // TODO AThimel 08/07/13 Fix syntax as soon as it is possible to use annotations with parameters : http://www.nuiton.org/issues/2738 - String annotationName = Generated.class.getSimpleName(); String generatorName = getClass().getName(); Date now = new Date(); - String annotationText = String.format("%s(value = \"%s\", date = \"%s\")", annotationName, generatorName, now); - - addAnnotation(element, element, annotationText); + ObjectModelAnnotation annotation = addAnnotation(element, element, Generated.class); + addAnnotationParameter(element, annotation, "value", generatorName); + addAnnotationParameter(element, annotation, "date", now.toString()); } protected ObjectModelClass createClass(String name, String packageName) { @@ -424,13 +423,64 @@ builder.addComment(element, comment); } - public void addAnnotation(ObjectModelClassifier classifier, - ObjectModelElement element, - String annotation) { - builder.addAnnotation(classifier, element, annotation); + /** + * Add an annotation of the given {@code element} of the given {@code classifier}. + * + * @param classifier holder of element to treat + * @param element where to add the annotation + * @param annotationType type of annotation to create + * @return the instanciated annotation + * @since 2.6.4 + */ + public ObjectModelAnnotation addAnnotation(ObjectModelClassifier classifier, + ObjectModelElement element, + String annotationType) { + return builder.addAnnotation(classifier, element, annotationType); } /** + * Add an annotation of the given {@code element} of the given {@code classifier}. + * + * @param classifier holder of element to treat + * @param element where to add the annotation + * @param annotationType type of annotation to create + * @return the instanciated annotation + * @since 2.6.4 + */ + public ObjectModelAnnotation addAnnotation(ObjectModelClassifier classifier, + ObjectModelElement element, + Class<?> annotationType) { + addImport(classifier, annotationType); + return builder.addAnnotation(classifier, + element, + annotationType.getSimpleName()); + } + + /** + * Add a parameter to an annotation. + * + * + * @param classifier + * @param annotation where to add the parameter + * @param annotationName parameter name + * @param annotationValue paramter value + * @return the annotation + * @since 2.6.4 + */ + public ObjectModelAnnotation addAnnotationParameter(ObjectModelClassifier classifier, + ObjectModelAnnotation annotation, + String annotationName, + Object annotationValue) { + if (annotationValue instanceof Enum) { + Enum value = (Enum) annotationValue; + addImport(classifier, value.getClass()); + } + return builder.addAnnotationParameter(annotation, + annotationName, + annotationValue); + } + + /** * add an operation to the classifier with the form of a simple block * of code. * <p/> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -28,6 +28,7 @@ import org.nuiton.eugene.models.object.ObjectModelElement; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,9 +44,9 @@ */ public class AnnotationsManager { - private static final String[] EMPTY_STRING_ARRAY = new String[]{}; +// private static final String[] EMPTY_STRING_ARRAY = new String[]{}; - protected Map<ObjectModelElement, List<String>> annotations; + protected Map<ObjectModelElement, List<ObjectModelAnnotation>> annotations; /** * Add the {@code annotation} for the given {@code element} of @@ -54,11 +55,12 @@ * @param element the element where to register the annotation * @param annotation the annotation to register */ - public void addAnnotation(ObjectModelElement element, String annotation) { - Map<ObjectModelElement, List<String>> map = getAnnotations(); - List<String> list = map.get(element); + public void addAnnotation(ObjectModelElement element, + ObjectModelAnnotation annotation) { + Map<ObjectModelElement, List<ObjectModelAnnotation>> map = getAnnotations(); + List<ObjectModelAnnotation> list = map.get(element); if (list == null) { - list = new ArrayList<String>(); + list = new ArrayList<ObjectModelAnnotation>(); map.put(element, list); } list.add(annotation); @@ -71,16 +73,15 @@ * @param element the element where to search for annotations * @return the annotations for the element (empty arry if none found */ - public String[] getAnnotations(ObjectModelElement element) { - Map<ObjectModelElement, List<String>> map = getAnnotations(); - List<String> list = map.get(element); - return list == null ? EMPTY_STRING_ARRAY : - list.toArray(new String[list.size()]); + public List<ObjectModelAnnotation> getAnnotations(ObjectModelElement element) { + Map<ObjectModelElement, List<ObjectModelAnnotation>> map = getAnnotations(); + List<ObjectModelAnnotation> list = map.get(element); + return list == null ? Collections.<ObjectModelAnnotation>emptyList() : list; } - protected Map<ObjectModelElement, List<String>> getAnnotations() { + protected Map<ObjectModelElement, List<ObjectModelAnnotation>> getAnnotations() { if (annotations == null) { - annotations = new HashMap<ObjectModelElement, List<String>>(); + annotations = new HashMap<ObjectModelElement, List<ObjectModelAnnotation>>(); } return annotations; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -30,7 +30,9 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -55,28 +57,28 @@ */ protected Map<String, AnnotationsManager> managers; - private static final String[] EMPTY_STRING_ARRAY = new String[]{}; +// private static final String[] EMPTY_STRING_ARRAY = new String[]{}; /** * Get the registred annotations for the given {@code element} in the * given {@code classifier}. - * + * <p/> * <b>Note:</b> The method always returns a {@code none null} value, but * an empty array when no annotation when no annotation found for the - * element. - * + * element. + * * @param classifier the classifier where is the element - * @param element the element on which searching annotations - * @return the array of annotation registred or an empty array if none. + * @param element the element on which searching annotations + * @return the list of annotations registred or an empty list if none. */ - public String[] getAnnotations(ObjectModelClassifier classifier, - ObjectModelElement element) { + public List<ObjectModelAnnotation> getAnnotations(ObjectModelClassifier classifier, + ObjectModelElement element) { AnnotationsManager annotationsManager = getManager(classifier); - String[] result = null; + List<ObjectModelAnnotation> result = null; if (annotationsManager != null) { result = annotationsManager.getAnnotations(element); } - return result == null ? EMPTY_STRING_ARRAY : result; + return result == null ? Collections.<ObjectModelAnnotation>emptyList() : result; } /** Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -0,0 +1,76 @@ +package org.nuiton.eugene.java.extension; + +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +import java.util.ArrayList; +import java.util.List; + +/** + * Define a annotation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.4 + */ +public class ObjectModelAnnotation { + + protected final String type; + + protected List<ObjectModelAnnotationParameter> parameters; + + public ObjectModelAnnotation(String type) { + this.type = type; + } + + public String getType() { + return type; + } + + + public List<ObjectModelAnnotationParameter> getParameters() { + return parameters; + } + + public void addParameter(ObjectModelAnnotationParameter parameter) { + if (parameters == null) { + parameters = new ArrayList<ObjectModelAnnotationParameter>(); + } + parameters.add(parameter); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ObjectModelAnnotation)) return false; + + ObjectModelAnnotation that = (ObjectModelAnnotation) o; + + return type.equals(that.type); + } + + @Override + public int hashCode() { + return type.hashCode(); + } +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotationParameter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotationParameter.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotationParameter.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -0,0 +1,52 @@ +package org.nuiton.eugene.java.extension; + +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +/** + * Defines a annotation parameter. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.4 + */ +public class ObjectModelAnnotationParameter { + + protected final String name; + + protected final Object value; + + public ObjectModelAnnotationParameter(String name, Object value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public Object getValue() { + return value; + } + +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotationParameter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-07-11 13:50:16 UTC (rev 1285) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-07-11 13:53:23 UTC (rev 1286) @@ -104,7 +104,7 @@ for (ObjectModelOperation operation : getPublicOperations(outputClass)) { addAnnotation(outputClass, operation, - Override.class.getSimpleName()); + Override.class); } }

1 0

r1285 - in trunk/src/site: fr/rst rst
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 15:50:16 +0200 (Thu, 11 Jul 2013) New Revision: 1285 Url: http://nuiton.org/projects/eugene/repository/revisions/1285 Log: fix some docs Modified: trunk/src/site/fr/rst/index.rst trunk/src/site/rst/08-FAQ.rst trunk/src/site/rst/index.rst Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2013-07-11 13:50:00 UTC (rev 1284) +++ trunk/src/site/fr/rst/index.rst 2013-07-11 13:50:16 UTC (rev 1285) @@ -51,17 +51,19 @@ .. _Generator: 07-glossaire.html .. _FAQ: 08-FAQ.html -Le projet EUGene est composé de 3 modules : +Le projet EUGene est composé de 5 modules : * `eugene-api`_ (Api de base d'EUGene) * `eugene-java-templates`_ (Templates pour générer des classes java) - * `eugene-plantuml-templates`_ (depuis la version 2.7) (Templates pour générer des diagrammes plantumlclasses java) + * `eugene-plantuml-templates`_ (depuis la version 2.7) (Templates pour générer des diagrammes plantumlclasses java) + * `eugene-yaml-templates`_ (depuis la version 2.7) (Pour lire un object model depuis des fichiers yaml) * `eugene-maven-plugin`_ (Plugin maven pour lancer des générations) .. _eugene-api: ../eugene/fr/index.html .. _eugene-java-templates: ../eugene-java-templates/fr/index.html -.. _eugene-maven-plugin: ../eugene-maven-plugin/fr/index.html .. _eugene-plantuml-templates: ../eugene-plantuml-templates/fr/index.html +.. _eugene-ymal-templates: ../eugene-plantuml-templates/fr/index.html +.. _eugene-maven-plugin: ../eugene-yaml-templates/fr/index.html Plus d'infos sur le projet sur la `forge nuiton`_ . Modified: trunk/src/site/rst/08-FAQ.rst =================================================================== --- trunk/src/site/rst/08-FAQ.rst 2013-07-11 13:50:00 UTC (rev 1284) +++ trunk/src/site/rst/08-FAQ.rst 2013-07-11 13:50:16 UTC (rev 1285) @@ -27,7 +27,7 @@ FAQ === -How to convert UML models from Poseidon to AgroUML ? +How to convert UML models from Poseidon to ArgoUML ? ==================================================== You have to save your model using Poseidon in XMI, or extract it from the .zuml Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2013-07-11 13:50:00 UTC (rev 1284) +++ trunk/src/site/rst/index.rst 2013-07-11 13:50:16 UTC (rev 1285) @@ -51,17 +51,19 @@ .. _Generator: 07-glossaire.html .. _FAQ: 08-FAQ.html -EUGene is divided into 4 modules : +EUGene is divided into 5 modules : * `eugene-api`_ (EUGene Api) - * `eugene-java-templates`_ (Templates pour générer des classes java) - * `eugene-plantuml-templates`_ (depuis la version 2.7) (Templates pour générer des diagrammes plantumlclasses java) + * `eugene-java-templates`_ (Templates to generate java stuff) + * `eugene-plantuml-templates`_ (since version 2.7) (Templates to generate plantuml from an object model) + * `eugene-yaml-templates`_ (since version 2.7) (Templates to model object model from yaml files) * `eugene-maven-plugin`_ (Maven Plugin to generate stuff using EUGene) .. _eugene-api: eugene/index.html .. _eugene-java-templates: ../eugene-java-templates/fr/index.html .. _eugene-maven-plugin: eugene-maven-plugin/index.html .. _eugene-plantuml-templates: ../eugene-plantuml-templates/index.html +.. _eugene-yaml-templates: ../eugene-yaml-templates/index.html More info on the project on `nuiton's forge`_ .

1 0

r1284 - trunk/eugene-maven-plugin
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 15:50:00 +0200 (Thu, 11 Jul 2013) New Revision: 1284 Url: http://nuiton.org/projects/eugene/repository/revisions/1284 Log: fixes #2749: Remove topia it in eugene Modified: trunk/eugene-maven-plugin/pom.xml Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2013-07-11 13:48:09 UTC (rev 1283) +++ trunk/eugene-maven-plugin/pom.xml 2013-07-11 13:50:00 UTC (rev 1284) @@ -244,16 +244,16 @@ <configuration> <pomIncludes> <pomInclude>evol-308/pom.xml</pomInclude> - <pomInclude>evol-879/zargo/pom.xml</pomInclude> - <pomInclude>evol-879/xmi/pom.xml</pomInclude> - <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> +  +  +  <pomInclude>generate/only-zargo/pom.xml</pomInclude> <pomInclude>generate/only-zargo-xmi/pom.xml</pomInclude> <pomInclude>generate/all/pom.xml</pomInclude>    - <pomInclude>evol-879/model/pom.xml</pomInclude> +  </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo

1 0

r1283 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 15:48:09 +0200 (Thu, 11 Jul 2013) New Revision: 1283 Url: http://nuiton.org/projects/eugene/repository/revisions/1283 Log: fix javadoc typo Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2013-07-08 07:48:48 UTC (rev 1282) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2013-07-11 13:48:09 UTC (rev 1283) @@ -540,7 +540,7 @@ * * @param s la chaine de caractères à tester * @return true si <code>s</code> n'est pas vide - * @deprecated since 2.3, use the method {@link StringUtils#isNotEmpty(String)} + * @deprecated since 2.3, use the method {@link StringUtils#isNotEmpty(CharSequence)} */ @Deprecated public static boolean notEmpty(String s) {

1 0

r1282 - in trunk: eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml eugene-plantuml-templates/src/site eugene-plantuml-templates/src/site/fr/rst eugene-plantuml-templates/src/site/resources/images eugene-plantuml-templates/src/site/rst eugene-yaml-templates eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml
by athimel＠users.nuiton.org July 8, 2013

July 8, 2013

Author: athimel Date: 2013-07-08 09:48:48 +0200 (Mon, 08 Jul 2013) New Revision: 1282 Url: http://nuiton.org/projects/eugene/repository/revisions/1282 Log: Fix SVN properties and file headers Modified: trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst trunk/eugene-plantuml-templates/src/site/resources/images/Pollen.png trunk/eugene-plantuml-templates/src/site/resources/images/legend1.png trunk/eugene-plantuml-templates/src/site/resources/images/legend2.png trunk/eugene-plantuml-templates/src/site/resources/images/legend3.png trunk/eugene-plantuml-templates/src/site/rst/index.rst trunk/eugene-plantuml-templates/src/site/site_en.xml trunk/eugene-plantuml-templates/src/site/site_fr.xml trunk/eugene-yaml-templates/LICENSE.txt trunk/eugene-yaml-templates/README.txt trunk/eugene-yaml-templates/changelog.txt trunk/eugene-yaml-templates/pom.xml trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxeUserFriendly.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import org.yaml.snakeyaml.Yaml; import java.io.File; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + /** * User: agiraudet * Date: 30/05/13 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import org.nuiton.eugene.models.object.xml.*; import java.util.List; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; import org.yaml.snakeyaml.Yaml; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.List; import java.util.Map; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + /** * User: agiraudet * Date: 30/05/13 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxeUserFriendly.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxeUserFriendly.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxeUserFriendly.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + /** * User: agiraudet * Date: 30/05/13 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxeUserFriendly.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.models.object.reader.yaml; +/* + * #%L + * EUGene :: EUGene + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; Modified: trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java =================================================================== --- trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.plantuml; +/* + * #%L + * EUGene :: PlantUML templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 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% + */ + import net.sourceforge.plantuml.GeneratedImage; import net.sourceforge.plantuml.SourceFileReader; import org.nuiton.eugene.models.object.*; Modified: trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2013-07-08 07:48:48 UTC (rev 1282) @@ -2,8 +2,8 @@ .. * #%L .. * EUGene :: PlantUML templates .. * -.. * $Id: index.rst 1174 2012-08-17 08:44:36Z tchemit $ -.. * $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-plantuml-templates/src/site/f… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 CodeLutin .. * %% Property changes on: trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/Pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/eugene-plantuml-templates/src/site/rst/index.rst =================================================================== --- trunk/eugene-plantuml-templates/src/site/rst/index.rst 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-plantuml-templates/src/site/rst/index.rst 2013-07-08 07:48:48 UTC (rev 1282) @@ -2,8 +2,8 @@ .. * #%L .. * EUGene :: PlantUML templates .. * -.. * $Id: index.rst 1220 2012-12-10 07:55:48Z tchemit $ -.. * $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-plantuml-templates/src/site/r… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 CodeLutin .. * %% Property changes on: trunk/eugene-plantuml-templates/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-plantuml-templates/src/site/site_en.xml =================================================================== --- trunk/eugene-plantuml-templates/src/site/site_en.xml 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-plantuml-templates/src/site/site_en.xml 2013-07-08 07:48:48 UTC (rev 1282) @@ -2,8 +2,8 @@ <!-- #%L EUGene :: Java templates - $Id: site_en.xml 1223 2012-12-10 08:17:42Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-plantuml-templates/src/site/s… $ + $Id$ + $HeadURL$ %% Copyright (C) 2012 CodeLutin, Tony Chemit %% Property changes on: trunk/eugene-plantuml-templates/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-plantuml-templates/src/site/site_fr.xml =================================================================== --- trunk/eugene-plantuml-templates/src/site/site_fr.xml 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-plantuml-templates/src/site/site_fr.xml 2013-07-08 07:48:48 UTC (rev 1282) @@ -2,8 +2,8 @@ <!-- #%L EUGene :: Java templates - $Id: site_fr.xml 1223 2012-12-10 08:17:42Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-plantuml-templates/src/site/s… $ + $Id$ + $HeadURL$ %% Copyright (C) 2012 CodeLutin, Tony Chemit %% Property changes on: trunk/eugene-plantuml-templates/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/eugene-yaml-templates/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/eugene-yaml-templates/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/eugene-yaml-templates/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-yaml-templates/pom.xml 2013-07-08 07:48:48 UTC (rev 1282) @@ -3,7 +3,7 @@ #%L EUGene :: EUGene - $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-yaml-templates/pom.xml $ + $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin %% Property changes on: trunk/eugene-yaml-templates/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java =================================================================== --- trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.yaml; +/* + * #%L + * EUGene :: YAML templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 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% + */ + import org.nuiton.eugene.models.object.*; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; Property changes on: trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java =================================================================== --- trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java 2013-07-08 07:30:17 UTC (rev 1281) +++ trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java 2013-07-08 07:48:48 UTC (rev 1282) @@ -1,5 +1,29 @@ package org.nuiton.eugene.yaml; +/* + * #%L + * EUGene :: YAML templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 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% + */ + import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; Property changes on: trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1281 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by athimel＠users.nuiton.org July 8, 2013

July 8, 2013

Author: athimel Date: 2013-07-08 09:30:17 +0200 (Mon, 08 Jul 2013) New Revision: 1281 Url: http://nuiton.org/projects/eugene/repository/revisions/1281 Log: refs #2523 Add @Generated on each generated class : done but issue can't be closed since #2738 is not resolved Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2013-06-14 16:24:07 UTC (rev 1280) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2013-07-08 07:30:17 UTC (rev 1281) @@ -53,10 +53,13 @@ import java.net.URL; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.annotation.Generated; + /** * Created: 28 oct. 2009 * @@ -115,23 +118,49 @@ } } + /** + * Add the {@link Generated} annotation to the given {@link ObjectModelClassifier} + * + * @param element the element to be generated on which the annotation will be added + */ + // TODO AThimel 06/07/13 Maybe be skipped by configuration ? + protected void addGeneratedAnnotation(ObjectModelClassifier element) { + addImport(element, Generated.class); + + // TODO AThimel 08/07/13 Fix syntax as soon as it is possible to use annotations with parameters : http://www.nuiton.org/issues/2738 + String annotationName = Generated.class.getSimpleName(); + String generatorName = getClass().getName(); + Date now = new Date(); + String annotationText = String.format("%s(value = \"%s\", date = \"%s\")", annotationName, generatorName, now); + + addAnnotation(element, element, annotationText); + } + protected ObjectModelClass createClass(String name, String packageName) { - return builder.createClass(name, packageName); + ObjectModelClass result = builder.createClass(name, packageName); + addGeneratedAnnotation(result); + return result; } public ObjectModelEnumeration createEnumeration(String name, String packageName) { - return builder.createEnumeration(name, packageName); + ObjectModelEnumeration result = builder.createEnumeration(name, packageName); + addGeneratedAnnotation(result); + return result; } protected ObjectModelClass createAbstractClass(String name, String packageName) { - return builder.createAbstractClass(name, packageName); + ObjectModelClass result = builder.createAbstractClass(name, packageName); + addGeneratedAnnotation(result); + return result; } protected ObjectModelInterface createInterface(String name, String packageName) { - return builder.createInterface(name, packageName); + ObjectModelInterface result = builder.createInterface(name, packageName); + addGeneratedAnnotation(result); + return result; } protected void setSuperClass(ObjectModelClass classifier,

1 0

Build failed in Jenkins: eugene #1151
by admin+hudson＠codelutin.com June 17, 2013

June 17, 2013

See <http://ci.nuiton.org/jenkins/job/eugene/1151/changes> Changes: [agiraudet] Refonte complète du template PlantUML et mise à jour de la version de la dépendance vers PlantUML ------------------------------------------ [...truncated 128 lines...] WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (ObjectModelReader.java:286) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/test-classes…> WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:310) loadModelTagValue - Invalid model tag value [model.tagvalue.lejoliemodel] : the tagvalue 'lejoliemodel' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.Role.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (ObjectModelReader.java:286) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/test-classes…> WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:310) loadModelTagValue - Invalid model tag value [model.tagvalue.lejoliemodel] : the tagvalue 'lejoliemodel' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.Role.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (ObjectModelReader.java:286) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/test-classes…> WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:310) loadModelTagValue - Invalid model tag value [model.tagvalue.lejoliemodel] : the tagvalue 'lejoliemodel' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.Role.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (ObjectModelReader.java:286) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/test-classes…> WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. WARN [main] (ObjectModelReader.java:371) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (ObjectModelReader.java:475) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.class.tagvalue.role] : this tagvalue 'role' is unkown. INFO [main] (ObjectModelReader.java:286) loadModelProperties - 4 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/test-classes…> Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.559 sec Running org.nuiton.eugene.models.object.xml.ExternalCacheExtensionTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec Running org.nuiton.eugene.models.object.xml.ObjectModelImplTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running org.nuiton.eugene.models.object.xml.ObjectModelBuilderTest Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.026 sec Running org.nuiton.eugene.models.object.XMI21ToObjectModelTest INFO [main] (TestHelper.java:58) getTestWorkdir - basedir for test <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/surefire-wor…> WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one Recoverable error on line 877 FODC0002: java.io.FileNotFoundException: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/conception-helper.u…> (No such file or directory) Recoverable error on line 877 FODC0002: java.io.FileNotFoundException: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/conception-helper.u…> (No such file or directory) Recoverable error on line 877 FODC0002: java.io.FileNotFoundException: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/conception-helper.u…> (No such file or directory) WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one Recoverable error on line 877 FODC0002: java.io.FileNotFoundException: /var/local/jenkins/data/jobs/vpod-api/src/main/uml/conception.uml (No such file or directory) WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.937 sec Running org.nuiton.eugene.models.object.XMI12ToObjectModelTest WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one WARN [main] (ObjectModelReader.java:140) read - No properties provider filled, will instanciate a new default one Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.113 sec Running org.nuiton.eugene.models.object.ObjectModelGeneratorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec Running org.nuiton.eugene.GeneratorUtilTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 sec Running org.nuiton.eugene.java.JavaBuilderTest Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec Running org.nuiton.eugene.java.extension.ImportsManagerExtensionTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec Running org.nuiton.eugene.java.extension.ImportsManagerTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec Running org.nuiton.eugene.java.JavaGeneratorUtilTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec Results : Tests run: 80, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ eugene --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/eugene-2.6.4…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ eugene --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ eugene --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/eugene-2.6.4…> to /var/local/maven/data/repository/org/nuiton/eugene/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/pom.xml> to /var/local/maven/data/repository/org/nuiton/eugene/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: Java templates 2.6.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ eugene-java-templates --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ eugene-java-templates --- [INFO] [INFO] --- processor-maven-plugin:1.3:process (default) @ eugene-java-templates --- [INFO] Processing 10 files(s). [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ eugene-java-templates --- [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ eugene-java-templates --- [INFO] Compiling 10 source files to <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> [INFO] [INFO] --- plexus-component-metadata:1.5.5:generate-metadata (default) @ eugene-java-templates --- [INFO] Discovered 5 component descriptors(s) [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ eugene-java-templates --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ eugene-java-templates --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ eugene-java-templates --- [INFO] Compiling 1 source file to <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> [INFO] [INFO] --- maven-surefire-plugin:2.14.1:test (default-test) @ eugene-java-templates --- [INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.eugene.java.JavaTemplatesModelPropertiesProviderTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.204 sec Results : Tests run: 6, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ eugene-java-templates --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ eugene-java-templates --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ eugene-java-templates --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> to /var/local/maven/data/repository/org/nuiton/eugene/eugene-java-templates/2.6.4-SNAPSHOT/eugene-java-templates-2.6.4-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/pom.…> to /var/local/maven/data/repository/org/nuiton/eugene/eugene-java-templates/2.6.4-SNAPSHOT/eugene-java-templates-2.6.4-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: PlantUML templates 2.6.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/net/sourceforge/plantum… [WARNING] The POM for net.sourceforge.plantuml:plantuml:jar:7968 is missing, no dependency information available Downloading: http://nexus.nuiton.org/nexus/content/groups/public/net/sourceforge/plantum… [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] EUGene ............................................ SUCCESS [7.583s] [INFO] EUGene :: EUGene .................................. SUCCESS [27.770s] [INFO] EUGene :: Java templates .......................... SUCCESS [2.736s] [INFO] EUGene :: PlantUML templates ...................... FAILURE [0.472s] [INFO] EUGene :: YAML templates .......................... SKIPPED [INFO] EUGene :: Maven plugin ............................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 40.190s [INFO] Finished at: Fri Jun 14 11:41:15 CEST 2013 [INFO] Final Memory: 28M/187M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton$eugene/builds/2013-06-14_11-40-30/archive/org.nuiton/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/target/eugene-2.6.4-SNAPSH…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton$eugene/builds/2013-06-14_11-40-30/archive/org.nuiton/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT-site_en.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/target/eugene-2.6.4-SNAPSH…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton$eugene/builds/2013-06-14_11-40-30/archive/org.nuiton/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-plantuml-templates/…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene-plantuml-templates/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene-plantuml-templates/2.6.4-SNAPSHOT/eugene-plantuml-templates-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-yaml-templates/pom.…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene-yaml-templates/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene-yaml-templates/2.6.4-SNAPSHOT/eugene-yaml-templates-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-maven-plugin/pom.xml> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene-maven-plugin/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene-maven-plugin/2.6.4-SNAPSHOT/eugene-maven-plugin-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/pom.xml> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene/target/eugene-2.6.4…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene/2.6.4-SNAPSHOT/eugene-2.6.4-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/pom.…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene-java-templates/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene-java-templates/2.6.4-SNAPSHOT/eugene-java-templates-2.6.4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/eugene/ws/trunk/eugene-java-templates/targ…> to /var/local/jenkins/data/jobs/eugene/modules/org.nuiton.eugene$eugene-java-templates/builds/2013-06-14_11-40-30/archive/org.nuiton.eugene/eugene-java-templates/2.6.4-SNAPSHOT/eugene-java-templates-2.6.4-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal on project eugene-plantuml-templates: Could not resolve dependencies for project org.nuiton.eugene:eugene-plantuml-templates:jar:2.6.4-SNAPSHOT: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) cause : Could not resolve dependencies for project org.nuiton.eugene:eugene-plantuml-templates:jar:2.6.4-SNAPSHOT: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal on project eugene-plantuml-templates: Could not resolve dependencies for project org.nuiton.eugene:eugene-plantuml-templates:jar:2.6.4-SNAPSHOT: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:210) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.resolveProjectDependencies(LifecycleDependencyResolver.java:117) at org.apache.maven.lifecycle.internal.MojoExecutor.ensureDependenciesAreResolved(MojoExecutor.java:258) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:201) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.project.DependencyResolutionException: Could not resolve dependencies for project org.nuiton.eugene:eugene-plantuml-templates:jar:2.6.4-SNAPSHOT: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:189) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:185) ... 30 more Caused by: org.sonatype.aether.resolution.DependencyResolutionException: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) at org.sonatype.aether.impl.internal.DefaultRepositorySystem.resolveDependencies(DefaultRepositorySystem.java:375) at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:183) ... 31 more Caused by: org.sonatype.aether.resolution.ArtifactResolutionException: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) at org.sonatype.aether.impl.internal.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:538) at org.sonatype.aether.impl.internal.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:216) at org.sonatype.aether.impl.internal.DefaultRepositorySystem.resolveDependencies(DefaultRepositorySystem.java:358) ... 32 more Caused by: org.sonatype.aether.transfer.ArtifactNotFoundException: Could not find artifact net.sourceforge.plantuml:plantuml:jar:7968 in central (http://nexus.nuiton.org/nexus/content/groups/public) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$4.wrap(WagonRepositoryConnector.java:947) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$4.wrap(WagonRepositoryConnector.java:941) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$GetTask.run(WagonRepositoryConnector.java:669) at org.sonatype.aether.util.concurrency.RunnableErrorForwarder$1.run(RunnableErrorForwarder.java:60) ... 3 more Failed to send e-mail to agiraudet because no e-mail address is known, and no default e-mail domain is configured Sending e-mails to: eugene-commits(a)list.nuiton.org channel stopped Failed to send e-mail to agiraudet because no e-mail address is known, and no default e-mail domain is configured

1 1

Build failed in Jenkins: eugene » EUGene :: PlantUML templates #1151
by admin+hudson＠codelutin.com June 17, 2013

June 17, 2013

See <http://ci.nuiton.org/jenkins/job/eugene/org.nuiton.eugene$eugene-plantuml-t…> Changes: [agiraudet] Refonte complète du template PlantUML et mise à jour de la version de la dépendance vers PlantUML ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: PlantUML templates 2.6.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/net/sourceforge/plantum… [WARNING] The POM for net.sourceforge.plantuml:plantuml:jar:7968 is missing, no dependency information available Downloading: http://nexus.nuiton.org/nexus/content/groups/public/net/sourceforge/plantum…

1 1

r1280 - in trunk: eugene-plantuml-templates/src eugene-plantuml-templates/src/site eugene-plantuml-templates/src/site/resources eugene-plantuml-templates/src/site/resources/images src/site/fr/rst src/site/rst
by agiraudet＠users.nuiton.org June 14, 2013

June 14, 2013

Author: agiraudet Date: 2013-06-14 18:24:07 +0200 (Fri, 14 Jun 2013) New Revision: 1280 Url: http://nuiton.org/projects/eugene/repository/revisions/1280 Log: fixes #2708: documentation template plantuml ok (correction probl?\195?\168me arborescence et lien index de eugene) Added: trunk/eugene-plantuml-templates/src/site/resources/ trunk/eugene-plantuml-templates/src/site/resources/images/ trunk/eugene-plantuml-templates/src/site/resources/images/Pollen.png trunk/eugene-plantuml-templates/src/site/resources/images/legend1.png trunk/eugene-plantuml-templates/src/site/resources/images/legend2.png trunk/eugene-plantuml-templates/src/site/resources/images/legend3.png Removed: trunk/eugene-plantuml-templates/src/resources/ Modified: trunk/src/site/fr/rst/index.rst trunk/src/site/rst/index.rst Added: trunk/eugene-plantuml-templates/src/site/resources/images/Pollen.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/Pollen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/site/resources/images/legend1.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/site/resources/images/legend2.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/site/resources/images/legend3.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/site/resources/images/legend3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2013-06-14 15:43:32 UTC (rev 1279) +++ trunk/src/site/fr/rst/index.rst 2013-06-14 16:24:07 UTC (rev 1280) @@ -55,11 +55,13 @@ * `eugene-api`_ (Api de base d'EUGene) * `eugene-java-templates`_ (Templates pour générer des classes java) + * `eugene-plantuml-templates`_ (depuis la version 2.7) (Templates pour générer des diagrammes plantumlclasses java) * `eugene-maven-plugin`_ (Plugin maven pour lancer des générations) .. _eugene-api: ../eugene/fr/index.html .. _eugene-java-templates: ../eugene-java-templates/fr/index.html .. _eugene-maven-plugin: ../eugene-maven-plugin/fr/index.html +.. _eugene-plantuml-templates: ../eugene-plantuml-templates/fr/index.html Plus d'infos sur le projet sur la `forge nuiton`_ . Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2013-06-14 15:43:32 UTC (rev 1279) +++ trunk/src/site/rst/index.rst 2013-06-14 16:24:07 UTC (rev 1280) @@ -61,6 +61,7 @@ .. _eugene-api: eugene/index.html .. _eugene-java-templates: ../eugene-java-templates/fr/index.html .. _eugene-maven-plugin: eugene-maven-plugin/index.html +.. _eugene-plantuml-templates: ../eugene-plantuml-templates/index.html More info on the project on `nuiton's forge`_ .

1 0

r1279 - in trunk: eugene/src/main/java/org/nuiton/eugene/models/object/reader eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml eugene-plantuml-templates/src eugene-plantuml-templates/src/resources eugene-plantuml-templates/src/resources/images eugene-plantuml-templates/src/site eugene-plantuml-templates/src/site/fr/rst eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml
by agiraudet＠users.nuiton.org June 14, 2013

June 14, 2013

Author: agiraudet Date: 2013-06-14 17:43:32 +0200 (Fri, 14 Jun 2013) New Revision: 1279 Url: http://nuiton.org/projects/eugene/repository/revisions/1279 Log: refs #2708: correction des liens et des images relecture du code (commentaires, corrections...) Added: trunk/eugene-plantuml-templates/src/resources/ trunk/eugene-plantuml-templates/src/resources/images/ trunk/eugene-plantuml-templates/src/resources/images/Pollen.png trunk/eugene-plantuml-templates/src/resources/images/legend1.png trunk/eugene-plantuml-templates/src/resources/images/legend2.png trunk/eugene-plantuml-templates/src/resources/images/legend3.png Removed: trunk/eugene-plantuml-templates/src/site/resources/ Modified: trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -45,8 +45,7 @@ public class YamlObjectModelReader extends AbstractObjectModelReader { private static final Log log = LogFactory.getLog(YamlObjectModelReader.class); - //protected YamlToObjectModel yamlToObjectModel; - protected LoadYamlFile test; + protected LoadYamlFile loaderYAML; @Override public String getInputType() { @@ -56,15 +55,13 @@ @Override protected void beforeReadFile(File... files) { super.beforeReadFile(files); - //yamlToObjectModel = new YamlToObjectModel(); - test = new LoadYamlFile(); + loaderYAML = new LoadYamlFile(); } @Override protected void readFileToModel(File file, ObjectModel model) throws IOException { try { - //yamlToObjectModel.loadFile(file,model); - test.loadFile(file,model); + loaderYAML.loadFile(file, model); } catch (YAMLException e) { throw new IOException("Unable to parse ObjectModel input file : " + file, e); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -24,6 +24,7 @@ public static Map<String, String> getDefaultValues(String version) { Map<String, String> values = new LinkedHashMap<String, String>(); + //retourne les valeurs par defaut en fonction de la version dans une Map if (version.equals("0")) { values.put(ATTRIBUTE + SEPARATOR + MIN_MULTIPLICITY, "1"); values.put(ATTRIBUTE + SEPARATOR + MAX_MULTIPLICITY, "1"); @@ -37,7 +38,7 @@ return values; } - //retourne les valeurs par defaut du fichier YAML passe an parametre + //retourne les valeurs par defaut du fichier YAML passé en parametre public Map<String, String> getDefaultValues(File file) throws IOException { InputStream inputModel = new FileInputStream(file); Object valuesYAML = yaml.load(inputModel); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -29,7 +29,7 @@ String INNER = "inner"; String INTERFACE = "interface"; String LABEL = "label"; - String LITERAL = "literal"; + String LITERALS = "literals"; String MAX_MULTIPLICITY = "maxmultiplicity"; String MIN_MULTIPLICITY = "minmultiplicity"; String NAME = "name"; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -22,7 +22,7 @@ this.modelYAMLO = modelYAMLO; this.defaultValues = defaultValues; //log - Log.initLog(modelYAMLO.toString(), "/tmp/log.LoadObjectModel.txt"); + //Log.initLog(modelYAMLO.toString(), "/tmp/log.LoadObjectModel.txt"); //log } @@ -49,6 +49,7 @@ modelOM.setName(nameYAMLO); } + //version String versionYAMLO = modelYAMLO.getFirstMapStringListString(VERSION); if (versionYAMLO == null) { String key = VERSION; @@ -59,8 +60,7 @@ modelOM.setVersion(versionYAMLO); } - //tageValues - //TODO: tester + //tagValues YamlObject tagValues = modelYAMLO.getFirstMapStringListYamlObject(TAG_VALUES); if (tagValues != null) { for (Map.Entry<String, List<String>> tagValue : tagValues.getMapStringListString().entrySet()) { @@ -98,6 +98,7 @@ } public void loadElement(YamlObject elementYAMLO, ObjectModelElementImpl elementOM) { + //name String nameYAMLO = elementYAMLO.getFirstMapStringListString(NAME); if (nameYAMLO == null) { String key = ELEMENT + SEPARATOR + NAME; @@ -108,6 +109,7 @@ elementOM.setName(nameYAMLO); } + //static String staticYAMLO = elementYAMLO.getFirstMapStringListString(STATIC); if (staticYAMLO == null) { String key = ELEMENT + SEPARATOR + STATIC; @@ -118,6 +120,7 @@ elementOM.setStatic(Boolean.valueOf(staticYAMLO)); } + //documentation String documentationYAMLO = elementYAMLO.getFirstMapStringListString(DOCUMENTATION); if (documentationYAMLO == null) { String key = ELEMENT + SEPARATOR + DOCUMENTATION; @@ -128,7 +131,7 @@ elementOM.setDocumentation(documentationYAMLO); } - //TODO: tester + //tagValues YamlObject tagValues = elementYAMLO.getFirstMapStringListYamlObject(TAG_VALUES); if (tagValues != null) { for (Map.Entry<String, List<String>> tagValue : tagValues.getMapStringListString().entrySet()) { @@ -139,12 +142,13 @@ } } + //comments List<String> comments = elementYAMLO.getMapStringListString(COMMENTS); for (String comment : comments) { elementOM.addComment(comment); } - //TODO: ajouter setereotype par defaut + //stereotypes List<String> stereotypes = elementYAMLO.getMapStringListString(STEREOTYPES); for (String stereotype : stereotypes) { ObjectModelImplRef stereotypeOM = new ObjectModelImplRef(); @@ -156,6 +160,7 @@ public void loadClassifier(YamlObject classifierYAMLO, ObjectModelClassifierImpl classifierOM) { loadElement(classifierYAMLO, classifierOM); + //package String packageYAMLO = classifierYAMLO.getFirstMapStringListString(PACKAGE); if (packageYAMLO == null) { classifierOM.setPackage(packageL); @@ -163,7 +168,7 @@ classifierOM.setPackage(packageYAMLO); } - + //extern String externYAMLO = classifierYAMLO.getFirstMapStringListString(EXTERN); if (externYAMLO == null) { String key = CLASSIFIER + SEPARATOR + EXTERN; @@ -175,6 +180,7 @@ } + //inner String innerYAMLO = classifierYAMLO.getFirstMapStringListString(INNER); if (innerYAMLO == null) { String key = CLASSIFIER + SEPARATOR + INNER; @@ -185,6 +191,7 @@ classifierOM.setInner(Boolean.valueOf(innerYAMLO)); } + //type String typeYAMLO = classifierYAMLO.getFirstMapStringListString(TYPE); if (typeYAMLO == null) { String key = CLASSIFIER + SEPARATOR + TYPE; @@ -195,18 +202,21 @@ classifierOM.setType(typeYAMLO); } + //attributes for (YamlObject attributeYAMLO : classifierYAMLO.getMapStringListYamlObject(ATTRIBUTE)) { ObjectModelAttributeImpl attributeOM = new ObjectModelAttributeImpl(); loadAttribute(attributeYAMLO, attributeOM); classifierOM.addAttribute(attributeOM); } + //operations for (YamlObject operationYAMLO : classifierYAMLO.getMapStringListYamlObject(OPERATION)) { ObjectModelOperationImpl operationOM = new ObjectModelOperationImpl(); loadOperation(operationYAMLO, operationOM); classifierOM.addOperation(operationOM); } + //superInterfaces List<String> superInterfacesYAMLO = classifierYAMLO.getMapStringListString(SUPER_INTERFACES); for (String superInterfaceYAMLO : superInterfacesYAMLO) { ObjectModelImplRef superInterfaceOM = new ObjectModelImplRef(); @@ -218,6 +228,7 @@ public void loadClass(YamlObject classYAMLO, ObjectModelClassImpl classOM) { loadClassifier(classYAMLO, classOM); + //abstract String abstractYAMLO = classYAMLO.getFirstMapStringListString(ABSTRACT); if (abstractYAMLO == null) { String key = CLASS + SEPARATOR + ABSTRACT; @@ -228,6 +239,7 @@ classOM.setAbstract(Boolean.valueOf(abstractYAMLO)); } + //superClasses List<String> superClassesYAMLO = classYAMLO.getMapStringListString(SUPER_CLASSES); for (String superClassYAMLO : superClassesYAMLO) { ObjectModelImplSuperClassRef superClassOM = new ObjectModelImplSuperClassRef(); @@ -245,10 +257,11 @@ //TODO: remplacer name par type et attribute par name ? -> confusion //TODO: remplacer PARTICIPANT par PARTICIPANTS (List) + //participants for (YamlObject participantYAMLO : associationClassYAML.getMapStringListYamlObject(PARTICIPANT)) { ObjectModeImplAssociationClassParticipant participantOM = new ObjectModeImplAssociationClassParticipant(); participantOM.setAssociationClass(associationClassOM); - + //name String nameYAMLO = participantYAMLO.getFirstMapStringListString(NAME); if (nameYAMLO == null) { String key = ASSOCIATION_CLASS + SEPARATOR + PARTICIPANT + SEPARATOR + NAME; @@ -258,7 +271,7 @@ } else { participantOM.setName(nameYAMLO); } - + //attribute String attributeYAMLO = participantYAMLO.getFirstMapStringListString(ATTRIBUTE); if (attributeYAMLO == null) { String key = ASSOCIATION_CLASS + SEPARATOR + PARTICIPANT + SEPARATOR + ATTRIBUTE; @@ -277,13 +290,15 @@ loadElement(enumerationYAMLO, enumerationOM); //TODO: remplacer LITERAL par LITERALS (List) - List<String> literalsYAMLO = enumerationYAMLO.getMapStringListString(LITERAL); + //lierals + List<String> literalsYAMLO = enumerationYAMLO.getMapStringListString(LITERALS); for (String literalYAMLO : literalsYAMLO) { ObjectModelImplRef literalOM = new ObjectModelImplRef(); literalOM.setName(literalYAMLO); enumerationOM.addLiteral(literalOM); } + //package String packageYAMLO = enumerationYAMLO.getFirstMapStringListString(PACKAGE); if (packageYAMLO == null) { enumerationOM.setPackage(packageL); @@ -295,6 +310,7 @@ public void loadParameter(YamlObject parameterYAMLO, ObjectModelParameterImpl parameterOM) { loadElement(parameterYAMLO, parameterOM); + //ordering String orderingYAMLO = parameterYAMLO.getFirstMapStringListString(ORDERING); if (orderingYAMLO == null) { String key = PARAMETER + SEPARATOR + ORDERING; @@ -305,6 +321,7 @@ parameterOM.setOrdering(orderingYAMLO); } + //type String typeYAMLO = parameterYAMLO.getFirstMapStringListString(TYPE); if (typeYAMLO == null) { String key = PARAMETER + SEPARATOR + TYPE; @@ -315,6 +332,7 @@ parameterOM.setType(typeYAMLO); } + //defaultValues String defaultValueYAMLO = parameterYAMLO.getFirstMapStringListString(DEFAULT_VALUE); if (defaultValueYAMLO == null) { String key = PARAMETER + SEPARATOR + DEFAULT_VALUE; @@ -325,6 +343,7 @@ parameterOM.setDefaultValue(defaultValueYAMLO); } + //minMultiplicity String minMultiplicityYAMLO = parameterYAMLO.getFirstMapStringListString(MIN_MULTIPLICITY); if (minMultiplicityYAMLO == null) { String key = PARAMETER + SEPARATOR + MIN_MULTIPLICITY; @@ -335,6 +354,7 @@ parameterOM.setMinMultiplicity(Integer.valueOf(minMultiplicityYAMLO)); } + //maxMultiplicity String maxMultiplicityYAMLO = parameterYAMLO.getFirstMapStringListString(MAX_MULTIPLICITY); if (maxMultiplicityYAMLO == null) { String key = PARAMETER + SEPARATOR + MAX_MULTIPLICITY; @@ -346,6 +366,7 @@ } + //ordered String orderedYAMLO = parameterYAMLO.getFirstMapStringListString(ORDERED); if (orderedYAMLO == null) { String key = PARAMETER + SEPARATOR + ORDERED; @@ -356,6 +377,7 @@ parameterOM.setOrdered(Boolean.valueOf(orderedYAMLO)); } + //unique String uniqueYAMLO = parameterYAMLO.getFirstMapStringListString(UNIQUE); if (uniqueYAMLO == null) { String key = PARAMETER + SEPARATOR + UNIQUE; @@ -370,6 +392,7 @@ public void loadAttribute(YamlObject attributeYAMLO, ObjectModelAttributeImpl attributeOM) { loadParameter(attributeYAMLO, attributeOM); + //navigable String navigableYAMLO = attributeYAMLO.getFirstMapStringListString(NAVIGABLE); if (navigableYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + NAVIGABLE; @@ -380,6 +403,7 @@ attributeOM.setNavigable(Boolean.valueOf(navigableYAMLO)); } + //associationType String associationTypeYAMLO = attributeYAMLO.getFirstMapStringListString(ASSOCIATION_TYPE); if (associationTypeYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + ASSOCIATION_TYPE; @@ -390,6 +414,7 @@ attributeOM.setAssociationType(associationTypeYAMLO); } + //final String finalYAMLO = attributeYAMLO.getFirstMapStringListString(FINAL); if (finalYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + FINAL; @@ -400,6 +425,7 @@ attributeOM.setFinal(Boolean.valueOf(finalYAMLO)); } + //static String staticYAMLO = attributeYAMLO.getFirstMapStringListString(STATIC); if (staticYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + STATIC; @@ -410,6 +436,7 @@ attributeOM.setStatic(Boolean.valueOf(staticYAMLO)); } + //associationClassName String associationClassNameYAMLO = attributeYAMLO.getFirstMapStringListString(ASSOCIATION_CLASS_NAME); if (associationClassNameYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + ASSOCIATION_CLASS_NAME; @@ -420,6 +447,7 @@ attributeOM.setAssociationClassName(associationClassNameYAMLO); } + //reverseAttributeName String reverseAttributeNameYAMLO = attributeYAMLO.getFirstMapStringListString(REVERSE_ATTRIBUTE_NAME); if (reverseAttributeNameYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + REVERSE_ATTRIBUTE_NAME; @@ -430,6 +458,7 @@ attributeOM.setReverseAttributeName(reverseAttributeNameYAMLO); } + //reverseMaxMultiplicity String reverseMaxMultiplicityYAMLO = attributeYAMLO.getFirstMapStringListString(REVERSE_MAX_MULTIPLICITY); if (reverseMaxMultiplicityYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + REVERSE_MAX_MULTIPLICITY; @@ -440,6 +469,7 @@ attributeOM.setReverseMaxMultiplicity(Integer.valueOf(reverseMaxMultiplicityYAMLO)); } + //transient String transientYAMLO = attributeYAMLO.getFirstMapStringListString(TRANSIENT); if (transientYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + TRANSIENT; @@ -450,6 +480,7 @@ attributeOM.setTransient(Boolean.valueOf(transientYAMLO)); } + //visibility String visibilityYAMLO = attributeYAMLO.getFirstMapStringListString(VISIBILITY); if (visibilityYAMLO == null) { String key = ATTRIBUTE + SEPARATOR + VISIBILITY; @@ -464,6 +495,7 @@ public void loadOperation(YamlObject operationYAMLO, ObjectModelOperationImpl operationOM) { loadElement(operationYAMLO, operationOM); + //abstract String abstractYAMLO = operationYAMLO.getFirstMapStringListString(ABSTRACT); if (abstractYAMLO == null) { String key = OPERATION + SEPARATOR + ABSTRACT; @@ -474,6 +506,7 @@ operationOM.setAbstract(Boolean.valueOf(abstractYAMLO)); } + //visibility String visibilityYAMLO = operationYAMLO.getFirstMapStringListString(VISIBILITY); if (visibilityYAMLO == null) { String key = OPERATION + SEPARATOR + VISIBILITY; @@ -484,18 +517,21 @@ operationOM.setVisibility(visibilityYAMLO); } + //returnParameter for (YamlObject returnParameterYAMLO : operationYAMLO.getMapStringListYamlObject(RETURN_PARAMETER)) { ObjectModelParameterImpl returnParameterOM = new ObjectModelAttributeImpl(); loadParameter(returnParameterYAMLO, returnParameterOM); operationOM.setReturnParameter(returnParameterOM); } + //parameter for (YamlObject parameterYAMLO : operationYAMLO.getMapStringListYamlObject(PARAMETER)) { ObjectModelParameterImpl parameterOM = new ObjectModelAttributeImpl(); loadParameter(parameterYAMLO, parameterOM); operationOM.addParameter(parameterOM); } + //bodyCode String bodyCodeYAMLO = operationYAMLO.getFirstMapStringListString(BODY_CODE); if (bodyCodeYAMLO == null) { String key = OPERATION + SEPARATOR + BODY_CODE; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -24,6 +24,7 @@ } public void loadFile(File file, ObjectModel model) throws IOException { + //parse le fichier YAML InputStream inputModel = new FileInputStream(file); Object modelYAML = yaml.load(inputModel); inputModel.close(); @@ -31,6 +32,7 @@ ObjectModelImpl modelOM = (ObjectModelImpl) model; YamlObject modelYAMLO = new YamlObject(); + //recherche la version Object version = null; String syntaxeVersion = "0"; String defaultVersion = "0"; @@ -50,6 +52,7 @@ defaultVersion = YamlUtil.afterChar(String.valueOf(version), '.'); } + //charge le modele en fonction de la version if (syntaxeVersion.equals("1")) { SyntaxePureYaml.loadYamlObject(modelYAML, modelYAMLO); } else if (syntaxeVersion.equals("2")) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserPureYaml.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -10,6 +10,7 @@ */ public class ParserPureYaml { + //charge recursivement le modelYAML dans le modelYAMLO public static void parseModel(Object modelYAML, YamlObject modelYAMLO) { if (modelYAML instanceof List) { for (Object tmp1 : (List) modelYAML) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -49,7 +49,6 @@ if (key.equals(IMPORTS)) { if (value instanceof List) { for (Object imp : (List) value) { - //modelYAMLO.addStringToMap(IMPORTS,String.valueOf(imp)); importsE.put(YamlUtil.afterChar(String.valueOf(imp), '.'), String.valueOf(imp)); } } @@ -166,7 +165,6 @@ } } - //TODO: factoriser le code (classifier) public void parseInterface(String key, Object value, YamlObject interfaceYAMLO) { List<String> interfacePARSE = YamlUtil.charParseIgnore(key, ' ', '<', '>'); if (interfacePARSE.contains(INTERFACE)) { @@ -310,7 +308,7 @@ } if (value instanceof Map) { - //TODO: utiliser variable locales pour plus de clartee + //TODO: utiliser variable locales if (((Map) value).containsKey(PARTICIPANT)) { if (((Map) value).get(PARTICIPANT) instanceof Map) { for (Object entry : ((Map) ((Map) value).get(PARTICIPANT)).entrySet()) { @@ -405,16 +403,16 @@ } if (value instanceof Map) { - //TODO: utiliser variable locales pour plus de clartee - if (((Map) value).containsKey(LITERAL)) { - if (((Map) value).get(LITERAL) instanceof Map) { - for (Object entry : ((Map) ((Map) value).get(LITERAL)).entrySet()) { + //TODO: utiliser variable locales + if (((Map) value).containsKey(LITERALS)) { + if (((Map) value).get(LITERALS) instanceof Map) { + for (Object entry : ((Map) ((Map) value).get(LITERALS)).entrySet()) { if (entry instanceof Map.Entry) { - enumerationYAMLO.addStringToMap(LITERAL, String.valueOf(((Map.Entry) entry).getKey())); + enumerationYAMLO.addStringToMap(LITERALS, String.valueOf(((Map.Entry) entry).getKey())); } } } - ((Map) value).remove(LITERAL); + ((Map) value).remove(LITERALS); } } @@ -687,7 +685,7 @@ } return res.toString(); } - + // String -> java.lang.String public String resolveType(String type) { List<Character> ignore = new LinkedList<Character>(); ignore.add(' '); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/SyntaxePureYaml.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -5,6 +5,7 @@ * Date: 30/05/13 * Time: 11:23 */ +//TODO: interface Syntaxe pour futures syntaxes public class SyntaxePureYaml { public static void loadYamlObject(Object modelYAML, YamlObject modelYAMLO) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -9,11 +9,15 @@ * User: agiraudet * Date: 28/05/13 * Time: 16:41 + * + * le YamlObject est un objet intermédiaire et très laxiste, pouvant s'adapter à d'éventuelles évolutions + * (en cas d'évolutions de la syntaxe YAML ou de l'ObjectModel, les modifications permettant de conserver les interactions seront légères) + * */ public class YamlObject { protected Map<String, List<String>> mapStringListString; protected Map<String, List<YamlObject>> mapStringListYamlObject; - //TODO: améliorer nom méthodes + //TODO: améliorer noms méthodes public YamlObject() { mapStringListString = new LinkedHashMap<String, List<String>>(); @@ -80,7 +84,7 @@ return mapStringListYamlObject.get(key); } } - //return null; + //return null;//permet parcours return new LinkedList<YamlObject>(); } @@ -90,7 +94,7 @@ return mapStringListString.get(key); } } - //return null; + //return null;//permet parcours return new LinkedList<String>(); } @@ -189,11 +193,9 @@ } for (Map.Entry<String, List<YamlObject>> entry : mapStringListYamlObject.entrySet()) { for (YamlObject yobj : entry.getValue()) { - //test temporaire if (yobj != null) { res.append(indentation).append(entry.getKey()).append(":\n").append(yobj.toString(" " + indentation)).append("\n"); } - //test } } return res.toString(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -96,6 +96,7 @@ } } + //decoupe une chaine par le caractere passe en parametre public static List<String> charParse(String str, Character target) { LinkedList<String> res = new LinkedList<String>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C @@ -140,6 +141,7 @@ return res; } + //permet de parser une chaine en ignorant les parentheses par exemple public static List<String> charParseIgnore(String str, Character target, Character ignoreStart, Character ignoreEnd) { LinkedList<String> res = new LinkedList<String>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C @@ -208,6 +210,7 @@ return res.toString(); } + //extrait une chaine delimitee par les caracteres en parametres public static String extract(Character start, Character end, String str) { StringBuilder tmp = new StringBuilder(str.length() + 1); boolean start_end = false; Added: trunk/eugene-plantuml-templates/src/resources/images/Pollen.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/resources/images/Pollen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/resources/images/legend1.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/resources/images/legend1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/resources/images/legend2.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/resources/images/legend2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/eugene-plantuml-templates/src/resources/images/legend3.png =================================================================== (Binary files differ) Property changes on: trunk/eugene-plantuml-templates/src/resources/images/legend3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2013-06-14 15:43:32 UTC (rev 1279) @@ -31,17 +31,17 @@ Présentation ------------ -Le plugin *eugene-plantuml-templates* est un template permettant de générer un diagramme de classes `PlantUML` à partir d'un `ObjectModel` au moment de l'installation d'un projet. -`PlantUML` utilise Graphviz lors de la génération d'images, si vous ne pouvez pas installer `Graphviz`, le `PlantUML Server` permet de générer des diagrammes en ligne. +Le plugin *eugene-plantuml-templates* est un template permettant de générer un diagramme de classes `PlantUML`_ à partir d'un `ObjectModel`_ au moment de l'installation d'un projet. +`PlantUML`_ utilise Graphviz lors de la génération d'images, si vous ne pouvez pas installer `Graphviz`_, le `PlantUML Server`_ permet de générer des diagrammes en ligne. Démonstration ----------------------------- -Voici un exemple d'utilisation du plugin *eugene-plantuml-templates* avec le projet `Pollen`. +Voici un exemple d'utilisation du plugin *eugene-plantuml-templates* avec le projet `Pollen`_. Ajouter le template dans le pom.xml ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Après avoir récupéré les sources du projet `Pollen`, on ajoute le template PlantUML au fichier pollen-persistence/pom.xml (sans oublier la virgule pour séparer les templates):: +Après avoir récupéré les sources du projet `Pollen`_, on ajoute le template PlantUML au fichier pollen-persistence/pom.xml (sans oublier la virgule pour séparer les templates):: <templates> org.nuiton.topia.generator.TopiaMetaTransformer, @@ -52,29 +52,36 @@ Installation du projet ~~~~~~~~~~~~~~~~~~~~~~ On lance ensuite l'installation avec la commande:: + pollen$ mvn install + La ligne suivante devrait apparaitre lors de l'installation:: + [INFO] Apply generator PlantumlTemplatesGenerator" Résultat ~~~~~~~~ Le diagramme de classe se trouve dans le répertoire pollen-persistence/target/classes (ou pollen-persistence/target/generated-sources/java): -Pollen.plantuml est la représentation textuelle du modèle en `PlantUML` -Pollen.png est l'image générée par `PlantUML` à partir du fichier Pollen.plantuml -Pour générer le diagramme à partir du `PlantUML Server`, il suffit de copier le contenu du fichier Pollen.plantuml dans le formulaire du site et d'envoyer. +Pollen.plantuml est la représentation textuelle du modèle en `PlantUML`_ +Pollen.png est l'image générée par `PlantUML`_ à partir du fichier Pollen.plantuml +Pour générer le diagramme à partir du `PlantUML Server`_, il suffit de copier le contenu du fichier Pollen.plantuml dans le formulaire du site et d'envoyer. Voici à quoi devrait ressembler le diagramme: + .. image:: ../images/Pollen.png Légende ~~~~~~~ Visibilité: + .. image:: ../images/legend1.png Abstract & Static: + .. image:: ../images/legend2.png Relations: + .. image:: ../images/legend3.png .. _PlantUML : http://plantuml.sourceforge.net/index.html Modified: trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java =================================================================== --- trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java 2013-06-14 14:23:53 UTC (rev 1278) +++ trunk/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java 2013-06-14 15:43:32 UTC (rev 1279) @@ -16,7 +16,7 @@ @Override public void generateFromModel(Writer output, ObjectModel input) throws IOException { - ;//TODO: + ;//TODO } @Override

1 0