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

r1328 - in trunk: eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/models/object/xml eugene/src/test/java/org/nuiton/eugene eugene/src/test/java/org/nuiton/eugene/java eugene-java-templates/src/main/java/org/nuiton/eugene/java eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator
by bleny＠users.nuiton.org April 15, 2014

April 15, 2014

Author: bleny Date: 2014-04-15 15:20:57 +0200 (Tue, 15 Apr 2014) New Revision: 1328 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1328 Log: fixes #3147 Review implications of ordering and uniqueness in collections Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -45,14 +45,20 @@ * Stéréotype pour les attributs à indexer en base. * * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute) + * @deprecated use {@link #STEREOTYPE_ORDERED} instead */ @StereotypeDefinition(target = ObjectModelAttribute.class, documentation = "To specify that a attribute is indexed") + @Deprecated String STEREOTYPE_INDEXED = "indexed"; /** - * Stéréotype pour les attributs à ordonner. + * Stereotype to mark an attribute with multiplicity as ordered. * + * It means that order of insertion is maintained: in Java, it will lead + * to a collection typed with {@link java.util.List} or {@link java.util.LinkedHashSet} + * or {@link java.util.LinkedHashMap}. + * * @see GeneratorUtil#hasOrderedStereotype(ObjectModelAttribute) * @since 2.3 */ @@ -61,6 +67,18 @@ String STEREOTYPE_ORDERED = "ordered"; /** + * Stereotype to mark an attribute with multiplicity as unique. + * + * It means that uniqueness of elements is maintained in the collection: in Java, it + * will lead to a collection typed with {@link java.util.Set}. + * + * @see JavaGeneratorUtil#hasUniqueStereotype(ObjectModelAttribute) + */ + @StereotypeDefinition(target = ObjectModelAttribute.class, + documentation = "To specify that an attribute is unique") + String STEREOTYPE_UNIQUE = "unique"; + + /** * Stereotype to skip generation for some transformer. * * @see JavaGeneratorUtil#hasSkipStereotype(ObjectModelClassifier) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -42,7 +42,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -119,42 +118,6 @@ } /** - * @param attribute the attribute to test - * @return the type of the given attribute - * @see #getAttributeType(ObjectModelParameter, boolean) - */ - public static String getAttributeType(ObjectModelParameter attribute) { - return getAttributeType(attribute, false); - } - - /** - * Retourne le type de l'attribut, c-a-d une List ou une collection - * ou le type defini si la cardinalité n'est pas multiple - * - * @param attribute the attribute to test - * @param useGenerics {@code true} if the attribute use a generic type - * @return attribute type - */ - public static String getAttributeType(ObjectModelParameter attribute, - boolean useGenerics) { - String result; - if (attribute instanceof ObjectModelAttribute - && isNMultiplicity((ObjectModelAttribute) attribute)) { - if (attribute.isOrdered()) { - result = List.class.getName(); - } else { - result = Collection.class.getName(); - } - if (useGenerics) { - result += "<" + attribute.getType() + ">"; - } - } else { - result = attribute.getType(); - } - return result; - } - - /** * Indicates if the specified attribute has a primitive type (byte, boolean, ...) * * @param attribute the attribute to test @@ -420,24 +383,6 @@ } /** - * ToString contract for ObjectModelParameter with type and name. This - * contract is used in - * {@link StringUtil#join(Iterable, org.nuiton.util.StringUtil.ToString, String, boolean)} - */ - static final StringUtil.ToString<ObjectModelParameter> - OBJECT_MODEL_PARAMETER_TO_STRING_TYPE = - new StringUtil.ToString<ObjectModelParameter>() { - - @Override - public String toString(ObjectModelParameter param) { - return new StringBuilder(getAttributeType(param)). - append(' '). - append(param.getName()). - toString(); - } - }; - - /** * ToString contract for ObjectModelParameter with name only. This contract * is used in * {@link StringUtil#join(Iterable, org.nuiton.util.StringUtil.ToString, String, boolean)} @@ -452,27 +397,7 @@ } }; - /** - * Used to return the {@code operation} parameters for its declaration : - * type and name of each parameter will be join as a string separated by a - * comma. Usefull for operation parameters declaration in templates writing. - * - * @param operation to treate - * @return the string corresponding to the list of operation parameters - * for declaration syntax. - */ - public static String getOperationParametersListDeclaration( - ObjectModelOperation operation) { - String result = StringUtil.join( - operation.getParameters(), - OBJECT_MODEL_PARAMETER_TO_STRING_TYPE, - ", ", - false); - return result; - } - - /** * Used to return the {@code operation} parameter names as a string * separated by a comma. Usefull for operation call in templates writing. * @@ -491,25 +416,6 @@ } /** - * @param clazz the class where to look at - * @return sous forme de String la liste des déclarations des attributes d'une classe donnée - */ - public static String getClassAttributesListDeclaration( - ObjectModelClass clazz) { - StringBuilder result = new StringBuilder(); - - Collection<ObjectModelAttribute> params = clazz.getAttributes(); - for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext(); ) { - ObjectModelAttribute attr = j.next(); - result.append(getAttributeType(attr, true)).append(" ").append(attr.getName()); - if (j.hasNext()) { - result.append(", "); - } - } - return result.toString(); - } - - /** * Renvoie si l'attribut passé en paramètre est premier lexicographiquement * par rapport à son attribut inverse (si celui ci existe). * @@ -849,7 +755,9 @@ * @return {@code true} if stereotype was found, {@code false otherwise} * @see EugeneStereoTypes#STEREOTYPE_INDEXED * @since 2.3 + * @deprecated {@link org.nuiton.eugene.EugeneStereoTypes#STEREOTYPE_INDEXED} is deprecated */ + @Deprecated public static boolean hasIndexedStereotype(ObjectModelAttribute attribute) { return attribute.hasStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED); } @@ -868,6 +776,19 @@ } /** + * Check if the given attribute has the + * {@link EugeneStereoTypes#STEREOTYPE_UNIQUE} stereotype. + * + * @param attribute attribute to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see EugeneStereoTypes#STEREOTYPE_UNIQUE + * @since 2.8 + */ + public static boolean hasUniqueStereotype(ObjectModelAttribute attribute) { + return attribute.hasStereotype(EugeneStereoTypes.STEREOTYPE_UNIQUE); + } + + /** * Obtain the value of the {@link EugeneTagValues#TAG_DOCUMENTATION} * tag value on the given model. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -29,15 +29,24 @@ import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.util.StringUtil; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Set; /** * Utility class for pure java templates. @@ -409,4 +418,160 @@ return parts.toArray(new String[parts.size()]); } + + public static boolean isOrdered(ObjectModelAttribute attr) { + return attr.isOrdered() || hasOrderedStereotype(attr); + } + + public static Class<?> getCollectionType(ObjectModelAttribute attr) { + + boolean ordered = isOrdered(attr); + boolean unique = hasUniqueStereotype(attr); + + // Change type for Multiple attribute + Class<?> result; + + if (ordered) { + if (unique) { + result = LinkedHashSet.class; + } else { + result = List.class; + } + } else { + if (unique) { + result = Set.class; + } else { + result = Collection.class; + } + } + return result; + } + + public static Class<?> getCollectionInstanceType(ObjectModelAttribute attr) { + + boolean ordered = isOrdered(attr); + boolean unique = hasUniqueStereotype(attr); + + // Change type for Multiple attribute + Class<?> result; + + if (ordered) { + if (unique) { + result = LinkedHashSet.class; + } else { + result = LinkedList.class; + } + } else { + if (unique) { + result = HashSet.class; + } else { + result = LinkedList.class; + } + } + return result; + } + + /** + * Used to return the {@code operation} parameters for its declaration : + * type and name of each parameter will be join as a string separated by a + * comma. Usefull for operation parameters declaration in templates writing. + * + * @param operation to treate + * @return the string corresponding to the list of operation parameters + * for declaration syntax. + */ + public static String getOperationParametersListDeclaration( + ObjectModelOperation operation) { + String result = StringUtil.join( + operation.getParameters(), + OBJECT_MODEL_PARAMETER_TO_STRING_TYPE, + ", ", + false); + return result; + } + + /** + * ToString contract for ObjectModelParameter with type and name. This + * contract is used in + * {@link StringUtil#join(Iterable, org.nuiton.util.StringUtil.ToString, String, boolean)} + */ + static final StringUtil.ToString<ObjectModelParameter> + OBJECT_MODEL_PARAMETER_TO_STRING_TYPE = + new StringUtil.ToString<ObjectModelParameter>() { + + @Override + public String toString(ObjectModelParameter param) { + return new StringBuilder(getAttributeType(param)). + append(' '). + append(param.getName()). + toString(); + } + }; + + /** + * @param clazz the class where to look at + * @return sous forme de String la liste des déclarations des attributes d'une classe donnée + */ + public static String getClassAttributesListDeclaration( + ObjectModelClass clazz) { + StringBuilder result = new StringBuilder(); + + Collection<ObjectModelAttribute> params = clazz.getAttributes(); + for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext(); ) { + ObjectModelAttribute attr = j.next(); + result.append(getAttributeType(attr, true)).append(" ").append(attr.getName()); + if (j.hasNext()) { + result.append(", "); + } + } + return result.toString(); + } + + /** + * @param attribute the attribute to test + * @return the type of the given attribute + * @see #getAttributeType(ObjectModelParameter, boolean) + */ + public static String getAttributeType(ObjectModelParameter attribute) { + return getAttributeType(attribute, false); + } + + /** + * Retourne le type de l'attribut, c-a-d une List ou une collection + * ou le type defini si la cardinalité n'est pas multiple + * + * @param attribute the attribute to test + * @param useGenerics {@code true} if the attribute use a generic type + * @return attribute type + */ + public static String getAttributeType(ObjectModelParameter attribute, + boolean useGenerics) { + return getAttributeType(attribute, attribute.getType(), useGenerics); + } + + /** + * Retourne le type de l'attribut, c-a-d une List ou une collection + * ou le type defini si la cardinalité n'est pas multiple + * + * @param attribute the attribute to test + * @param attributeType the attribute type + * @param useGenerics {@code true} if the attribute use a generic type + * @return attribute type + */ + public static String getAttributeType(ObjectModelParameter attribute, + String attributeType, + boolean useGenerics) { + String result; + if (attribute instanceof ObjectModelAttribute + && isNMultiplicity((ObjectModelAttribute) attribute)) { + + result = getCollectionType((ObjectModelAttribute) attribute).getName(); + if (useGenerics) { + result += "<" + attributeType + ">"; + } + } else { + result = attributeType; + } + return result; + } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -31,7 +31,6 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -307,13 +306,4 @@ } return super.addStereotype(stereotype); } - - /** - * FIXME tchemit 2010-11-28 Why the ordered flag may be indexed ? This is two distinct concepts ? - */ - @Override - public boolean isOrdered() { - return JavaGeneratorUtil.hasIndexedStereotype(this) || super.isOrdered(); - } - } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -69,38 +69,7 @@ Assert.assertEquals("param1, param2", result); } - @Test - public void testGetOperationParametersListDeclaration() { - if (log.isDebugEnabled()) { - log.debug("getOperationParametersListDeclaration"); - } - ObjectModelOperationImpl op = new ObjectModelOperationImpl(); - - // Without any params - String result = GeneratorUtil.getOperationParametersListDeclaration(op); - Assert.assertEquals("", result); - - // With one param - ObjectModelParameterImpl param1 = new ObjectModelParameterImpl(); - param1.setType("String"); - param1.setName("param1"); - op.addParameter(param1); - - result = GeneratorUtil.getOperationParametersListDeclaration(op); - Assert.assertEquals("String param1", result); - - // With two params - ObjectModelParameterImpl param2 = new ObjectModelParameterImpl(); - param2.setType("Date"); - param2.setName("param2"); - op.addParameter(param2); - - result = GeneratorUtil.getOperationParametersListDeclaration(op); - Assert.assertEquals("String param1, Date param2", result); - } - - /** Test of getSimpleName method, of class GeneratorUtil. */ @Test public void testGetSimpleName() { Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -24,8 +24,13 @@ */ package org.nuiton.eugene.java; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; import org.nuiton.util.StringUtil; import java.beans.Introspector; @@ -38,6 +43,8 @@ */ public class JavaGeneratorUtilTest { + private static final Log log = LogFactory.getLog(JavaGeneratorUtilTest.class); + @Test public void splitGeneric() throws Exception { @@ -168,4 +175,35 @@ Assert.assertEquals(expected, actual); Assert.assertEquals(Introspector.decapitalize(actual), original); } + + @Test + public void testGetOperationParametersListDeclaration() { + if (log.isDebugEnabled()) { + log.debug("getOperationParametersListDeclaration"); + } + + ObjectModelOperationImpl op = new ObjectModelOperationImpl(); + + // Without any params + String result = JavaGeneratorUtil.getOperationParametersListDeclaration(op); + Assert.assertEquals("", result); + + // With one param + ObjectModelParameterImpl param1 = new ObjectModelParameterImpl(); + param1.setType("String"); + param1.setName("param1"); + op.addParameter(param1); + + result = JavaGeneratorUtil.getOperationParametersListDeclaration(op); + Assert.assertEquals("String param1", result); + + // With two params + ObjectModelParameterImpl param2 = new ObjectModelParameterImpl(); + param2.setType("Date"); + param2.setName("param2"); + op.addParameter(param2); + + result = JavaGeneratorUtil.getOperationParametersListDeclaration(op); + Assert.assertEquals("String param1, Date param2", result); + } } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -40,7 +40,6 @@ import java.beans.PropertyChangeSupport; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -182,11 +181,7 @@ ); // Change type for Multiple attribute - if (attr.isOrdered()) { - attrType = List.class.getName() + "<" + attrType + ">"; - } else { - attrType = Collection.class.getName() + "<" + attrType + ">"; - } + attrType = JavaGeneratorUtil.getAttributeType(attr, true); simpleType = JavaGeneratorUtil.getSimpleName(attrType); } Modified: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -39,34 +39,33 @@ package org.nuiton.eugene.test.generator; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; +import org.nuiton.eugene.java.extension.ImportsManager; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; import java.io.File; import java.io.IOException; import java.io.Serializable; import java.io.Writer; +import java.lang.String; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; +import java.util.HashSet; import java.util.Iterator; - import java.util.List; import java.util.Set; -import java.util.HashSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelGenerator; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.java.extension.ImportsManagerExtension; -import org.nuiton.eugene.java.extension.ImportsManager; - /** * DTO generator * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanGenerator" @@ -156,7 +155,7 @@ } boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(STEREOTYPE_ENTITY)); needGetEntityMethod |= isEntity; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { needListInImport = true; } } @@ -359,7 +358,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); + attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); } /*{ <%=attrVisibility%> <%=attrType%> <%=attrName%>; @@ -408,7 +407,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); + attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); } /*{ public <%=attrType%> get<%=attrNameCapitalized%>() { return <%=attrName%>; @@ -442,7 +441,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); + attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); } /*{ public void set<%=attrNameCapitalized%>(<%=attrType%> newValue) { <%=attrType%> oldValue = get<%=attrNameCapitalized%>(); @@ -588,18 +587,6 @@ }*/ } - protected String getCollection(ObjectModelAttribute attr, String attrType) { - String nMultType; - if (attr.isOrdered()) { - nMultType = "List<"; - } else { - nMultType = "Collection<"; - } - nMultType += attrType; - nMultType += ">"; - return nMultType; - } - protected boolean isAbstract(ObjectModelClass clazz) { if (clazz.isAbstract()) { return true; Modified: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2014-04-15 09:37:25 UTC (rev 1327) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2014-04-15 13:20:57 UTC (rev 1328) @@ -46,6 +46,7 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; @@ -177,11 +178,7 @@ ); // Change type for Multiple attribute - if (attr.isOrdered()) { - attrType = List.class.getName() + "<" + attrType + ">"; - } else { - attrType = Collection.class.getName() + "<" + attrType + ">"; - } + attrType = JavaGeneratorUtil.getAttributeType(attr, true); simpleType = GeneratorUtil.getSimpleName(attrType); }

