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

r991 - trunk/eugene
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 16:08:25 +0100 (Thu, 18 Nov 2010) New Revision: 991 Url: http://nuiton.org/repositories/revision/eugene/991 Log: Evolution #1067: Updates nuiton-utils to 1.5.2 Modified: trunk/eugene/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-18 14:26:45 UTC (rev 990) +++ trunk/eugene/pom.xml 2010-11-18 15:08:25 UTC (rev 991) @@ -50,6 +50,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> </dependency> @@ -133,7 +138,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> <dependency>

1 0

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

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:45 +0100 (Thu, 18 Nov 2010) New Revision: 990 Url: http://nuiton.org/repositories/revision/eugene/990 Log: Evolution #1062: Add I18n method in JavageneratorUtil 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 2010-11-18 14:26:29 UTC (rev 989) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-18 14:26:45 UTC (rev 990) @@ -43,7 +43,9 @@ import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.models.object.ObjectModelTransformer; import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.i18n.I18n; +import java.beans.Introspector; import java.net.URL; import java.util.Collection; import java.util.Collections; @@ -480,7 +482,7 @@ /** * clone a given attribute into a classifier of the output model * - * @param attribute the original attribute + * @param source the original attribute * @param destination classifier where the clone will be added * @param cloneDocumentation flag to add documentation if some found in model * @param modifiers extra modifiers @@ -738,4 +740,46 @@ return fileLocation; } + /** + * Generates a static block with I18n keys for each navigable attributes + * prefixed by the given {@code i18nPrefix}. + * + * @param input the input classifier + * @param output the output classifier (to generate) + * @param i18nPrefix the i81n prefix to use + */ + protected void generateI18nBlock(ObjectModelClassifier input, + ObjectModelClassifier output, + String i18nPrefix) { + + ObjectModelOperation block = + addBlock(output, ObjectModelModifier.STATIC); + + StringBuilder buffer = new StringBuilder(300); + addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); + boolean useI18n = false; + for (ObjectModelAttribute attr : input.getAttributes()) { + //TC-20100225 only treate navigable relations + if (attr.isNavigable()) { + useI18n=true; + addI18n(buffer, + i18nPrefix, + Introspector.decapitalize(attr.getName()) + ); + } + } + if (useI18n) { + addImport(output, I18n.class); + } + setOperationBody(block, buffer.toString()); + } + + protected void addI18n(StringBuilder buffer, String i18nPrefix, + String suffix) { + buffer.append("\n I18n.n_(\""); + buffer.append(i18nPrefix); + buffer.append(suffix); + buffer.append("\");"); + } + }

1 0

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

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:29 +0100 (Thu, 18 Nov 2010) New Revision: 989 Url: http://nuiton.org/repositories/revision/eugene/989 Log: Evolution #1063: Can generateds i18n for Bean (JavaBeanTransformer) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-18 14:26:04 UTC (rev 988) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-18 14:26:29 UTC (rev 989) @@ -50,6 +50,12 @@ * JavaBeanTransformer generates simple bean with pcs support * (and nothing else) according to the JavaBeans 1.1 norm. * + * Since version 2.2.1, it is possible to + * <ul> + * <li>generate a simple POJO (says with no PCS support) by using the tag value {@link JavaGeneratorUtil#TAG_NO_PCS}.</li> + * <li>generate i18n keys using the tag value {@link JavaGeneratorUtil#TAG_I18N_PREFIX}.</li> + * </ul> + * * @author tchemit <chemit(a)codelutin.com> * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaBeanTransformer" * @since 2.0.2 @@ -77,6 +83,11 @@ log.debug("will generate " + output.getQualifiedName()); } + String i18nPrefix = JavaGeneratorUtil.getI18nPrefix(input, model); + if (!StringUtils.isEmpty(i18nPrefix)) { + generateI18nBlock(input, output, i18nPrefix); + } + ObjectModelClass ouputImpl = generateImpl(input, output); String noPCSTagValue = input.getTagValue(JavaGeneratorUtil.TAG_NO_PCS);

1 0

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

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:04 +0100 (Thu, 18 Nov 2010) New Revision: 988 Url: http://nuiton.org/repositories/revision/eugene/988 Log: Evolution #1062: Add I18n method in JavageneratorUtil Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-18 14:25:31 UTC (rev 987) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-18 14:26:04 UTC (rev 988) @@ -25,7 +25,9 @@ package org.nuiton.eugene.java; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -66,6 +68,11 @@ public static final String TAG_VERSION = "version"; /** + * Tag pour specfier if i18n must be generated. + * @since 2.2.1 + */ + public static final String TAG_I18N_PREFIX = "i18n"; + /** * dependency to add constants in interfaces via an enumeration. * * The literals of enumeration will be the value, and constant names will @@ -131,4 +138,18 @@ } } } + + /** + * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur + * le model. + * + * @param element l'élément à tester + * @param model le modele utilisé + * @return le prefix i18n ou <code>null</code> si non spécifié + * @since 2.2.1 + */ + public static String getI18nPrefix(ObjectModelElement element, + ObjectModel model) { + return findTagValue(TAG_I18N_PREFIX, element, model); + } }

1 0

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

18 Nov '10

