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

r925 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org June 25, 2010

June 25, 2010

Author: fdesbois Date: 2010-06-25 12:18:33 +0200 (Fri, 25 Jun 2010) New Revision: 925 Url: http://nuiton.org/repositories/revision/eugene/925 Log: Evo #712 : add method cloneOperationSignature 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-06-24 21:52:01 UTC (rev 924) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-06-25 10:18:33 UTC (rev 925) @@ -47,6 +47,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -319,6 +320,34 @@ } /** + * Clone the {@code source} operation into the {@code destination} classifier. + * Name, returnType, Parameters and Exceptions will be cloned. You can specify + * {@code modifiers} for the result operation. + * + * @param source operation to clone + * @param destination classifier where result operation will be added + * @param modifiers extra modifiers + * @return the new operation created in destination classifier + */ + public ObjectModelOperation cloneOperationSignature(ObjectModelOperation source, + ObjectModelClassifier destination, + ObjectModelModifier... modifiers) { + + ObjectModelOperation result = + addOperation(destination, source.getName(), source.getReturnType(), modifiers); + + for (ObjectModelParameter parameter : source.getParameters()) { + addParameter(result, parameter.getType(), parameter.getName()); + } + + for (String exception : source.getExceptions()) { + addException(result, exception); + } + + return result; + } + + /** * Search in {@code input} model, for a enumeration dependency named * {@link JavaGeneratorUtil#DEPENDENCIES_CONSTANTS}. *

1 0

r924 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org June 24, 2010

June 24, 2010