1 0

Build failed in Jenkins: eugene-ci #8
by admin+ci-nuiton.org＠codelutin.com April 15, 2014

April 15, 2014

See <http://ci.nuiton.org/jenkins/job/eugene-ci/8/changes> Changes: [athimel] Fix dependenciesManagemet usage ------------------------------------------ [...truncated 137 lines...] WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (AbstractObjectModelReader.java:270) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene/target/test-clas…> WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.lejoliemodel] : the tagvalue 'lejoliemodel' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.Role.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (AbstractObjectModelReader.java:270) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene/target/test-clas…> WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.lejoliemodel] : the tagvalue 'lejoliemodel' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.Role.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.Role.class.tagvalue.role] : this tagvalue 'role' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. INFO [main] (AbstractObjectModelReader.java:270) loadModelProperties - 5 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene/target/test-clas…> WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.stereotype] : this stereotype 'pk' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.attribute.topiaId.tagvalue.string] : this tagvalue 'string' is unkown. WARN [main] (AbstractObjectModelReader.java:355) loadStereotype - Invalid stereotype [org.codelutin.topia.security.entities.RolePermission.class.stereotype] : this stereotype 'Permission' is unkown. WARN [main] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.codelutin.topia.security.entities.RolePermission.class.tagvalue.role] : this tagvalue 'role' is unkown. INFO [main] (AbstractObjectModelReader.java:270) loadModelProperties - 4 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene/target/test-clas…> Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.187 sec - in org.nuiton.eugene.models.object.ModelMergeTest Running org.nuiton.eugene.models.object.xml.ExternalCacheExtensionTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.nuiton.eugene.models.object.xml.ExternalCacheExtensionTest Running org.nuiton.eugene.models.object.xml.ObjectModelImplTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.nuiton.eugene.models.object.xml.ObjectModelImplTest Running org.nuiton.eugene.models.object.xml.ObjectModelBuilderTest Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.nuiton.eugene.models.object.xml.ObjectModelBuilderTest Running org.nuiton.eugene.models.object.XMI21ToObjectModelTest INFO [main] (TestHelper.java:58) getTestWorkdir - basedir for test <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene/target/surefire-…> WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one Recoverable error on line 877 FODC0002: java.io.FileNotFoundException: /var/local/forge/data/nuiton.org/jenkins/vpod-api/src/main/uml/conception.uml (No such file or directory) WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one Tests run: 10, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 3.063 sec - in org.nuiton.eugene.models.object.XMI21ToObjectModelTest Running org.nuiton.eugene.models.object.XMI12ToObjectModelTest WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [main] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.122 sec - in org.nuiton.eugene.models.object.XMI12ToObjectModelTest Running org.nuiton.eugene.models.object.ObjectModelGeneratorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec - in org.nuiton.eugene.models.object.ObjectModelGeneratorTest Running org.nuiton.eugene.GeneratorUtilTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in org.nuiton.eugene.GeneratorUtilTest Running org.nuiton.eugene.java.JavaBuilderTest Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec - in org.nuiton.eugene.java.JavaBuilderTest Running org.nuiton.eugene.java.extension.ImportsManagerExtensionTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.nuiton.eugene.java.extension.ImportsManagerExtensionTest Running org.nuiton.eugene.java.extension.ImportsManagerTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in org.nuiton.eugene.java.extension.ImportsManagerTest Running org.nuiton.eugene.java.JavaGeneratorUtilTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.nuiton.eugene.java.JavaGeneratorUtilTest Results : Tests run: 80, Failures: 0, Errors: 0, Skipped: 1 [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-ci/ws/trunk/eugene/target/eugene-2.…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ eugene --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: Java templates 2.8-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ eugene-java-templates --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-java-templates/t…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1: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] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ eugene-java-templates --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ eugene-java-templates --- [INFO] Compiling 10 source files to <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-java-templates/t…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [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-ci/ws/trunk/eugene-java-templates/t…> [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:3.1:testCompile (default-testCompile) @ eugene-java-templates --- [INFO] Compiling 1 source file to <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-java-templates/t…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ eugene-java-templates --- [INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-java-templates/t…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.eugene.java.JavaTemplatesModelPropertiesProviderTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.107 sec - in org.nuiton.eugene.java.JavaTemplatesModelPropertiesProviderTest 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-ci/ws/trunk/eugene-java-templates/t…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ eugene-java-templates --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: PlantUML templates 2.8-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… [INFO] Downloaded: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… (6 KB at 29.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… [INFO] Downloaded: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… (2593 KB at 8309.6 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ eugene-plantuml-templates --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ eugene-plantuml-templates --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ eugene-plantuml-templates --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ eugene-plantuml-templates --- [INFO] Compiling 1 source file to <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…>:[90,11] exception java.lang.InterruptedException is never thrown in body of corresponding try statement [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] EUGene ............................................ SUCCESS [ 2.335 s] [INFO] EUGene :: EUGene .................................. SUCCESS [ 9.696 s] [INFO] EUGene :: Java templates .......................... SUCCESS [ 1.180 s] [INFO] EUGene :: PlantUML templates ...................... FAILURE [ 0.781 s] [INFO] EUGene :: YAML templates .......................... SKIPPED [INFO] EUGene :: Maven plugin ............................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 15.690 s [INFO] Finished at: 2014-04-15T11:33:41+01:00 [INFO] Final Memory: 40M/578M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project eugene-plantuml-templates: Compilation failure [ERROR] <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…>:[90,11] exception java.lang.InterruptedException is never thrown in body of corresponding try statement [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project eugene-plantuml-templates: Compilation failure <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…>:[90,11] exception java.lang.InterruptedException is never thrown in body of corresponding try statement at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) 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:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) 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:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) 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:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) 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:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.nuiton.org/jenkins/job/eugene-ci/ws/trunk/eugene-plantuml-templat…>:[90,11] exception java.lang.InterruptedException is never thrown in body of corresponding try statement at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :eugene-plantuml-templates Failed to send e-mail to athimel 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 athimel because no e-mail address is known, and no default e-mail domain is configured