Author: tchemit Date: 2010-11-18 15:25:31 +0100 (Thu, 18 Nov 2010) New Revision: 987 Url: http://nuiton.org/repositories/revision/eugene/987 Log: Evolution #1061: Remove deprecated api since 2.0.1 in generatorUtil 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 2010-11-16 12:31:51 UTC (rev 986) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-18 14:25:31 UTC (rev 987) @@ -267,46 +267,6 @@ } /** - * @param params the paramters to treate - * @return la chaine de caractere dont on a besoin pour la declaration - * des parametres d'une methode avec leurs types. - * @deprecated since 2.0.1, use {@link #getOperationParametersListDeclaration(ObjectModelOperation)} instead - */ - @Deprecated - public static String getMethodParameterDeclaration( - Collection<ObjectModelParameter> params) { - StringBuffer result = new StringBuffer(); - for (Iterator<ObjectModelParameter> j = params.iterator(); j.hasNext();) { - ObjectModelParameter parameter = j.next(); - result.append(getAttributeType(parameter)).append(" ").append(parameter.getName()); - if (j.hasNext()) { - result.append(", "); - } - } - return result.toString(); - } - - /** - * @param params the paramters to treate - * @return la chaine de caractere qui represente chaque nom de parametre - * separer par des ','. - * @deprecated since 2.0.1, use {@link #getOperationParametersListName(ObjectModelOperation) Declaration(org.nuiton.eugene.models.object.ObjectModelOperation)} instead - */ - @Deprecated - public static String getMethodParameterListName( - Collection<ObjectModelParameter> params) { - StringBuffer result = new StringBuffer(); - for (Iterator<ObjectModelParameter> j = params.iterator(); j.hasNext();) { - ObjectModelParameter parameter = j.next(); - result.append(parameter.getName()); - if (j.hasNext()) { - result.append(", "); - } - } - return result.toString(); - } - - /** * @param attribute the attribute to test * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d * si MaxMultiplicity == -1 ou > 1 @@ -330,29 +290,6 @@ /** * - * @deprecated use StringUtils.capitalize instead - * @param word the word to capitalize - * @return the capitalized word - */ - @Deprecated - public static String toUpperCaseFirstLetter(String word) { - return capitalize(word); - } - - /** - * Capitalizes a String changing the first letter to title case. - * - * @deprecated use StringUtils.capitalize instead - * @param word word to Capitalize - * @return Capitalized word - */ - @Deprecated - public static String capitalize(String word) { - return StringUtils.capitalize(word); - } - - /** - * * @param word the word to decapitalize * @return the decapitalized word */

1 0

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

16 Nov '10

Author: tchemit Date: 2010-11-16 13:31:51 +0100 (Tue, 16 Nov 2010) New Revision: 986 Url: http://nuiton.org/repositories/revision/eugene/986 Log: Evolution #1049: Add tagvalue noPCS to not generate PCS on JavaBeanTransformer Anomalie #1051: Duplicated Serializable interface generated in JavaBeanTransformer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-11 23:25:20 UTC (rev 985) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-16 12:31:51 UTC (rev 986) @@ -79,6 +79,10 @@ ObjectModelClass ouputImpl = generateImpl(input, output); + String noPCSTagValue = input.getTagValue(JavaGeneratorUtil.TAG_NO_PCS); + boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || + !"true".equals(noPCSTagValue.trim()); + if (log.isDebugEnabled()) { if (ouputImpl == null) { log.debug("will generate impl " + @@ -95,10 +99,11 @@ addSuperClass(input, output, ouputImpl); - addSerializable(output); + boolean serializableFound = addInterfaces(input, output); - addInterfaces(input, output); + addSerializable(output, serializableFound); + Set<String> constantNames = addConstantsFromDependency(input, output); // Get available properties @@ -113,14 +118,17 @@ // Add properties field + javabean methods for (ObjectModelAttribute attr : properties) { - createProperty(output, attr); + createProperty(output, attr, usePCS); } // Add operations createAbstractOperations(output, input.getOperations()); - // Add property change support - createPropertyChangeSupport(output); + if (usePCS) { + + // Add property change support + createPropertyChangeSupport(output); + } boolean hasAMultipleProperty = containsMutiple(properties); @@ -187,7 +195,8 @@ } protected void createProperty(ObjectModelClass output, - ObjectModelAttribute attr) { + ObjectModelAttribute attr, + boolean usePCS) { String attrName = getAttributeName(attr); String attrType = getAttributeType(attr); @@ -212,14 +221,17 @@ attrName, attrNameCapitalized, attrType, - constantName + constantName, + usePCS ); createRemoveChildMethod(output, attrName, attrNameCapitalized, attrType, - constantName + constantName, + usePCS + ); // Change type for Multiple attribute @@ -244,7 +256,8 @@ attrNameCapitalized, attrType, simpleType, - constantName + constantName, + usePCS ); // Add attribute to the class @@ -338,7 +351,8 @@ String attrName, String attrNameCapitalized, String attrType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation addChild = addOperation( output, "add" + attrNameCapitalized, @@ -346,19 +360,28 @@ ObjectModelModifier.PUBLIC ); addParameter(addChild, attrType, attrName); - setOperationBody(addChild, "" + + StringBuilder buffer = new StringBuilder("" /*{ get<%=attrNameCapitalized%>().add(<%=attrName%>); + }*/ + ); + if (usePCS) { + buffer.append("" + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); }*/ - ); + ); + } + setOperationBody(addChild, buffer.toString()); } protected void createRemoveChildMethod(ObjectModelClass output, String attrName, String attrNameCapitalized, String attrType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation operation = addOperation( output, "remove" + attrNameCapitalized, @@ -366,15 +389,28 @@ ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); - setOperationBody(operation, "" + StringBuilder buffer = new StringBuilder(); + buffer.append("" /*{ boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + }*/ + ); + + if (usePCS) { + buffer.append("" + /*{ if (removed) { firePropertyChange(<%=constantName%>, <%=attrName%>, null); + } + }*/ + ); } + buffer.append("" + /*{ return removed; }*/ ); + setOperationBody(operation, buffer.toString()); } protected void createSetMethod(ObjectModelClass output, @@ -382,7 +418,8 @@ String attrNameCapitalized, String attrType, String simpleType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation operation = addOperation( output, "set" + attrNameCapitalized, @@ -390,14 +427,21 @@ ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); - - setOperationBody(operation, "" + if (usePCS) { + setOperationBody(operation, "" /*{ <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); this.<%=attrName%> = <%=attrName%>; firePropertyChange(<%=constantName%>, oldValue, <%=attrName%>); }*/ - ); + ); + } else { + setOperationBody(operation, "" + /*{ + this.<%=attrName%> = <%=attrName%>; + }*/ + ); + } } protected void createGetChildMethod(ObjectModelClass output) { @@ -424,19 +468,35 @@ ); } - protected void addSerializable(ObjectModelClass output) { - addInterface(output, Serializable.class); + protected void addSerializable(ObjectModelClass output,boolean interfaceFound) { + if (!interfaceFound) { + addInterface(output, Serializable.class); + } // Maybe generate the UID for each different generation ? addConstant(output, "serialVersionUID", "long", "1L", ObjectModelModifier.PRIVATE); } - protected void addInterfaces(ObjectModelClass input, + /** + * Add all interfaces defines in input class and returns if + * {@link Serializable} interface was found. + * + * @param input the input model class to process + * @param output the output generated class + * @return {@code true} if {@link Serializable} was found from input, + * {@code false} otherwise + */ + protected boolean addInterfaces(ObjectModelClass input, ObjectModelClass output) { - // Add interfaces from inputModel + boolean foundSerializable = false; for (ObjectModelInterface parentInterface : input.getInterfaces()) { - addInterface(output, parentInterface.getQualifiedName()); + String fqn = parentInterface.getQualifiedName(); + addInterface(output, fqn); + if (Serializable.class.getName().equals(fqn)) { + foundSerializable = true; + } } + return foundSerializable; } protected void addSuperClass(ObjectModelClass input, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-11 23:25:20 UTC (rev 985) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-16 12:31:51 UTC (rev 986) @@ -24,18 +24,12 @@ */ package org.nuiton.eugene.java; -import org.apache.commons.lang.StringUtils; 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.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import java.util.Collection; -import java.util.List; - /** * Utility class for pure java templates. * @@ -58,6 +52,12 @@ public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; /** + * tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * @see JavaBeanTransformer + */ + public static final String TAG_NO_PCS= "noPCS"; + + /** * tag value to add the version of the model from outside (says in the * properties file associated to the model).. *