Author: fdesbois Date: 2010-06-24 23:52:01 +0200 (Thu, 24 Jun 2010) New Revision: 924 Url: http://nuiton.org/repositories/revision/eugene/924 Log: Evo #711 : use inheritance between JavaBuilder and ObjectModelBuilder Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-06-24 18:24:23 UTC (rev 923) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-06-24 21:52:01 UTC (rev 924) @@ -48,7 +48,7 @@ import java.util.Set; /** - * JavaBuilder TODO heritates it from ModelBuilder + * JavaBuilder * * Created: 29 oct. 2009 * @@ -61,17 +61,14 @@ * JavaBuilder is also based on ObjectModelBuilder for the simple filling of * the model. * - * @author fdesbois - * @version $Revision$ - * + * @author fdesbois <fdesbois(a)codelutin.com> + * @author tchemit <tchemit(a)codelutin.com> + * @version $Id$ */ -public class JavaBuilder { +public class JavaBuilder extends ObjectModelBuilder { private static final Log log = LogFactory.getLog(JavaBuilder.class); - /** Builder where the filling is based on */ - protected ObjectModelBuilder modelBuilder; - /** ObjectModel extension to manage imports : one ImportsManager by classifier */ protected ImportsManagerExtension importsManagerExtension; @@ -85,7 +82,7 @@ protected CodesManagerExtension codesManagerExtension; public JavaBuilder(String modelName) { - modelBuilder = new ObjectModelBuilder(modelName); + super(modelName); importsManagerExtension = getModel().getExtension( ImportsManagerExtension.OBJECTMODEL_EXTENSION, @@ -105,26 +102,162 @@ } /** - * Get the model which is built + * Add an interface to a classifier (interface, class, enum). + * IMPORTS interfaceQualifiedName. * - * @return an ObjectModel + * @param classifier the classifier on which to add the interface + * @param interfaceQualifiedName fully qualified name of the interface + * @see ObjectModelBuilder#addInterface(ObjectModelClassifier, String) */ - public ObjectModel getModel() { - return modelBuilder.getModel(); + @Override + public void addInterface(ObjectModelClassifier classifier, + String interfaceQualifiedName) { + super.addInterface(classifier, interfaceQualifiedName); + addImport(classifier, interfaceQualifiedName); } + @Override + public void addSuperclass(ObjectModelClass clazz, String superclassQualifiedName) + throws UnsupportedOperationException { + throw new UnsupportedOperationException("This operation can't be used" + + " to generate Java, use setSuperClass method instead"); + } + /** - * Sets the documentation to the given {@code element}. + * Add a new attribute to a classifier. + * IMPORTS type. * - * @param element the element on which add the documentation - * @param documentation the documentation to add + * @param classifier the classifier on which to add the attribute + * @param name name of attribute + * @param type type of attribute + * @param value initializer value of attribute + * @param modifiers modifiers of the attribute + * @return a new ObjectModelAttribute + * @see ObjectModelBuilder#addAttribute(ObjectModelClassifier, String, String, String, ObjectModelModifier...) */ - public void setDocumentation(ObjectModelElement element, - String documentation) { - modelBuilder.setDocumentation(element, documentation); + @Override + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type, + String value, + ObjectModelModifier... modifiers) { + addImport(classifier, type); + // ANO#474 FD-20100408 : problem with import from defaultValue, will + // not be supported from version 2.0.1 + //this.addImport(classifier, value); + return super.addAttribute(classifier, + name, + type, + value, + modifiers + ); } /** + * Add a new attribute to a classifier with no default value. + * Default visibility is set to PROTECTED. + * IMPORTS type. + * + * @param classifier the classifier on which add the attribute + * @param name name of the attribute + * @param type type of the attribute + * @return a new ObjectModelAttribute + */ + @Override + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type) { + return addAttribute(classifier, + name, + type, + "", + ObjectModelModifier.PROTECTED + ); + } + + /** + * Add a new operation to a classifier. + * + * @param classifier the classifier on which to add the operation + * @param name the name of the operation + * @param type the return type of the operation + * @param modifiers the modifiers of the operation + * @return a new ObjectModelOperation + * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) + */ + @Override + public ObjectModelOperation addOperation(ObjectModelClassifier classifier, + String name, + String type, + ObjectModelModifier... modifiers) { + addImport(classifier, type); + return super.addOperation(classifier, name, type, modifiers); + } + + /** + * Add a new parameter to an existing operation. + * + * @param operation the operation on which to add a parameter + * @param type the type of the parameter + * @param name the name of the parameter + * @return a new ObjectModelParameter + * @see ObjectModelBuilder#addParameter(ObjectModelOperation, String, String) + */ + @Override + public ObjectModelParameter addParameter(ObjectModelOperation operation, + String type, + String name) { + addImport((ObjectModelClassifier) operation.getDeclaringElement(), + type); + return super.addParameter(operation, type, name); + } + + /** + * Add an exception to an operation. + * + * @param operation the operation on which to add a exeception + * @param exception the exception to add + * @see ObjectModelBuilder#addException(ObjectModelOperation, String) + */ + @Override + public void addException(ObjectModelOperation operation, String exception) { + addImport((ObjectModelClassifier) operation.getDeclaringElement(), + exception); + super.addException(operation, exception); + } + + /** + * Set the operation body code. + * + * @param operation the operation on which to add the body code + * @param body the body code to set on the operation + * @throws IllegalArgumentException if operation is abstract + * @see ObjectModelBuilder#setOperationBody(ObjectModelOperation, String) + */ + @Override + public void setOperationBody(ObjectModelOperation operation, String body) + throws IllegalArgumentException { + if (operation.isAbstract()) { + throw new IllegalArgumentException( + "Unable to add body for an abstract method"); + } + super.setOperationBody(operation, body); + } + + /** + * Create a new abstract class in the model. + * + * @param name the name of the abstract class to create + * @param packageName package's name of the class to create + * @return a new ObjectModelClass + * @see ObjectModelBuilder#createClass(String, String, ObjectModelModifier...) + */ + public ObjectModelClass createAbstractClass(String name, + String packageName) { + return createClass(name, packageName, ObjectModelModifier.ABSTRACT); + } + + /** * Add an import to a classifier. Imports are automatic for lots of * JavaBuilder's methods except body code of operations. * <pre> @@ -153,7 +286,7 @@ manager.addImport(oneType); if (log.isDebugEnabled()) { log.debug("Add import for : " + classifier.getQualifiedName() + - " _ import: " + oneType); + " _ import: " + oneType); } } } @@ -178,170 +311,28 @@ manager.addAnnotation(element, annotation); if (log.isDebugEnabled()) { log.debug("Add annotation for <" + classifier.getQualifiedName() + - ":" + element.getName() + "> : " + annotation); + ":" + element.getName() + "> : " + annotation); } } /** - * Add a body code to the operation of a classifier. - * - * @param classifier where the body code will be added. - * @param operation operation on which add body code - * @param code code to add - */ - public void addBodyCode(ObjectModelClassifier classifier, - ObjectModelOperation operation, - String code) { - if (code == null) { - return; - } - CodesManager manager = - codesManagerExtension.getManager(classifier); - code = code.trim(); - - manager.addCode(operation, code); - if (log.isDebugEnabled()) { - log.debug("Add code for <" + classifier.getQualifiedName() + - ":" + operation.getName() + "> : " + code); - } - } - - /** - * Converts the given {@code propertyName} to a constant name. - * - * For example : - * <pre> - * "CONSTANT_A" = getConstantName("constantA"); - * </pre> - * - * @param propertyName the name of the property to convert - * @return the constant name - */ - public String getConstantName(String propertyName) { - String result = constantsManagerExtension.getConstantName(propertyName); - if (log.isDebugEnabled()) { - log.debug("get constant name for <" + propertyName + "> : " + - result); - } - return result; - } - - - /** - * Create a new class in the model. - * - * @param name the name of the new class to create - * @param packageName package's name of the class to create - * @return a new ObjectModelClass - * @see ObjectModelBuilder#createClass(String, String, ObjectModelModifier...) - */ - public ObjectModelClass createClass(String name, String packageName) { - return modelBuilder.createClass(name, packageName); - } - - /** - * Create a new abstract class in the model. - * - * @param name the name of the abstract class to create - * @param packageName package's name of the class to create - * @return a new ObjectModelClass - * @see ObjectModelBuilder#createClass(String, String, ObjectModelModifier...) - */ - public ObjectModelClass createAbstractClass(String name, - String packageName) { - return modelBuilder.createClass(name, packageName, - ObjectModelModifier.ABSTRACT); - } - - /** - * Create a new interface in the model - * - * @param name the name of the interface to create - * @param packageName package's name of the interface to create - * @return a new ObjectModelInterface - * @see ObjectModelBuilder#createInterface(String, String) - */ - public ObjectModelInterface createInterface(String name, - String packageName) { - return modelBuilder.createInterface(name, packageName); - } - - /** - * Create a new enumration in the model - * - * @param name the name of the enumeration to create - * @param packageName package's name of the enumeration to create - * @return a new ObjectModelEnumeration - */ - public ObjectModelEnumeration createEnumeration(String name, - String packageName) { - return modelBuilder.createEnumeration(name, packageName); - } - - /** * Set the superclass of an other class. Only one superclass can be set * to the class. * IMPORTS superclassQualifiedName. * * @param classifier the classifier on which to set the super class * @param superclassQualifiedName fully qualified name of the super class - * @see ObjectModelBuilder#addInterface( - *ObjectModelClassifier, String) */ public void setSuperClass(ObjectModelClass classifier, String superclassQualifiedName) { ObjectModelClassImpl impl = (ObjectModelClassImpl) classifier; // suppress all existing superclass: only one can be set for java impl.clearSuperclasses(); - modelBuilder.addSuperclass(impl, superclassQualifiedName); + super.addSuperclass(impl, superclassQualifiedName); addImport(classifier, superclassQualifiedName); } /** - * Add an interface to a classifier (interface, class, enum). - * IMPORTS interfaceQualifiedName. - * - * @param classifier the classifier on which to add the interface - * @param interfaceQualifiedName fully qualified name of the interface - * @see ObjectModelBuilder#addInterface( - *ObjectModelClassifier, String) - */ - public void addInterface(ObjectModelClassifier classifier, - String interfaceQualifiedName) { - modelBuilder.addInterface(classifier, interfaceQualifiedName); - addImport(classifier, interfaceQualifiedName); - } - - /** - * Add a new attribute to a classifier. - * IMPORTS type, value. - * - * @param classifier the classifier on which to add the attribute - * @param name name of attribute - * @param type type of attribute - * @param value initializer value of attribute - * @param modifiers modifiers of the attribute - * @return a new ObjectModelAttribute - * @see ObjectModelBuilder#addAttribute(ObjectModelClassifier, String, String, String, ObjectModelModifier...) - */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, - String name, - String type, - String value, - ObjectModelModifier... modifiers) { - addImport(classifier, type); - // ANO#474 FD-20100408 : problem with import from defaultValue, will - // not be supported from version 2.0.1 - //this.addImport(classifier, value); - return modelBuilder.addAttribute(classifier, - name, - type, - value, - modifiers - ); - } - - /** * Add a new constant to a classifier. A constant is static and final * and have a value. * IMPORTS type, value. @@ -363,41 +354,64 @@ if (!visibility.isVisibility()) { throw new IllegalArgumentException( "Illegal visibility type : " + visibility.name() + - " for " + classifier.getQualifiedName()); + " for " + classifier.getQualifiedName()); } return addAttribute(classifier, - name, - type, - value, - visibility, - ObjectModelModifier.STATIC, - ObjectModelModifier.FINAL + name, + type, + value, + visibility, + ObjectModelModifier.STATIC, + ObjectModelModifier.FINAL ); } /** - * Add a new attribute to a classifier with no default value. - * Default visibility is set to PROTECTED. - * IMPORTS type. + * Add a body code to the operation of a classifier. * - * @param classifier the classifier on which add the attribute - * @param name name of the attribute - * @param type type of the attribute - * @return a new ObjectModelAttribute + * @param classifier where the body code will be added. + * @param operation operation on which add body code + * @param code code to add */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, - String name, - String type) { - return addAttribute(classifier, - name, - type, - "", - ObjectModelModifier.PROTECTED - ); + public void addBodyCode(ObjectModelClassifier classifier, + ObjectModelOperation operation, + String code) { + if (code == null) { + return; + } + CodesManager manager = + codesManagerExtension.getManager(classifier); + code = code.trim(); + + manager.addCode(operation, code); + if (log.isDebugEnabled()) { + log.debug("Add code for <" + classifier.getQualifiedName() + + ":" + operation.getName() + "> : " + code); + } } /** + * Converts the given {@code propertyName} to a constant name. + * + * For example : + * <pre> + * "CONSTANT_A" = getConstantName("constantA"); + * </pre> + * + * @param propertyName the name of the property to convert + * @return the constant name + */ + public String getConstantName(String propertyName) { + String result = constantsManagerExtension.getConstantName(propertyName); + if (log.isDebugEnabled()) { + log.debug("get constant name for <" + propertyName + "> : " + + result); + } + return result; + } + + /** * Add a new attribute to a classifier from an existing attribute. * IMPORTS attribute.getType() and attribute.getDefaultValue(). * @@ -436,24 +450,6 @@ } /** - * Add a new operation to a classifier. - * - * @param classifier the classifier on which to add the operation - * @param name the name of the operation - * @param type the return type of the operation - * @param modifiers the modifiers of the operation - * @return a new ObjectModelOperation - * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) - */ - public ObjectModelOperation addOperation(ObjectModelClassifier classifier, - String name, - String type, - ObjectModelModifier... modifiers) { - addImport(classifier, type); - return modelBuilder.addOperation(classifier, name, type, modifiers); - } - - /** * Add a new block to a classifier. * * @param classifier the classifier on which to add the block @@ -464,7 +460,7 @@ public ObjectModelOperation addBlock(ObjectModelClassifier classifier, ObjectModelModifier... modifiers) { ObjectModelOperationImpl operation = (ObjectModelOperationImpl) - modelBuilder.addOperation(classifier, null, null, modifiers); + addOperation(classifier, null, null, modifiers); if (Arrays.asList(modifiers).contains(ObjectModelModifier.STATIC)) { operation.setStatic(true); } @@ -473,82 +469,22 @@ /** * Add a constructor to a class. + * FIXME-fdesbois-2010-06-23 : need to take care of generic case * * @param clazz the classifier on which to add the constructor * @param visibility the visibility of the operation * @return a new ObjectModelOperation * @throws IllegalArgumentException if the modifier is not a visibility - * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) */ public ObjectModelOperation addConstructor(ObjectModelClass clazz, ObjectModelModifier visibility) throws IllegalArgumentException { - if (!visibility.isVisibility()) { - throw new IllegalArgumentException( - "Illegal visibility type : " + visibility.name() + - " for " + clazz.getQualifiedName()); - } - - return addOperation(clazz, clazz.getName(), null, visibility); + return addConstructorForClassifier(clazz, visibility); } /** - * Add a new parameter to an existing operation. - * - * @param operation the operation on which to add a parameter - * @param type the type of the parameter - * @param name the name of the parameter - * @return a new ObjectModelParameter - * @see ObjectModelBuilder#addParameter(ObjectModelOperation, String, String) - */ - public ObjectModelParameter addParameter(ObjectModelOperation operation, - String type, - String name) { - addImport((ObjectModelClassifier) operation.getDeclaringElement(), - type); - return modelBuilder.addParameter(operation, type, name); - } - - /** - * Add an exception to an operation. - * - * @param operation the operation on which to add a exeception - * @param exception the exception to add - * @see ObjectModelBuilder#addException(ObjectModelOperation, String) - */ - public void addException(ObjectModelOperation operation, String exception) { - addImport((ObjectModelClassifier) operation.getDeclaringElement(), - exception); - modelBuilder.addException(operation, exception); - } - - /** - * Set the operation body code. - * - * @param operation the operation on which to add the body code - * @param body the body code to set on the operation - * @throws IllegalArgumentException if operation is abstract - * @see ObjectModelBuilder#setOperationBody(ObjectModelOperation, String) - */ - public void setOperationBody(ObjectModelOperation operation, String body) - throws IllegalArgumentException { - if (operation.isAbstract()) { - throw new IllegalArgumentException( - "Unable to add body for an abstract method"); - } - modelBuilder.setOperationBody(operation, body); - } - - public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, - ObjectModelType type, - String name, - ObjectModelModifier... modifiers) - throws IllegalArgumentException { - return modelBuilder.addInnerClassifier(clazz, type, name, modifiers); - } - - /** * Add a constructor to a enumeration. + * FIXME-fdesbois-2010-06-23 : need to take care of generic case * * @param enumeration the enumeration on which to add the constructor * @param visibility the visibility of the constructor (should always to private...) @@ -558,26 +494,17 @@ public ObjectModelOperation addConstructor(ObjectModelEnumeration enumeration, ObjectModelModifier visibility) throws IllegalArgumentException { + return addConstructorForClassifier(enumeration, visibility); + } + + protected ObjectModelOperation addConstructorForClassifier( + ObjectModelClassifier classifier, ObjectModelModifier visibility) { + if (!visibility.isVisibility()) { throw new IllegalArgumentException( "Illegal visibility type : " + visibility.name() + - " for " + enumeration.getQualifiedName()); + " for " + classifier.getQualifiedName()); } - - return addOperation(enumeration, - enumeration.getName(), - null, - visibility - ); + return addOperation(classifier, classifier.getName(), null, visibility); } - - /** - * Add a literal to the given {@code classifier}. - * - * @param classifier the enumeration on which to add the literal - * @param name the name of the literal to add - */ - public void addLiteral(ObjectModelEnumeration classifier, String name) { - modelBuilder.addLiteral(classifier, name); - } }