1 1

Build failed in Jenkins: eugene-ci » EUGene :: PlantUML templates #8
by admin+ci-nuiton.org＠codelutin.com April 15, 2014

April 15, 2014

See <http://ci.nuiton.org/jenkins/job/eugene-ci/org.nuiton.eugene$eugene-plantum…> Changes: [athimel] Fix dependenciesManagemet usage ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building EUGene :: PlantUML templates 2.8-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… [INFO] Downloaded: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… (6 KB at 29.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… [INFO] Downloaded: http://repo.maven.apache.org/maven2/net/sourceforge/plantuml/plantuml/7997/… (2593 KB at 8309.6 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ eugene-plantuml-templates --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/eugene-ci/org.nuiton.eugene$eugene-plantum…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ eugene-plantuml-templates --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ eugene-plantuml-templates --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ eugene-plantuml-templates --- [INFO] Compiling 1 source file to <http://ci.nuiton.org/jenkins/job/eugene-ci/org.nuiton.eugene$eugene-plantum…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/eugene-ci/org.nuiton.eugene$eugene-plantum…>:[90,11] exception java.lang.InterruptedException is never thrown in body of corresponding try statement [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

r1327 - trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml
by athimel＠users.nuiton.org April 15, 2014

April 15, 2014

Author: athimel Date: 2014-04-15 11:37:25 +0200 (Tue, 15 Apr 2014) New Revision: 1327 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1327 Log: Fix compilation issue due to plantuml update Modified: trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java 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 2014-04-15 09:32:17 UTC (rev 1326) +++ trunk/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java 2014-04-15 09:37:25 UTC (rev 1327) @@ -82,14 +82,11 @@ @Override public void applyTemplate(ObjectModel model, File destDir) throws IOException { super.applyTemplate(model, destDir); - try { - File plantuml = new File(destDir + File.separator + this.getFilenameForModel(model)); - SourceFileReader reader = new SourceFileReader(plantuml); - List<GeneratedImage> lst = reader.getGeneratedImages(); - new File(lst.get(0).getPngFile(), destDir + File.separator + model.getName() + ".png"); - } catch (InterruptedException e) { - e.printStackTrace(); - } + + File plantuml = new File(destDir + File.separator + this.getFilenameForModel(model)); + SourceFileReader reader = new SourceFileReader(plantuml); + List<GeneratedImage> lst = reader.getGeneratedImages(); + new File(lst.get(0).getPngFile(), destDir + File.separator + model.getName() + ".png"); } @Override