1 0

r985 - in trunk: . ant-eugene-task ant-eugene-task/src/license ant-eugene-task/src/test/resources ant-eugene-task/src/test/resources/models/objectmodel ant-eugene-task/src/test/resources/xmi/2.1 ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml eugene eugene/src/main/resources/dtd eugene/src/main/resources/xsd eugene/src/main/xsl eugene/src/test/resources eugene/s
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-12 00:25:20 +0100 (Fri, 12 Nov 2010) New Revision: 985 Url: http://nuiton.org/repositories/revision/eugene/985 Log: Evolution #1039: Use new maven-license-plugin mecanism to update file headers Evolution #1038: Optimize dependencies Evolution #1037: Update processor to 1.0.4 Removed: trunk/src/license/ Modified: trunk/ant-eugene-task/pom.xml trunk/ant-eugene-task/src/license/THIRD-PARTY.properties trunk/ant-eugene-task/src/test/resources/log4j.properties trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties trunk/eugene/pom.xml trunk/eugene/src/main/resources/dtd/objectmodel.dtd trunk/eugene/src/main/resources/dtd/statemodel.dtd trunk/eugene/src/main/resources/xsd/objectmodel.xsd trunk/eugene/src/main/xsl/poseidon2argouml.xsl trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl trunk/eugene/src/test/resources/log4j.properties trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security1.properties trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security6.properties trunk/eugene/src/test/resources/models/statemodel/contact.properties trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties trunk/maven-eugene-plugin/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy trunk/maven-eugene-plugin/src/it/settings.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy trunk/maven-eugene-plugin/src/main/resources/log4j.properties trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -56,7 +56,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> @@ -92,7 +92,6 @@    - <packaging>jar</packaging> <properties>  @@ -130,12 +129,10 @@ <descriptorRefs> <descriptorRef>deps</descriptorRef> <descriptorRef>full</descriptorRef> -  </descriptorRefs> </configuration> </plugin> - </plugins> </build> </profile> Modified: trunk/ant-eugene-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/ant-eugene-task/src/test/resources/log4j.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/log4j.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/log4j.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### org.codelutin.topia.security.entities.Role.class.stereotype=Permission org.codelutin.topia.security.entities.Role.class.tagvalue.role=admin Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="ZimZoum" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="RolePermission" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### org.codelutin.topia.security.entities.RolePermission.class.stereotype=Permission org.codelutin.topia.security.entities.RolePermission.class.tagvalue.role=admin Modified: trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,2 +1,26 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.anytag=azerty Modified: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### useModelAsBaseImports=yes useServicePackage=no Modified: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties =================================================================== --- trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Ant task +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### useModelAsBaseImports=yes useServicePackage=no Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -152,92 +152,9 @@ <description>Efficient Universal Generator.</description> <inceptionYear>2004</inceptionYear> - -  - <developers> - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - <role>Debian packager</role> - </roles> - </developer> - - <developer> - <name>Arnaud Thimel</name> - <id>athimel</id> - <email>thimel(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Julien Ruchaud</name> - <id>jruchaud</id> - <email>ruchaud(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>fdesbois(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> -    - <packaging>jar</packaging> <properties>  Modified: trunk/eugene/src/main/resources/dtd/objectmodel.dtd =================================================================== --- trunk/eugene/src/main/resources/dtd/objectmodel.dtd 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/main/resources/dtd/objectmodel.dtd 2010-11-11 23:25:20 UTC (rev 985) @@ -1,20 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> - - + 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% + -->  + 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% + -->  + <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <xsd:complexType name="objectModel" mixed="true"> Modified: trunk/eugene/src/main/xsl/poseidon2argouml.xsl =================================================================== --- trunk/eugene/src/main/xsl/poseidon2argouml.xsl 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/main/xsl/poseidon2argouml.xsl 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> + + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:UML="org.omg.xmi.namespace.UML" Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xslt" Modified: trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> + + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xslt" Modified: trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xslt" Modified: trunk/eugene/src/test/resources/log4j.properties =================================================================== --- trunk/eugene/src/test/resources/log4j.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/log4j.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security1.properties =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security1.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security1.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### org.codelutin.topia.security.entities.Role.class.stereotype=Permission org.codelutin.topia.security.entities.Role.class.tagvalue.role=admin Modified: trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="ZimZoum" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="RolePermission" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> Modified: trunk/eugene/src/test/resources/models/objectmodel/security6.properties =================================================================== --- trunk/eugene/src/test/resources/models/objectmodel/security6.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/objectmodel/security6.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### org.codelutin.topia.security.entities.RolePermission.class.stereotype=Permission org.codelutin.topia.security.entities.RolePermission.class.tagvalue.role=admin Modified: trunk/eugene/src/test/resources/models/statemodel/contact.properties =================================================================== --- trunk/eugene/src/test/resources/models/statemodel/contact.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/models/statemodel/contact.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.usecaseengineextendedclass=BasePage \ No newline at end of file Modified: trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties =================================================================== --- trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,2 +1,26 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.anytag=azerty Modified: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties =================================================================== --- trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### useModelAsBaseImports=yes useServicePackage=no Modified: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties =================================================================== --- trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: EUGene +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### useModelAsBaseImports=yes useServicePackage=no Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -56,7 +56,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -72,7 +72,7 @@ <artifactId>xml-apis</artifactId> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean install Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="xmiTopiaTest" version="1.2"> <class name="Person" package="org.nuiton.topia.test.entities"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="xmiTopiaTest2" version="1.2"> <class name="Person" package="org.nuiton.topia.test.entities2"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="xmiTopiaTest3" version="1.2"> <class name="Person" package="org.nuiton.topia.test.entities3"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="xmiTopiaTest4" version="1.2"> <class name="Person" package="org.nuiton.topia.test.entities4"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.plugin; import org.junit.Assert; Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* outputDir = new File(basedir, 'model-impl/target/generated-sources'); outputEDir = new File(basedir, 'model-impl/target/extracted-sources/model'); Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean install Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* outputDir = new File(basedir, 'xmi-impl/target/generated-sources'); outputEDir = new File(basedir, 'xmi-impl/target/extracted-sources/xmi'); Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.plugin; import org.junit.Assert; Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean install Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* outputDir = new File(basedir, 'zargo-impl/target/generated-sources'); outputEDir = new File(basedir, 'zargo-impl/target/extracted-sources/zargo'); Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.plugin; import org.junit.Assert; Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean generate-sources Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Zargo to object model Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean generate-test-sources Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Zargo to object model Modified: trunk/maven-eugene-plugin/src/it/settings.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/settings.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/settings.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,5 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> + +  + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Zargo to java Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean test Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* *##% * EUGene Test * Copyright (C) 2007 - 2009 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* * *##% * EUGene Test * Copyright (C) 2007 - 2009 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.test.generator; import org.nuiton.eugene.java.ObjectModelTransformerToJava; Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* * *##% * EUGene Test * Copyright (C) 2007 - 2009 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* * *##% * EUGene Test * Copyright (C) 2007 - 2009 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,28 @@ /* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* * *##% * EUGene Test * Copyright (C) 2007 - 2009 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> <class name="Personne" package="org.nuiton.eugene.test"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> <class name="Personne" package="org.nuiton.eugene.test2"> <stereotype name="entity"/> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ //TODO Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean generate-sources Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Zargo to xmi Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project invoker.goals=clean generate-sources Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Zargo to object model Modified: trunk/maven-eugene-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/maven-eugene-plugin/src/main/resources/log4j.properties 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/maven-eugene-plugin/src/main/resources/log4j.properties 2010-11-11 23:25:20 UTC (rev 985) @@ -1,3 +1,27 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 17:52:04 UTC (rev 984) +++ trunk/pom.xml 2010-11-11 23:25:20 UTC (rev 985) @@ -297,7 +297,6 @@ <scope>test</scope> </dependency> - </dependencies> </dependencyManagement> @@ -309,6 +308,87 @@ <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/eugene</url> +  + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + <role>Debian packager</role> + </roles> + </developer> + + <developer> + <name>Arnaud Thimel</name> + <id>athimel</id> + <email>thimel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Florian Desbois</name> + <id>fdesbois</id> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + </developers> +    @@ -351,6 +431,23 @@ <version>${processorPluginVersion}</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> +  + <excludes> + <exclude>**/THIRD-PARTY.properties</exclude> + </excludes> + <extraExtensions> + <objectmodel>xml</objectmodel> + <xsl>xml</xsl> + <xsd>xml</xsd> + </extraExtensions> + </configuration> + </plugin> + </plugins> </pluginManagement> @@ -368,7 +465,8 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm>