1 0

r923 - trunk/src/site
by athimel＠users.nuiton.org June 24, 2010

June 24, 2010

Author: athimel Date: 2010-06-24 20:24:23 +0200 (Thu, 24 Jun 2010) New Revision: 923 Url: http://nuiton.org/repositories/revision/eugene/923 Log: Fix JRST url Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-06-24 14:45:31 UTC (rev 922) +++ trunk/src/site/site_en.xml 2010-06-24 18:24:23 UTC (rev 923) @@ -33,7 +33,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> </poweredBy> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-06-24 14:45:31 UTC (rev 922) +++ trunk/src/site/site_fr.xml 2010-06-24 18:24:23 UTC (rev 923) @@ -33,7 +33,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> </poweredBy>

1 0

r922 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org June 24, 2010

June 24, 2010

Author: fdesbois Date: 2010-06-24 16:45:31 +0200 (Thu, 24 Jun 2010) New Revision: 922 Url: http://nuiton.org/repositories/revision/eugene/922 Log: Ano #708 : manage static modifier for class generation (used for inner class) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-06-24 13:59:09 UTC (rev 921) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-06-24 14:45:31 UTC (rev 922) @@ -111,6 +111,7 @@ generateHeader(output, input); String abstractStr = input.isAbstract() ? " abstract " : " "; + String staticStr = input.isStatic() ? " static " : " "; String className = input.getName(); String extend = ""; @@ -138,7 +139,7 @@ generateAnnotations(output, input, input); /*{ -<%=prefix%>public<%=abstractStr%>class <%=className%>}*/ +<%=prefix%>public<%=staticStr%><%=abstractStr%>class <%=className%>}*/ /* * Définition de la super classe : il ne doit y avoir qu'une