1 0

r1326 - in trunk: . eugene eugene-plantuml-templates
by athimel＠users.nuiton.org April 15, 2014

April 15, 2014

Author: athimel Date: 2014-04-15 11:32:17 +0200 (Tue, 15 Apr 2014) New Revision: 1326 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1326 Log: Fix dependenciesManagemet usage Modified: trunk/eugene-plantuml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) +++ trunk/eugene/pom.xml 2014-04-15 09:32:17 UTC (rev 1326) @@ -119,7 +119,6 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.12</version> </dependency> </dependencies> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:32:17 UTC (rev 1326) @@ -48,7 +48,6 @@ <dependency> <groupId>net.sourceforge.plantuml</groupId> <artifactId>plantuml</artifactId> - <version>7968</version> </dependency> </dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) +++ trunk/pom.xml 2014-04-15 09:32:17 UTC (rev 1326) @@ -149,6 +149,8 @@ <processorPluginVersion>1.3</processorPluginVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> + <plantumlVersion>7997</plantumlVersion> + <snakeyamlVersion>1.13</snakeyamlVersion>  <locales>en,fr</locales> @@ -320,6 +322,18 @@ <version>3.0.17</version> </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${snakeyamlVersion}</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.plantuml</groupId> + <artifactId>plantuml</artifactId> + <version>${plantumlVersion}</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r1325 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by athimel＠users.nuiton.org April 15, 2014