1 0

r984 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 18:52:04 +0100 (Thu, 11 Nov 2010) New Revision: 984 Url: http://nuiton.org/repositories/revision/eugene/984 Log: Evolution #992: Update commons-lang to 2.5 Evolution #1036: Update ant to 1.8.0 Evolution #1037: Update processor to 1.0.4 Evolution #1038: Optimize dependencies Use back librairies previously managed by mavenpom reformat poms Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/ant-eugene-task/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,109 +23,122 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> -  -  -  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> - <groupId>org.nuiton.eugene</groupId> - <artifactId>ant-eugene-task</artifactId> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> -  - <dependencies> + <groupId>org.nuiton.eugene</groupId> + <artifactId>ant-eugene-task</artifactId> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> +  + <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> -  -  -  - <name>EUGene :: Ant task</name> - <inceptionYear>2006</inceptionYear> - <description>Ant task to use the eugene library</description> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> -  -  -  - <packaging>jar</packaging> + </dependencies> - <properties> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> +  +  +  + <name>EUGene :: Ant task</name> + <inceptionYear>2006</inceptionYear> + <description>Ant task to use the eugene library</description> - <profiles> +  +  +  + <packaging>jar</packaging> -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <properties> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> -  - </descriptorRefs> - </configuration> - </plugin> + <profiles> +  + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - </plugins> - </build> - </profile> - </profiles> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> +  + </descriptorRefs> + </configuration> + </plugin> + + + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/eugene/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,322 +23,346 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.eugene</groupId> +  +  +  + <parent> + <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> -  - <dependencies> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> +  + <dependencies> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> -  - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> +  + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> -  + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> -  - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> -  - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> -  - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> -  - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> -  - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> +  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> +  - </dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> -  -  -  - <name>EUGene :: EUGene</name> +  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> +  + </dependency> - <description>Efficient Universal Generator.</description> - <inceptionYear>2004</inceptionYear> +  + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> +  + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> -  - <developers> - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - <role>Debian packager</role> - </roles> - </developer> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - <developer> - <name>Arnaud Thimel</name> - <id>athimel</id> - <email>thimel(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + </dependencies> - <developer> - <name>Julien Ruchaud</name> - <id>jruchaud</id> - <email>ruchaud(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> +  +  +  + <name>EUGene :: EUGene</name> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <description>Efficient Universal Generator.</description> + <inceptionYear>2004</inceptionYear> - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> +  + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>fdesbois(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <developer> + <name>Arnaud Thimel</name> + <id>athimel</id> + <email>thimel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> -  -  -  - <packaging>jar</packaging> + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <properties> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <build> + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <resources> - <resource> - <directory>${basedir}/src/main/xsl</directory> - <includes> - <include>**/*.xsl</include> - </includes> - </resource> - <resource> - <directory>src/main/resolver-cache</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <plugins> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> -  - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> + <developer> + <name>Florian Desbois</name> + <id>fdesbois</id> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> -  - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> +  +  +  + <packaging>jar</packaging> - </build> - -  -  -  + <properties> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> - <profiles> -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <build> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <resources> + <resource> + <directory>${basedir}/src/main/xsl</directory> + <includes> + <include>**/*.xsl</include> + </includes> + </resource> + <resource> + <directory>src/main/resolver-cache</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> +  + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> - </plugins> - </build> - </profile> +  + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> -  - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + </build> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> +  +  +  - </profile> - </profiles> + <profiles> +  + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + + </plugins> + </build> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> + </project> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/maven-eugene-plugin/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -24,198 +24,237 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> -  - <dependencies> +  + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> -  -  -  - <name>EUGene :: Maven plugin</name> - <inceptionYear>2006</inceptionYear> - <description>maven plugin to use the eugene library</description> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> -  -  -  - <packaging>maven-plugin</packaging> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> - <build> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> - <plugins> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> -  - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> + </dependencies> - </plugins> +  +  +  + <name>EUGene :: Maven plugin</name> + <inceptionYear>2006</inceptionYear> + <description>maven plugin to use the eugene library</description> - </build> +  +  +  + <packaging>maven-plugin</packaging> - <profiles> + <build> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugins> +  + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> - <build> + </plugins> - <plugins> + </build> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <profiles> - </profile> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> -  - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <reporting> - <plugins> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> + <build> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> + <plugins> - </profile> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <pomIncludes> - <pomInclude>evol-879/zargo/pom.xml</pomInclude> - <pomInclude>evol-879/xmi/pom.xml</pomInclude> - <pomInclude>evol-879/model/pom.xml</pomInclude> - <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> - <pomInclude>smart-generate/all/pom.xml</pomInclude> - <pomInclude>smart-generate/generators/pom.xml</pomInclude> - </pomIncludes> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> - <debug>${maven.verbose}</debug> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </profile> +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>evol-879/zargo/pom.xml</pomInclude> + <pomInclude>evol-879/xmi/pom.xml</pomInclude> + <pomInclude>evol-879/model/pom.xml</pomInclude> + <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> + <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> + <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> + <pomInclude>smart-generate/all/pom.xml</pomInclude> + <pomInclude>smart-generate/generators/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -68,14 +70,39 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> -  + <version>2.5</version> + </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.8.0</version> @@ -95,6 +122,12 @@ </exclusions> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> +  <dependency> <groupId>jaxen</groupId> @@ -224,21 +257,43 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> </dependency> -  + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> + <version>1.2.16</version> <scope>test</scope> </dependency> @@ -264,9 +319,10 @@  <projectId>eugene</projectId> - <ant.version>1.7.1</ant.version> - <processorPluginVersion>1.0.3</processorPluginVersion> + <ant.version>1.8.0</ant.version> + <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <mavenVersion>2.2.1</mavenVersion>  <locales>en,fr</locales> @@ -312,7 +368,8 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm>