1 0

r921 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object models/object/xml
by fdesbois＠users.nuiton.org June 24, 2010

June 24, 2010

Author: fdesbois Date: 2010-06-24 15:59:09 +0200 (Thu, 24 Jun 2010) New Revision: 921 Url: http://nuiton.org/repositories/revision/eugene/921 Log: Evo #704 : manage modifiers on inner classifier + add some debug log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-06-19 18:55:29 UTC (rev 920) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-06-24 13:59:09 UTC (rev 921) @@ -541,9 +541,10 @@ public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, ObjectModelType type, - String name) + String name, + ObjectModelModifier... modifiers) throws IllegalArgumentException { - return modelBuilder.addInnerClassifier(clazz, type, name); + return modelBuilder.addInnerClassifier(clazz, type, name, modifiers); } /** Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-06-19 18:55:29 UTC (rev 920) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-06-24 13:59:09 UTC (rev 921) @@ -297,8 +297,9 @@ public ObjectModelClassifier addInnerClassifier( ObjectModelClass clazz, ObjectModelType type, - String name) throws IllegalArgumentException { - return builder.addInnerClassifier(clazz, type, name); + String name, + ObjectModelModifier... modifiers) throws IllegalArgumentException { + return builder.addInnerClassifier(clazz, type, name, modifiers); } public void setDocumentation(ObjectModelElement element, @@ -384,6 +385,15 @@ this.constantPrefix = constantPrefix; } + /** + * Used to initialize constant prefix depends on model tagvalue {@link + * JavaGeneratorUtil#TAG_CONSTANT_PREFIX}. If no tagvalue found, the default + * value will be an empty prefix. + */ + public void initConstantPrefixFromModel() { + constantPrefix = getConstantPrefix(null, ""); + } + protected URL getFileInClassPath(String fqn) { String resourceName = fqn.replaceAll("\\.", "/") + ".java"; URL fileLocation = getClassLoader().getResource(resourceName); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-06-19 18:55:29 UTC (rev 920) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-06-24 13:59:09 UTC (rev 921) @@ -26,23 +26,23 @@ package org.nuiton.eugene.models.object; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.xml.*; /** - * ObjectModelBuilder + * Builder to fill an empty ObjectModel. The object model name is important if + * you want to use the model in generators. * * Created: 3 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Builder to fill an empty ObjectModel. The object model name is important if you want to use the model - * in generators. - * - * Mise a jour: $Date$ - * par : */ + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ public class ObjectModelBuilder { + private static final Log log = LogFactory.getLog(ObjectModelBuilder.class); + protected ObjectModelImpl model; /** @@ -111,6 +111,22 @@ throws IllegalArgumentException { clazz.setName(name); clazz.setPackage(packageName); + setClassModifiers(clazz, modifiers); + model.addClass(clazz); + return clazz; + } + + /** + * Set modifiers to a class. Only STATIC and ABSTRACT are actually supported. + * + * @param clazz ObjectModelClassImpl where modifiers will be set + * @param modifiers Array of ObjectModelModifier to set + * @throws IllegalArgumentException for unsupported modifier + */ + protected void setClassModifiers(ObjectModelClassImpl clazz, + ObjectModelModifier... modifiers) + throws IllegalArgumentException { + for (ObjectModelModifier modifier : modifiers) { switch (modifier) { case ABSTRACT: @@ -120,11 +136,10 @@ clazz.setStatic(true); break; default: - throw new IllegalArgumentException("Unsupported modifier type '" + modifier.name() + "'"); + throw new IllegalArgumentException( + "Unsupported modifier type '" + modifier.name() + "'"); } - } - model.addClass(clazz); - return clazz; + } } /** @@ -460,7 +475,12 @@ * @return the new instanciated inner classifier * @throws IllegalArgumentException if given {@code type} is not a concrete classifier type */ - public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, ObjectModelType type, String name) throws IllegalArgumentException { + public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, + ObjectModelType type, + String name, + ObjectModelModifier... modifiers) + throws IllegalArgumentException { + ObjectModelClassImpl impl = (ObjectModelClassImpl) clazz; ObjectModelClassifierImpl inner; switch (type) { @@ -470,6 +490,7 @@ break; case OBJECT_MODEL_CLASS: inner = new ObjectModelClassImpl(); + setClassModifiers((ObjectModelClassImpl)inner, modifiers); break; case OBJECT_MODEL_INTERFACE: inner = new ObjectModelInterfaceImpl(); @@ -482,6 +503,11 @@ inner.postInit(); impl.addInnerClassifier(inner); inner.setObjectModelImpl(impl.getModel()); + + if (log.isDebugEnabled()) { + log.debug("Add inner classifier for " + clazz.getQualifiedName() + " : " + inner.getQualifiedName()); + } + return inner; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java 2010-06-19 18:55:29 UTC (rev 920) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java 2010-06-24 13:59:09 UTC (rev 921) @@ -34,6 +34,8 @@ import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -45,13 +47,13 @@ * Created: 14 janv. 2004 * * @author Cédric Pineau <pineau(a)codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Last update : $Date$ - * by : */ + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements ObjectModelClass { + private static final Log log = LogFactory.getLog(ObjectModelClassImpl.class); + protected List<ObjectModelClass> superclasses; protected Map<ObjectModelClass, String> superclassesDiscriminators = new HashMap<ObjectModelClass, String>(); protected List<ObjectModelImplRef> superclassesRefs = new ArrayList<ObjectModelImplRef>(); @@ -98,8 +100,12 @@ superclasses = new ArrayList<ObjectModelClass>(); for (ObjectModelImplRef superclassesRef : superclassesRefs) { ObjectModelImplSuperClassRef ref = (ObjectModelImplSuperClassRef) superclassesRef; + + if (log.isDebugEnabled()) { + log.debug("Superclass ref for " + this.getQualifiedName() + " : " + ref.getName()); + } + ObjectModelClass superclass = objectModelImpl.getClass(ref.getName()); - if (superclass == null) { ExternalCacheExtension cache = objectModelImpl.getExtension( ExternalCacheExtension.OBJECTMODEL_EXTENSION, ExternalCacheExtension.class); @@ -107,6 +113,10 @@ superclass = cache.getCache(ref, ObjectModelClassImpl.class); } + if (log.isDebugEnabled()) { + log.debug("Superclass for " + this.getQualifiedName() + " : " + superclass.getQualifiedName()); + } + superclasses.add(superclass); superclassesDiscriminators.put(superclass, ref.getDiscriminator()); }