April 15, 2014

Author: athimel Date: 2014-04-15 11:08:58 +0200 (Tue, 15 Apr 2014) New Revision: 1325 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1325 Log: Let's start version 2.8-SNAPSHOT Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/eugene/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/eugene-java-templates/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/eugene-maven-plugin/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/eugene-yaml-templates/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) +++ trunk/pom.xml 2014-04-15 09:08:58 UTC (rev 1325) @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.7.5-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description>

1 0

r1324 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by athimel＠users.nuiton.org April 15, 2014

April 15, 2014

Author: athimel Date: 2014-04-15 11:05:35 +0200 (Tue, 15 Apr 2014) New Revision: 1324 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1324 Log: Back to version 2.7.5-SNAPSHOT Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-java-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-maven-plugin/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-yaml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,11 +28,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0</version> + <version>5.0.6-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description>

1 0

r1323 - trunk/eugene/src/main/java/org/nuiton/eugene/writer
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 11:55:24 +0200 (Mon, 07 Apr 2014) New Revision: 1323 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1323 Log: refs #3135 comment added Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:31:12 UTC (rev 1322) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:55:24 UTC (rev 1323) @@ -454,9 +454,18 @@ String path = url.getPath(); + // case where file is extracted from jar, "!" found into url, ex: + // url: /home/.../agrosyst-api/target/agrosyst-api-1.0.1-SNAPSHOT.jar!/agrosyst.objectmodel + // path: /home/.../agrosyst-services/target/extracted-sources/model/agrosyst.objectmodel + + // case where file is no extracted from jar, "!" not found into url, ex: + // url: /home/.../agrosyst-api/target/classes/agrosyst.objectmodel + // path: /home/.../agrosyst-services/target/extracted-sources/model/agrosyst.objectmodel + int index = path.indexOf("!"); if (index == -1) { - index = path.lastIndexOf("/") - 1; + // case where file is no extracted from jar: + index = path.lastIndexOf("/") - 1; // -1: because we need to keep the last "/" from path } String relativePath = path.substring(index + 1);