1 0

r983 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object models/object/xml
by tchemit＠users.nuiton.org 07 Nov '10

07 Nov '10

Author: tchemit Date: 2010-11-07 18:20:08 +0100 (Sun, 07 Nov 2010) New Revision: 983 Url: http://nuiton.org/repositories/revision/eugene/983 Log: Anomalie #1017: Using version as a tag value of the properties file does NOT work improve some code reformat Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-10-29 08:28:33 UTC (rev 982) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-07 17:20:08 UTC (rev 983) @@ -56,7 +56,16 @@ * a prefix to constant to generate. */ public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; + /** + * tag value to add the version of the model from outside (says in the + * properties file associated to the model).. + * + * @since 2.2.1 + */ + public static final String TAG_VERSION = "version"; + + /** * dependency to add constants in interfaces via an enumeration. * * The literals of enumeration will be the value, and constant names will Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-10-29 08:28:33 UTC (rev 982) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-11-07 17:20:08 UTC (rev 983) @@ -186,13 +186,17 @@ File outputFile = getDestinationFile(destDir, filename); if (!isOverwrite() && isNewerThanSource(outputFile)) { if (isVerbose()) { - log.info("Will not generate " + outputFile + " (up-to-date)."); + if (log.isInfoEnabled()) { + log.info("Will not generate " + outputFile + " (up-to-date)."); + } } return; } - if (!outputFile.exists() && log.isDebugEnabled()) { - log.debug("not up-to-date " + outputFile.lastModified() - + " <" + outputFile + ">"); + if (!outputFile.exists()) { + if (log.isDebugEnabled()) { + log.debug("not up-to-date " + outputFile.lastModified() + + " <" + outputFile + ">"); + } } try { StringWriter out = new StringWriter(); @@ -224,8 +228,10 @@ } } catch (Exception eee) { - log.warn("Erreur lors de la génération du fichier " - + outputFile); + if (log.isWarnEnabled()) { + log.warn("Erreur lors de la génération du fichier " + + outputFile); + } throw new RuntimeException( "Erreur lors de la génération du fichier " + outputFile, eee); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-10-29 08:28:33 UTC (rev 982) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-07 17:20:08 UTC (rev 983) @@ -39,6 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; @@ -103,7 +104,7 @@ " for files " + Arrays.toString(files)); } - ObjectModel objectModel = new ObjectModelImpl(); + ObjectModel model = new ObjectModelImpl(); // Digester parser configuration Digester digester = new Digester(); @@ -111,12 +112,16 @@ for (File file : files) { try { - digester.push(objectModel); - objectModel = (ObjectModel) digester.parse(file); + digester.push(model); + model = (ObjectModel) digester.parse(file); } catch (IOException e) { - log.warn("Unable to parse ObjectModel input file : " + file, e); + if (log.isWarnEnabled()) { + log.warn("Unable to parse ObjectModel input file : " + file, e); + } } catch (SAXException e) { - log.warn("Unable to parse ObjectModel input file : " + file, e); + if (log.isWarnEnabled()) { + log.warn("Unable to parse ObjectModel input file : " + file, e); + } } // recherche est charge le fichier propriete associe au modele @@ -143,8 +148,10 @@ inStream.close(); } } catch (IOException eee) { - log.warn("Impossible de lire le fichier de propriete " - + propFile, eee); + if (log.isWarnEnabled()) { + log.warn("Impossible de lire le fichier de propriete " + + propFile, eee); + } } // on ajoute les proprietes du fichier associe au model @@ -153,104 +160,121 @@ String value = prop.getProperty(key); if (key.startsWith(MODEL)) { + + // model tag value + if (!key.startsWith("model.tagvalue.")) { if (log.isWarnEnabled()) { log.warn("only tagvalue is allowed on model in properties"); } - } else { - String tag = key.substring("model.tagvalue." - .length()); + continue; + } + String tag = key.substring("model.tagvalue.".length()); - ObjectModelImplTagValue tagvalue = new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - ((ObjectModelImpl) objectModel) - .addTagValue(tagvalue); + ObjectModelImpl modelImpl = (ObjectModelImpl) model; + if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { + + // push directly the version in the model version + // property + modelImpl.setVersion(value); } - } else { + ObjectModelImplTagValue tagvalue = new ObjectModelImplTagValue(); + tagvalue.setName(tag); + tagvalue.setValue(value); + modelImpl.addTagValue(tagvalue); + continue; + } - Matcher matcher = propertiesPattern.matcher(key); + // element tag value + Matcher matcher = propertiesPattern.matcher(key); + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "'"); + } + + if (matcher.find()) { + // fqn is fully qualified name of class + String fqn = matcher.group(1); + fqn = StringUtil.substring(fqn, 0, -1); // remove ended + // . + // target is class, attribute or operation + String target = matcher.group(2); + String targetName = matcher.group(3); + // type is stereotype or tagvalue + String type = matcher.group(4); + String tag = matcher.group(5); + if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "'"); + log.debug("Propriete: '" + key + "' => " + + "fqn:" + fqn + " target:" + target + + " targetName:" + targetName + + " type:" + type + " tag:" + tag); } - if (matcher.find()) { - // fqn is fully qualified name of class - String fqn = matcher.group(1); - fqn = StringUtil.substring(fqn, 0, -1); // remove ended - // . - // target is class, attribute or operation - String target = matcher.group(2); - String targetName = matcher.group(3); - // type is stereotype or tagvalue - String type = matcher.group(4); - String tag = matcher.group(5); + ObjectModelClassifier omc = model.getClassifier(fqn); + if (omc == null) { + if (log.isWarnEnabled()) { + log.warn("Could not find classifier for " + + fqn + " from tag value " + key); + } + continue; + } - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "' => " - + "fqn:" + fqn + " target:" + target - + " targetName:" + targetName - + " type:" + type + " tag:" + tag); + if (!(omc instanceof ObjectModelClassifierImpl)) { + // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message + if (log.isWarnEnabled()) { + log.warn("Can't add properties to model, " + + "it's not an " + + "ObjectModelClassifierImpl : " + + omc.getQualifiedName()); } + continue; + } + + List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); + if (CLASS.equals(target)) { + elems.add(omc); + } else if (ATTRIBUTE.equals(target)) { - ObjectModelClassifier omc = objectModel - .getClassifier(fqn); - if (omc == null) { - log.warn("Could not find classifier for " + fqn+" from tag value " + key); + ObjectModelAttribute attr = + getAttribute((ObjectModelClass)omc, targetName); + elems.add(attr); + + } else if (OPERATION.equals(target)) { + elems.addAll(omc.getOperations(targetName)); + } + for (Object elem1 : elems) { + if (elem1 == null) { + if (log.isWarnEnabled()) { + log.warn("can not attach tagValue " + + key + " on a null element."); + } continue; } - - if (omc instanceof ObjectModelClassifierImpl) { - // on utilise une liste car il peut y avoir plusieur - // operation avec le nom donné - List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); - if (CLASS.equals(target)) { - elems.add(omc); - } else if (ATTRIBUTE.equals(target)) { + ObjectModelElementImpl elem = + (ObjectModelElementImpl) elem1; + if (STEREOTYPE.equals(type)) { + // pour les stereotypes + ObjectModelImplRef stereotype = new ObjectModelImplRef(); + stereotype.setName(value); + elem.addStereotype(stereotype); + continue; + } - ObjectModelAttribute attr = - getAttribute((ObjectModelClass)omc, targetName); - elems.add(attr); - - } else if (OPERATION.equals(target)) { - elems.addAll(omc.getOperations(targetName)); + if (TAGVALUE.equals(type)) { + // pour les tagvalues + ObjectModelImplTagValue tagvalue = + new ObjectModelImplTagValue(); + tagvalue.setName(tag); + tagvalue.setValue(value); + if (log.isDebugEnabled()) { + log.debug("tagValue:" + tagvalue + + ", tag:" + tag + + ", value:" + value + + ", element:" + elem); } - for (Object elem1 : elems) { - ObjectModelElementImpl elem = (ObjectModelElementImpl) elem1; - if (STEREOTYPE.equals(type)) { - // pour les stereotypes - ObjectModelImplRef stereotype = new ObjectModelImplRef(); - stereotype.setName(value); - elem.addStereotype(stereotype); - continue; - } + elem.addTagValue(tagvalue); - if (TAGVALUE.equals(type)) { - // pour les tagvalues - ObjectModelImplTagValue tagvalue = new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - if (log.isDebugEnabled()) { - log.debug("tagValue:" + tagvalue - + ", tag:" + tag - + ", value:" + value - + ", element:" + elem); - } - if (elem == null) { - log.warn("can not attach tagValue " - + key); - } else { - elem.addTagValue(tagvalue); - } - } - } - } else { - // TODO il faudra avoir des methodes d'acces en - // Set sur l'interface pour eviter ce message - if (log.isWarnEnabled()) { - log.warn("Can't add properties to model, it's not an ObjectModelClassifierImpl : " + omc.getQualifiedName()); - } } } } @@ -258,11 +282,11 @@ } } if (log.isDebugEnabled()) { - for (ObjectModelClass m : objectModel.getClasses()) { + for (ObjectModelClass m : model.getClasses()) { log.debug("loaded class in objectmodel : " + m.getName()); } } - return objectModel; + return model; /*try { generate(objectModel, destDir); } catch (IOException eee) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-10-29 08:28:33 UTC (rev 982) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-11-07 17:20:08 UTC (rev 983) @@ -98,16 +98,19 @@ clazz.setObjectModelImpl(this); if (!clazz.isExtern()) { - ObjectModelElementImpl initialElement = (ObjectModelElementImpl) classes.get(clazz.getQualifiedName()); + ObjectModelElementImpl initialElement = (ObjectModelElementImpl) + classes.get(clazz.getQualifiedName()); if (initialElement == null) { classes.put(clazz.getQualifiedName(), clazz); classifiers.put(clazz.getQualifiedName(), clazz); } else { if (!(initialElement instanceof ObjectModelClassImpl)) { throw new IllegalArgumentException( - "\"" + clazz + "\" is incompatible with already defined element \"" + initialElement + "\""); + "\"" + clazz + "\" is incompatible with already " + + "defined element \"" + initialElement + "\""); } - ObjectModelClassImpl initialClazz = (ObjectModelClassImpl) initialElement; + ObjectModelClassImpl initialClazz = + (ObjectModelClassImpl) initialElement; // La classe existe déjà. On va prendre tout ce que contient la // nouvelle classe et l'ajouter à la précédente si nécessaire. @@ -126,16 +129,21 @@ clazz.setObjectModelImpl(this); if (!clazz.isExtern()) { - ObjectModelElementImpl initialElement = (ObjectModelElementImpl) classes.get(clazz.getQualifiedName()); + ObjectModelElementImpl initialElement = (ObjectModelElementImpl) + classes.get(clazz.getQualifiedName()); if (initialElement == null) { classes.put(clazz.getQualifiedName(), clazz); classifiers.put(clazz.getQualifiedName(), clazz); } else { if (!(initialElement instanceof ObjectModelAssociationClassImpl)) { throw new IllegalArgumentException( - "\"" + clazz + "\" is incompatible with already defined element \"" + initialElement + "\""); + "\"" + clazz + "\" is incompatible with " + + "already defined element \"" + initialElement + + "\"" + ); } - ObjectModelAssociationClassImpl initialClazz = (ObjectModelAssociationClassImpl) initialElement; + ObjectModelAssociationClassImpl initialClazz = + (ObjectModelAssociationClassImpl) initialElement; mergeAssociationClasses(initialClazz, clazz); // clazz = initialClazz; @@ -235,16 +243,20 @@ interfacez.setObjectModelImpl(this); if (!interfacez.isExtern()) { - ObjectModelElementImpl initialElement = (ObjectModelElementImpl) interfaces.get(interfacez.getQualifiedName()); + ObjectModelElementImpl initialElement = (ObjectModelElementImpl) + interfaces.get(interfacez.getQualifiedName()); if (initialElement == null) { interfaces.put(interfacez.getQualifiedName(), interfacez); classifiers.put(interfacez.getQualifiedName(), interfacez); } else { if (!(initialElement instanceof ObjectModelInterfaceImpl)) { throw new IllegalArgumentException( - "\"" + interfacez + "\" is incompatible with already defined element \"" + initialElement + "\""); + "\"" + interfacez + "\" is incompatible with " + + "already defined element \"" + initialElement + + "\""); } - ObjectModelInterfaceImpl initialInterfacez = (ObjectModelInterfaceImpl) initialElement; + ObjectModelInterfaceImpl initialInterfacez = + (ObjectModelInterfaceImpl) initialElement; mergeClassifiers(initialInterfacez, interfacez); // interfacez = initialInterfacez; @@ -266,8 +278,11 @@ @Override public ObjectModelInterface getInterface(String qualifiedInterfaceName) { ObjectModelInterface result = interfaces.get(qualifiedInterfaceName); - if (result == null && log.isDebugEnabled()) { - log.debug("Interface " + qualifiedInterfaceName + " not found in model"); + if (result == null) { + if (log.isDebugEnabled()) { + log.debug("Interface " + qualifiedInterfaceName + + " not found in model"); + } } return result; } @@ -298,9 +313,13 @@ @Override public ObjectModelEnumeration getEnumeration(String qualifiedEnumerationName) { - ObjectModelEnumeration result = enumerations.get(qualifiedEnumerationName); - if (result == null && log.isDebugEnabled()) { - log.debug("Enumeration " + qualifiedEnumerationName + " not found in model"); + ObjectModelEnumeration result = + enumerations.get(qualifiedEnumerationName); + if (result == null) { + if (log.isDebugEnabled()) { + log.debug("Enumeration " + qualifiedEnumerationName + + " not found in model"); + } } return result; } @@ -382,7 +401,10 @@ for (it = additionalClazzifier.getTagValues().keySet().iterator(); it.hasNext();) { String tagName = (String) it.next(); if (!initialClazzifier.getTagValues().containsKey(tagName)) { - initialClazzifier.tagValues.put(tagName, additionalClazzifier.getTagValue(tagName)); + initialClazzifier.tagValues.put( + tagName, + additionalClazzifier.getTagValue(tagName) + ); } } } @@ -402,7 +424,8 @@ mergeClassifiers(initialClazz, additionalClazz); for (it = additionalClazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttributeImpl attribute = (ObjectModelAttributeImpl) it.next(); + ObjectModelAttributeImpl attribute = + (ObjectModelAttributeImpl) it.next(); if (!contains(initialClazz.getAttributes(), attribute)) { initialClazz.attributes.put(attribute.getName(), attribute); initialClazz.orderedAttributes.add(attribute); @@ -424,7 +447,8 @@ mergeClasses(initialAssocClazz, additionalAssocClazz); Iterator<?> it; for (it = additionalAssocClazz.participantsRefs.iterator(); it.hasNext();) { - ObjectModeImplAssociationClassParticipant participant = (ObjectModeImplAssociationClassParticipant) it.next(); + ObjectModeImplAssociationClassParticipant participant = + (ObjectModeImplAssociationClassParticipant) it.next(); if (!contains(initialAssocClazz.participantsRefs, participant)) { initialAssocClazz.participantsRefs.add(participant); } @@ -491,7 +515,10 @@ public void addTagValue(String tagValue, String value) { String oldValue = getTagValue(tagValue); if (StringUtils.isNotEmpty(oldValue)) { - log.warn("Replace tagValue '" + tagValue + "' (old:" + oldValue + ", new: " + value + ")"); + if (log.isWarnEnabled()) { + log.warn("Replace tagValue '" + tagValue + "' (old:" + + oldValue + ", new: " + value + ")"); + } } tagValues.put(tagValue,value); }

1 0