1 0

r920 - trunk
by tchemit＠users.nuiton.org June 19, 2010

June 19, 2010

Author: tchemit Date: 2010-06-19 20:55:29 +0200 (Sat, 19 Jun 2010) New Revision: 920 Url: http://nuiton.org/repositories/revision/eugene/920 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:21:25 UTC (rev 919) +++ trunk/pom.xml 2010-06-19 18:55:29 UTC (rev 920) @@ -25,298 +25,346 @@ --> <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> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2</version> + </parent> + + <artifactId>eugene</artifactId> + <version>2.0.3-SNAPSHOT</version> + + <modules> + <module>eugene</module> + <module>ant-eugene-task</module> + <module>maven-eugene-plugin</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>${nuiton-utils.version}</version> + <scope>compile</scope> + </dependency> - <artifactId>eugene</artifactId> - <version>2.0.3-SNAPSHOT</version> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.0</version> + <scope>compile</scope> + </dependency> - <modules> - <module>eugene</module> - <module>ant-eugene-task</module> - <module>maven-eugene-plugin</module> - </modules> +  + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>runtime</scope> + </dependency> - <dependencyManagement> - <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.8.0</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>2.0</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> +  + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <version>2.1.0-v200706251652</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.8.0</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> -  - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - </exclusion> - </exclusions> - </dependency> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> -  - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> + </exclusions> + </dependency> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - </exclusion> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + </dependency> - </exclusions> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> - </dependency> + </dependencies> + </dependencyManagement> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> +  +  +  + <name>EUGene</name> + <description>Efficient Universal Generator</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/eugene</url> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> +  +  +  + <packaging>pom</packaging> - </dependencies> - </dependencyManagement> + <properties> +  + <projectId>eugene</projectId> -  -  -  - <name>EUGene</name> - <description>Efficient Universal Generator</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/eugene</url> + <ant.version>1.7.1</ant.version> + <processor.version>1.0.3</processor.version> + <nuiton-utils.version>1.3.1</nuiton-utils.version> -  -  -  +  + <locales>en,fr</locales> + </properties> - <packaging>pom</packaging> + <build> - <properties> -  - <projectId>eugene</projectId> + <pluginManagement> + <plugins> - <ant.version>1.7.1</ant.version> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> - <processor.version>1.0.3</processor.version> - <nuiton-utils.version>1.3.1</nuiton-utils.version> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>${processor.version}</version> + </plugin> -  - <locales>en,fr</locales> - </properties> + </plugins> + </pluginManagement> - <build> + </build> - <pluginManagement> - <plugins> + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> +  +  +  - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>${processor.version}</version> - </plugin> +  + <scm> - </plugins> - </pluginManagement> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + </scm> - </build> + <profiles> - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> - -  -  -  + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> -  - <scm> + <properties> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> - </scm> +  + <release.repository>${nuiton.central.release.repository}</release.repository> + </properties> + + <build> + <defaultGoal>validate</defaultGoal> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project>