1 0

r1322 - trunk/eugene/src/main/java/org/nuiton/eugene/writer
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 11:31:12 +0200 (Mon, 07 Apr 2014) New Revision: 1322 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1322 Log: fixes #3135 corrige la phase de compilation ou les fichiers ne sont pas extraits d'un jar Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:41:35 UTC (rev 1321) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:31:12 UTC (rev 1322) @@ -454,14 +454,10 @@ String path = url.getPath(); - - //TODO david cossé 04/04/2014 : from 459 to 462, fix bug #3135 within windows. Find a better way to do this. - if (path.contains("/C:/")){ - int startFileName = path.lastIndexOf("/"); - path = path.substring(startFileName + 1); - } - int index = path.indexOf("!"); + if (index == -1) { + index = path.lastIndexOf("/") - 1; + } String relativePath = path.substring(index + 1); File f = new File(extractDirectory, relativePath);

1 0

r1321 - in trunk/eugene/src: main/java/org/nuiton/eugene/writer test/java/org/nuiton/eugene/models/object
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 10:41:35 +0200 (Mon, 07 Apr 2014) New Revision: 1321 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1321 Log: fixes ##3135 corrige les probl?\195?\168mes d'ex?\195?\169cution d'eugene sous Windows Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -453,13 +453,23 @@ } String path = url.getPath(); + + + //TODO david cossé 04/04/2014 : from 459 to 462, fix bug #3135 within windows. Find a better way to do this. + if (path.contains("/C:/")){ + int startFileName = path.lastIndexOf("/"); + path = path.substring(startFileName + 1); + } + int index = path.indexOf("!"); String relativePath = path.substring(index + 1); + File f = new File(extractDirectory, relativePath); if (log.isDebugEnabled()) { log.debug("extract " + url + " to " + f); } File parentFile = f.getParentFile(); + boolean b = parentFile.exists() || parentFile.mkdirs(); if (!b) { throw new IOException("Could not create directory " + f); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.util.Resource; import java.io.File; @@ -89,9 +90,12 @@ files[j - 1] = new File(url.toURI()); } - ObjectModelReader reader = new ObjectModelReader(); - ObjectModel objectModel = reader.read(files); - return objectModel; + XmlObjectModelReader generator = new XmlObjectModelReader(); + ObjectModel model = generator.read(files); + return model; +// ObjectModelReader reader = new ObjectModelReader(); +// ObjectModel objectModel = reader.read(files); +// return objectModel; // generator.generate(files, new File("target")); // return generator.getModel(); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -29,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.eugene.TestHelper; +import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.ResourceResolver; @@ -110,9 +111,12 @@ */ protected ObjectModel loadModel(File modelFile) throws IOException { // ObjectModelGenerator generator = new ObjectModelGenerator(); - ObjectModelReader reader = new ObjectModelReader(); - ObjectModel model = reader.read(modelFile); + XmlObjectModelReader generator = new XmlObjectModelReader(); + ObjectModel model = generator.read(modelFile); return model; +// ObjectModelReader reader = new ObjectModelReader(); +// ObjectModel model = reader.read(modelFile); +// return model; // generator.applyTemplate(model); // generator.generate(new File[] { modelFile }, new File("output")); // ObjectModel objectModel = generator.getModel();

1 0