1 0

r919 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by fdesbois＠users.nuiton.org June 12, 2010

June 12, 2010

Author: fdesbois Date: 2010-06-12 16:21:25 +0200 (Sat, 12 Jun 2010) New Revision: 919 Url: http://nuiton.org/repositories/revision/eugene/919 Log: [maven-release-plugin] prepare for next development iteration 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-06-12 14:21:21 UTC (rev 918) +++ trunk/ant-eugene-task/pom.xml 2010-06-12 14:21:25 UTC (rev 919) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-06-12 14:21:21 UTC (rev 918) +++ trunk/eugene/pom.xml 2010-06-12 14:21:25 UTC (rev 919) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-06-12 14:21:21 UTC (rev 918) +++ trunk/maven-eugene-plugin/pom.xml 2010-06-12 14:21:25 UTC (rev 919) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:21:21 UTC (rev 918) +++ trunk/pom.xml 2010-06-12 14:21:25 UTC (rev 919) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.2</version> + <version>2.0.3-SNAPSHOT</version> <modules> <module>eugene</module> @@ -314,9 +314,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0

r918 - in tags: . eugene-2.0.2
by fdesbois＠users.nuiton.org June 12, 2010

June 12, 2010

Author: fdesbois Date: 2010-06-12 16:21:21 +0200 (Sat, 12 Jun 2010) New Revision: 918 Url: http://nuiton.org/repositories/revision/eugene/918 Log: [maven-release-plugin] copy for tag eugene-2.0.2 Added: tags/eugene-2.0.2/ Property changes on: tags/eugene-2.0.2 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r917 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by fdesbois＠users.nuiton.org June 12, 2010

June 12, 2010

Author: fdesbois Date: 2010-06-12 16:21:19 +0200 (Sat, 12 Jun 2010) New Revision: 917 Url: http://nuiton.org/repositories/revision/eugene/917 Log: [maven-release-plugin] prepare release eugene-2.0.2 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-06-12 14:19:13 UTC (rev 916) +++ trunk/ant-eugene-task/pom.xml 2010-06-12 14:21:19 UTC (rev 917) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-06-12 14:19:13 UTC (rev 916) +++ trunk/eugene/pom.xml 2010-06-12 14:21:19 UTC (rev 917) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-06-12 14:19:13 UTC (rev 916) +++ trunk/maven-eugene-plugin/pom.xml 2010-06-12 14:21:19 UTC (rev 917) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:19:13 UTC (rev 916) +++ trunk/pom.xml 2010-06-12 14:21:19 UTC (rev 917) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> <modules> <module>eugene</module> @@ -314,9 +314,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.2</url> </scm> </project>

1 0

r916 - trunk
by fdesbois＠users.nuiton.org June 12, 2010

June 12, 2010

Author: fdesbois Date: 2010-06-12 16:19:13 +0200 (Sat, 12 Jun 2010) New Revision: 916 Url: http://nuiton.org/repositories/revision/eugene/916 Log: Use nuiton-utils 1.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-08 15:48:48 UTC (rev 915) +++ trunk/pom.xml 2010-06-12 14:19:13 UTC (rev 916) @@ -270,7 +270,7 @@ <ant.version>1.7.1</ant.version> <processor.version>1.0.3</processor.version> - <nuiton-utils.version>1.3</nuiton-utils.version> + <nuiton-utils.version>1.3.1</nuiton-utils.version>  <locales>en,fr</locales>

1 0