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

r814 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 30 Jan '10

30 Jan '10

Author: tchemit Date: 2010-01-30 17:58:03 +0100 (Sat, 30 Jan 2010) New Revision: 814 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-01-30 16:57:58 UTC (rev 813) +++ trunk/ant-eugene-task/pom.xml 2010-01-30 16:58:03 UTC (rev 814) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4</version> + <version>2.0.0-beta-5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-01-30 16:57:58 UTC (rev 813) +++ trunk/eugene/pom.xml 2010-01-30 16:58:03 UTC (rev 814) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4</version> + <version>2.0.0-beta-5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-01-30 16:57:58 UTC (rev 813) +++ trunk/maven-eugene-plugin/pom.xml 2010-01-30 16:58:03 UTC (rev 814) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4</version> + <version>2.0.0-beta-5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-30 16:57:58 UTC (rev 813) +++ trunk/pom.xml 2010-01-30 16:58:03 UTC (rev 814) @@ -13,7 +13,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4</version> + <version>2.0.0-beta-5-SNAPSHOT</version> <modules> <module>eugene</module> @@ -291,9 +291,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-4</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.0-beta-4</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

r813 - in tags: . eugene-2.0.0-beta-4
by tchemit＠users.nuiton.org 30 Jan '10

30 Jan '10

Author: tchemit Date: 2010-01-30 17:57:58 +0100 (Sat, 30 Jan 2010) New Revision: 813 Added: tags/eugene-2.0.0-beta-4/ Log: [maven-scm] copy for tag eugene-2.0.0-beta-4 Property changes on: tags/eugene-2.0.0-beta-4 ___________________________________________________________________ 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

r812 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 30 Jan '10

30 Jan '10

Author: tchemit Date: 2010-01-30 17:57:54 +0100 (Sat, 30 Jan 2010) New Revision: 812 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release eugene-2.0.0-beta-4 Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-01-29 20:09:16 UTC (rev 811) +++ trunk/ant-eugene-task/pom.xml 2010-01-30 16:57:54 UTC (rev 812) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-01-29 20:09:16 UTC (rev 811) +++ trunk/eugene/pom.xml 2010-01-30 16:57:54 UTC (rev 812) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-01-29 20:09:16 UTC (rev 811) +++ trunk/maven-eugene-plugin/pom.xml 2010-01-30 16:57:54 UTC (rev 812) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-29 20:09:16 UTC (rev 811) +++ trunk/pom.xml 2010-01-30 16:57:54 UTC (rev 812) @@ -13,7 +13,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> <modules> <module>eugene</module> @@ -291,9 +291,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.0-beta-4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.0-beta-4</url> </scm> </project>

1 0

r811 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: tchemit Date: 2010-01-29 21:09:16 +0100 (Fri, 29 Jan 2010) New Revision: 811 Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Log: - Evolution #296: Add a ConstantsManagerExtension to ObjectModel - reformat code (80 caracters maximum for a line) Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java 2010-01-29 20:09:16 UTC (rev 811) @@ -0,0 +1,65 @@ +/* + * *##% + * EUGene :: EUGene + * 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>. + * ##%* + */ +package org.nuiton.eugene.java; + +import org.nuiton.eugene.GeneratorUtil; + +import java.util.Map; +import java.util.TreeMap; + +/** + * Manager of constant names. + * + * @author tchemit < chemit(a)codelutin.com > + * @since 2.3 + */ +public class ConstantsManager { + /** + * cache of constant name (values) for property name (keys) + */ + protected Map<String, String> nameToConstant; + + /** + * Obtain a constant nmae from a property name and store it in cache + * the first time it had to build it. + * + * @param propertyName the propertyName to convert + * @return the equivalent constant name + */ + public String getConstantName(String propertyName) { + Map<String, String> map = getNameToConstant(); + if (map.containsKey(propertyName)) { + return map.get(propertyName); + } + // convert propertyName to constant name + String constantName = + GeneratorUtil.convertVariableNameToConstantName(propertyName); + map.put(propertyName,constantName); + return constantName; + } + + protected Map<String, String> getNameToConstant() { + if (nameToConstant == null) { + nameToConstant = new TreeMap<String, String>(); + } + return nameToConstant; + } +} \ No newline at end of file Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java 2010-01-29 20:09:16 UTC (rev 811) @@ -0,0 +1,50 @@ +/* + * *##% + * EUGene :: EUGene + * 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>. + * ##%* + */ +package org.nuiton.eugene.java; + +/** + * @author tchemit < chemit(a)codelutin.com > + * @since 2.3 + */ +public class ConstantsManagerExtension { + + /** + * Extension static used to identify {@link ConstantsManagerExtension] in + * ObjectModel + */ + public static final String OBJECTMODEL_EXTENSION = "constants"; + + /** + * the unique manager to use + */ + protected ConstantsManager manager = new ConstantsManager(); + + /** + * Obtain a constant nmae from a property name and store it in cache + * the first time it had to build it. + * + * @param propertyName the propertyName to convert + * @return the equivalent constant name + */ + public String getConstantName(String propertyName) { + return manager.getConstantName(propertyName); + } +} \ No newline at end of file Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-29 20:08:21 UTC (rev 810) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-29 20:09:16 UTC (rev 811) @@ -63,15 +63,26 @@ * ObjectModel extension to manage imports : one ImportsManager by classifier */ protected AnnotationsManagerExtension annotationsManagerExtension; + /** + * ObjectModel extension to manage constants : one ConstantsManager for all + */ + protected ConstantsManagerExtension constanssManagerExtension; @SuppressWarnings("unchecked") public JavaBuilder(String modelName) { this.modelBuilder = new ObjectModelBuilder(modelName); this.importsManagerExtension = getModel().getExtension( - ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class); + ImportsManagerExtension.OBJECTMODEL_EXTENSION, + ImportsManagerExtension.class); + this.annotationsManagerExtension = getModel().getExtension( - AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, AnnotationsManagerExtension.class); + AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, + AnnotationsManagerExtension.class); + + this.constanssManagerExtension = getModel().getExtension( + ConstantsManagerExtension.OBJECTMODEL_EXTENSION, + ConstantsManagerExtension.class); } /** @@ -83,7 +94,8 @@ return this.modelBuilder.getModel(); } - public void setDocumentation(ObjectModelElement element, String documentation) { + public void setDocumentation(ObjectModelElement element, + String documentation) { modelBuilder.setDocumentation(element, documentation); } @@ -115,7 +127,8 @@ for (String oneType : GeneratorUtil.getTypesList(imports)) { manager.addImport(oneType); if (log.isDebugEnabled()) { - log.debug("Add import for : " + classifier.getQualifiedName() + " _ import: " + oneType); + log.debug("Add import for : " + classifier.getQualifiedName() + + " _ import: " + oneType); } } } @@ -127,19 +140,32 @@ * @param element element on which add annotation * @param annotation annotation to add */ - public void addAnnotation(ObjectModelClassifier classifier, ObjectModelElement element, String annotation) { + public void addAnnotation(ObjectModelClassifier classifier, + ObjectModelElement element, + String annotation) { if (annotation == null) { return; } - AnnotationsManager manager = annotationsManagerExtension.getManager(classifier); + AnnotationsManager manager = + annotationsManagerExtension.getManager(classifier); annotation = annotation.trim(); manager.addAnnotation(element, annotation); if (log.isDebugEnabled()) { - log.debug("Add annotation for <" + classifier.getQualifiedName() + ":" + element.getName() + "> : " + annotation); + log.debug("Add annotation for <" + classifier.getQualifiedName() + + ":" + element.getName() + "> : " + annotation); } } + public String getConstantName(String propertyName) { + String result = constanssManagerExtension.getConstantName(propertyName); + if (log.isDebugEnabled()) { + log.debug("get constant name for <" + propertyName + "> : " + + result); + } + return result; + } + /** * Create a new class in the model. * @@ -160,8 +186,10 @@ * @return a new ObjectModelClass * @see org.nuiton.eugene.models.object.ObjectModelBuilder#createClass(java.lang.String,java.lang.String, org.nuiton.eugene.models.object.ObjectModelModifier...) */ - public ObjectModelClass createAbstractClass(String name, String packageName) { - return modelBuilder.createClass(name, packageName, ObjectModelModifier.ABSTRACT); + public ObjectModelClass createAbstractClass(String name, + String packageName) { + return modelBuilder.createClass(name, packageName, + ObjectModelModifier.ABSTRACT); } /** @@ -172,7 +200,8 @@ * @return a new ObjectModelInterface * @see org.nuiton.eugene.models.object.ObjectModelBuilder#createInterface(java.lang.String, java.lang.String) */ - public ObjectModelInterface createInterface(String name, String packageName) { + public ObjectModelInterface createInterface(String name, + String packageName) { return modelBuilder.createInterface(name, packageName); } @@ -183,7 +212,8 @@ * @param packageName package's name of the enumeration to create * @return a new ObjectModelEnumeration */ - public ObjectModelEnumeration createEnumeration(String name, String packageName) { + public ObjectModelEnumeration createEnumeration(String name, + String packageName) { return modelBuilder.createEnumeration(name, packageName); } @@ -196,7 +226,8 @@ * @see org.nuiton.eugene.models.object.ObjectModelBuilder#addInterface( *org.nuiton.eugene.models.object.ObjectModelClassifier, java.lang.String) */ - public void setSuperClass(ObjectModelClass classifier, String superclassQualifiedName) { + public void setSuperClass(ObjectModelClass classifier, + String superclassQualifiedName) { ObjectModelClassImpl impl = (ObjectModelClassImpl) classifier; impl.clearSuperclasses(); // suppress all existing superclass: only one can be set for java modelBuilder.addSuperclass(impl, superclassQualifiedName); @@ -212,7 +243,8 @@ * @see org.nuiton.eugene.models.object.ObjectModelBuilder#addInterface( *org.nuiton.eugene.models.object.ObjectModelClassifier, java.lang.String) */ - public void addInterface(ObjectModelClassifier classifier, String interfaceQualifiedName) { + public void addInterface(ObjectModelClassifier classifier, + String interfaceQualifiedName) { modelBuilder.addInterface(classifier, interfaceQualifiedName); this.addImport(classifier, interfaceQualifiedName); } @@ -229,11 +261,15 @@ * @return a new ObjectModelAttribute * @see org.nuiton.eugene.models.object.ObjectModelBuilder#addAttribute(org.nuiton.eugene.models.object.ObjectModelClassifier, java.lang.String,java.lang.String, java.lang.String, org.nuiton.eugene.models.object.ObjectModelModifier...) */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type, String value, + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type, + String value, ObjectModelModifier... modifiers) { this.addImport(classifier, type); this.addImport(classifier, value); - return modelBuilder.addAttribute(classifier, name, type, value, modifiers); + return modelBuilder.addAttribute(classifier, name, type, value, + modifiers); } /** @@ -248,10 +284,15 @@ * @return a new ObjectModelAttribute * @throws IllegalArgumentException if the modifier is not a visibility */ - public ObjectModelAttribute addConstant(ObjectModelClassifier classifier, String name, String type, String value, - ObjectModelModifier visibility) throws IllegalArgumentException { + public ObjectModelAttribute addConstant(ObjectModelClassifier classifier, + String name, + String type, + String value, + ObjectModelModifier visibility) + throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + visibility.name() + + throw new IllegalArgumentException("Illegal visibility type : " + + visibility.name() + " for " + classifier.getQualifiedName()); } @@ -268,8 +309,11 @@ * @param type * @return a new ObjectModelAttribute */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type) { - return addAttribute(classifier, name, type, "", ObjectModelModifier.PROTECTED); + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type) { + return addAttribute(classifier, name, type, "", + ObjectModelModifier.PROTECTED); } /** @@ -280,7 +324,8 @@ * @param attribute * @return a new ObjectModelAttribute */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, ObjectModelAttribute attribute) { + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + ObjectModelAttribute attribute) { Set<ObjectModelModifier> modifiers = new HashSet<ObjectModelModifier>(); @@ -300,8 +345,11 @@ modifiers.add(ObjectModelModifier.PACKAGE); } - return addAttribute(classifier, attribute.getName(), attribute.getType(), - attribute.getDefaultValue(), modifiers.toArray(new ObjectModelModifier[modifiers.size()])); + return addAttribute(classifier, + attribute.getName(), + attribute.getType(), + attribute.getDefaultValue(), + modifiers.toArray(new ObjectModelModifier[modifiers.size()])); } /** @@ -314,7 +362,9 @@ * @return a new ObjectModelOperation * @see org.nuiton.eugene.models.object.ObjectModelBuilder#addOperation(org.nuiton.eugene.models.object.ObjectModelClassifier, java.lang.String,java.lang.String, org.nuiton.eugene.models.object.ObjectModelModifier...) */ - public ObjectModelOperation addOperation(ObjectModelClassifier classifier, String name, String type, + public ObjectModelOperation addOperation(ObjectModelClassifier classifier, + String name, + String type, ObjectModelModifier... modifiers) { this.addImport(classifier, type); return modelBuilder.addOperation(classifier, name, type, modifiers); @@ -330,7 +380,8 @@ */ public ObjectModelOperation addBlock(ObjectModelClassifier classifier, ObjectModelModifier... modifiers) { - ObjectModelOperationImpl operation = (ObjectModelOperationImpl) modelBuilder.addOperation(classifier, null, null, modifiers); + ObjectModelOperationImpl operation = (ObjectModelOperationImpl) + modelBuilder.addOperation(classifier, null, null, modifiers); if (Arrays.asList(modifiers).contains(ObjectModelModifier.STATIC)) { operation.setStatic(true); } @@ -345,10 +396,12 @@ * @return a new ObjectModelOperation * @throws IllegalArgumentException if the modifier is not a visibility */ - public ObjectModelOperation addConstructor(ObjectModelClass clazz, ObjectModelModifier visibility) + public ObjectModelOperation addConstructor(ObjectModelClass clazz, + ObjectModelModifier visibility) throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + visibility.name() + + throw new IllegalArgumentException("Illegal visibility type : " + + visibility.name() + " for " + clazz.getQualifiedName()); } @@ -365,8 +418,11 @@ * @see org.nuiton.eugene.models.object.ObjectModelBuilder#addParameter( *org.nuiton.eugene.models.object.ObjectModelOperation, java.lang.String, java.lang.String) */ - public ObjectModelParameter addParameter(ObjectModelOperation operation, String type, String name) { - this.addImport((ObjectModelClassifier) operation.getDeclaringElement(), type); + public ObjectModelParameter addParameter(ObjectModelOperation operation, + String type, + String name) { + this.addImport((ObjectModelClassifier) operation.getDeclaringElement(), + type); return modelBuilder.addParameter(operation, type, name); } @@ -379,7 +435,8 @@ *org.nuiton.eugene.models.object.ObjectModelOperation, java.lang.String) */ public void addException(ObjectModelOperation operation, String exception) { - this.addImport((ObjectModelClassifier) operation.getDeclaringElement(), exception); + this.addImport((ObjectModelClassifier) operation.getDeclaringElement(), + exception); modelBuilder.addException(operation, exception); } @@ -395,19 +452,25 @@ public void setOperationBody(ObjectModelOperation operation, String body) throws IllegalArgumentException { if (operation.isAbstract()) { - throw new IllegalArgumentException("Unable to add body for an abstract method"); + throw new IllegalArgumentException("Unable to add body for an " + + "abstract method"); } modelBuilder.setOperationBody(operation, body); } - public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, ObjectModelType type, String name) throws IllegalArgumentException { + public ObjectModelClassifier addInnerClassifier(ObjectModelClass clazz, + ObjectModelType type, + String name) + throws IllegalArgumentException { return modelBuilder.addInnerClassifier(clazz, type, name); } - public ObjectModelOperation addConstructor(ObjectModelEnumeration enumeration, ObjectModelModifier visibility) + public ObjectModelOperation addConstructor(ObjectModelEnumeration enumeration, + ObjectModelModifier visibility) throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + visibility.name() + + throw new IllegalArgumentException("Illegal visibility type : " + + visibility.name() + " for " + enumeration.getQualifiedName()); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-29 20:08:21 UTC (rev 810) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-29 20:09:16 UTC (rev 811) @@ -123,6 +123,10 @@ builder.addImport(classifier, imports.getName()); } + public String getConstantName(String propertyName) { + return builder.getConstantName(propertyName); + } + protected ObjectModelAttribute addConstant(ObjectModelClassifier classifier, String name, String type, String value, ObjectModelModifier visibility) throws IllegalArgumentException { return builder.addConstant(classifier, name, type, value, visibility);

1 0

r810 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: tchemit Date: 2010-01-29 21:08:21 +0100 (Fri, 29 Jan 2010) New Revision: 810 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Log: - improve attribute generation - reformat code (80 caracters maximum for a line) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-29 17:42:17 UTC (rev 809) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-29 20:08:21 UTC (rev 810) @@ -69,7 +69,8 @@ } @Override - public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { + public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) + { return getFilenameForClassifier(enumeration); } @@ -91,7 +92,8 @@ * @throws IOException if any pb while writing file */ @Override - public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { + public void generateFromClass(Writer output, ObjectModelClass clazz) + throws IOException { if (log.isDebugEnabled()) { log.debug(clazz.getQualifiedName()); @@ -112,16 +114,19 @@ } String implement = ""; - for (Iterator<ObjectModelInterface> i = clazz.getInterfaces().iterator(); i.hasNext();) { + for (Iterator<ObjectModelInterface> i = + clazz.getInterfaces().iterator(); i.hasNext();) { ObjectModelClassifier parentInterface = i.next(); - String interfaceName = GeneratorUtil.getSimpleName(parentInterface.getQualifiedName()); + String interfaceName = GeneratorUtil.getSimpleName( + parentInterface.getQualifiedName()); implement += interfaceName; if (i.hasNext()) { implement += ", "; } } if (log.isDebugEnabled()) { - log.debug(className+" : super : "+extend+", interfaces : "+implement); + log.debug(className+" : super : "+extend+", interfaces : " + + implement); } generateAnnotations(output, clazz, clazz); @@ -155,7 +160,9 @@ } @Override - public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + public void generateFromInterface(Writer output, + ObjectModelInterface interfacez) + throws IOException { if (log.isDebugEnabled()) { log.debug(interfacez.getQualifiedName()); } @@ -196,8 +203,12 @@ }*/ } - public void generateAnnotations(Writer output,ObjectModelClassifier clazz, ObjectModelElement element) throws IOException { - AnnotationsManagerExtension managers = getModel().getExtension(AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, + public void generateAnnotations(Writer output, + ObjectModelClassifier clazz, + ObjectModelElement element) + throws IOException { + AnnotationsManagerExtension managers = getModel().getExtension( + AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, AnnotationsManagerExtension.class); String[] annotations = managers.getAnnotations(clazz,element); for (String annotation : annotations) { @@ -218,7 +229,8 @@ } @Override - public void generateFromEnum(Writer output, ObjectModelEnumeration enumz) throws IOException { + public void generateFromEnum(Writer output, ObjectModelEnumeration enumz) + throws IOException { if (log.isDebugEnabled()) { log.debug(enumz.getQualifiedName()); } @@ -265,7 +277,10 @@ }*/ } - public void generateInnerClassifiers(Writer output, Collection<ObjectModelClassifier> innerClassifiers) throws IOException { + public void generateInnerClassifiers(Writer output, + Collection<ObjectModelClassifier> + innerClassifiers) + throws IOException { if (innerClassifiers == null || innerClassifiers.isEmpty()) { return; } @@ -276,12 +291,14 @@ continue; } if (innerClassifier.isInterface()) { - generateFromInterface(output, (ObjectModelInterface) innerClassifier); + generateFromInterface(output, (ObjectModelInterface) + innerClassifier); innerLevel--; continue; } if (innerClassifier.isEnum()) { - generateFromEnum(output, (ObjectModelEnumeration) innerClassifier); + generateFromEnum(output, (ObjectModelEnumeration) + innerClassifier); innerLevel--; continue; } @@ -299,7 +316,8 @@ prefix = new String(tmp); } if (log.isDebugEnabled()) { - log.debug("prefix to use for classifier " + clazz.getName() + " : [" + prefix + "]"); + log.debug("prefix to use for classifier " + + clazz.getName() + " : [" + prefix + "]"); } } @@ -311,7 +329,9 @@ * @param classifier Classifier for generate header * @throws IOException if any pb while writing file */ - protected void generateHeader(Writer output, ObjectModelClassifier classifier) throws IOException { + protected void generateHeader(Writer output, + ObjectModelClassifier classifier) + throws IOException { if (classifier.isInner()) { return; } @@ -320,7 +340,8 @@ }*/ // potentiel crash si imports non defini -> IllegalArgumentException on "imports" - ImportsManagerExtension managers = getModel().getExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, + ImportsManagerExtension managers = getModel().getExtension( + ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class); for (String imports : managers.getImports(classifier)) { @@ -338,11 +359,17 @@ * @param attributes Collection of ObjectModelAttribute to generate * @throws IOException if any pb while writing file */ - protected void generateAttributes(Writer output,ObjectModelClassifier clazz, Collection<ObjectModelAttribute> attributes) throws IOException { - + protected void generateAttributes(Writer output,ObjectModelClassifier clazz, + Collection<ObjectModelAttribute> + attributes) + throws IOException { + if (!attributes.isEmpty()) { +/*{}*/ + } for (ObjectModelAttribute attr : attributes) { - if (attr.getDocumentation() != null && !attr.getDocumentation().isEmpty()) { + if (attr.getDocumentation() != null && + !attr.getDocumentation().isEmpty()) { /*{<%=prefix%> /** <%=prefix%> * <%=attr.getDocumentation()%> <%=prefix%> *) @@ -360,7 +387,8 @@ String attrType = GeneratorUtil.getSimpleName(attr.getType()); String attrStatic = attr.isStatic() ? " static" : ""; String attrFinal = attr.isFinal() ? " final" : ""; - String attrValue = attr.getDefaultValue() != null && !attr.getDefaultValue().isEmpty() ? + String attrValue = attr.getDefaultValue() != null && + !attr.getDefaultValue().isEmpty() ? " = " + GeneratorUtil.getSimpleName(attr.getDefaultValue()) : ""; /*{<%=prefix%> <%=attrVisibility%><%=attrStatic%><%=attrFinal%> <%=attrType%> <%=attrName%><%=attrValue%>; @@ -376,7 +404,9 @@ * @param operations Collection of ObjectModelOperation to generate * @throws IOException if any pb while writing file */ - protected void generateOperations(Writer output,ObjectModelClassifier clazz, Collection<ObjectModelOperation> operations) throws IOException { + protected void generateOperations(Writer output,ObjectModelClassifier clazz, + Collection<ObjectModelOperation> + operations) throws IOException { for (ObjectModelOperation op : operations) { String opName = op.getName(); if (opName == null) { @@ -386,7 +416,8 @@ /*{<%=prefix%> /** <%=prefix%> * <%=opName%> : <%=prefix%>}*/ - if (op.getDocumentation() != null && !op.getDocumentation().isEmpty()) { + if (op.getDocumentation() != null && + !op.getDocumentation().isEmpty()) { String opDocumentation = op.getDocumentation(); /*{<%=prefix%> * <%=opDocumentation%> }*/ @@ -408,7 +439,8 @@ ObjectModelParameter returnParam = op.getReturnParameter(); String opReturn = ""; if (returnParam != null) { - opReturn = GeneratorUtil.getSimpleName(returnParam.getType()) + " "; + opReturn = GeneratorUtil.getSimpleName( + returnParam.getType()) + " "; if (!opReturn.contains("void")) { String paramDocumentation = returnParam.getDocumentation(); if (paramDocumentation == null) { @@ -458,7 +490,8 @@ } } - protected void generateBlock(Writer output,ObjectModelClassifier clazz, ObjectModelOperation op) throws IOException { + protected void generateBlock(Writer output,ObjectModelClassifier clazz, + ObjectModelOperation op) throws IOException { String opStatic = op.isStatic() ? "static " : " "; /*{<%=prefix%><%=opStatic%>{

1 0

r809 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: tchemit Date: 2010-01-29 18:42:17 +0100 (Fri, 29 Jan 2010) New Revision: 809 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java Log: improve contract and javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java 2010-01-29 17:41:08 UTC (rev 808) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java 2010-01-29 17:42:17 UTC (rev 809) @@ -33,109 +33,96 @@ * by : $Author$ */ public interface ObjectModelAttribute extends ObjectModelParameter { - /** - * Returns the type of this attribute. - * - * @return the type of this attribute. - */ - public String getType(); - + * Returns the type of this attribute. + * + * @return the type of this attribute. + */ + String getType(); /** - * Returns whether this attribute is an aggregate or not. - * - * @return a boolean indicating whether this attribute is an aggregate or not. - */ - public boolean isAggregate(); - + * Returns whether this attribute is an aggregate or not. + * + * @return {@code true} if this attribute is an aggregate or not. + */ + boolean isAggregate(); /** - * Returns whether this attribute is a composite or not. - * - * @return a boolean indicating whether this attribute is a composite or not. - */ - public boolean isComposite(); - + * Returns whether this attribute is a composite or not. + * + * @return {@code true} if this attribute is a composite or not. + */ + boolean isComposite(); /** - * Returns the visibility of this attribute. - * Possible values includes <tt>public</tt>, <tt>protected</tt> and <tt>private</tt>. - * - * @return the visibility of this attribute. - */ - public String getVisibility(); - + * Returns the visibility of this attribute. + * + * Possible values includes <tt>public</tt>, <tt>protected</tt> + * and <tt>private</tt>. + * + * @return the visibility of this attribute. + */ + String getVisibility(); /** * Returns whether this attribute reference a model classifier or not. * - * @return a boolean indicating whether this attribute reference a model classifier or not. + * @return a boolean indicating whether this attribute reference a model + * classifier or not. */ - public boolean referenceClassifier(); - + boolean referenceClassifier(); /** - * Returns the classifier referenced by this attribute or null if it does not reference a model classifier. - * - * @return the ObjectModelClassfifier referenced by this attribute or null if it does not reference a model classifier. - */ - public ObjectModelClassifier getClassifier(); - + * Returns the classifier referenced by this attribute or null if it does + * not reference a model classifier. + * + * @return the ObjectModelClassfifier referenced by this attribute or null + * if it does not reference a model classifier. + */ + ObjectModelClassifier getClassifier(); /** - * Returns the attribute used to reference this class at the other end of the association or null if this is not an association, or if it is not bi-directionnal. - * @see #getClassifier() - * - * @return the ObjectModelAttribute used to reference this class at the other end of the association or null if this is not an association, or if it is not bi-directionnal. - */ - public ObjectModelAttribute getReverseAttribute(); - + * Returns the attribute used to reference this class at the other end of + * the association or null if this is not an association, or if it is not + * bi-directionnal. + * + * @see #getClassifier() + * + * @return the ObjectModelAttribute used to reference this class at the + * other end of the association or null if this is not an + * association, or if it is not bi-directionnal. + */ + ObjectModelAttribute getReverseAttribute(); /** * Return attribute reserver attribute name. * * @return reverse attribute name or null */ - public String getReverseAttributeName(); - + String getReverseAttributeName(); /** * max multiplicity of the reverse attribute + * * @return max multiplicity of the reverse attribute */ - public int getReverseMaxMultiplicity(); - + int getReverseMaxMultiplicity(); /** - * Returns the association class associated with this association, or null if there is none. - * - * @return a ObjectModelClass corresponding to the association class associated with this association, or null if there is none. - */ - public ObjectModelClass getAssociationClass(); - + * @return a ObjectModelClass corresponding to the association class + * associated with this association, or null if there is none. + */ + ObjectModelClass getAssociationClass(); /** - * Returns whether this association has an associated association class, ot not. - * - * @return a boolean indicating whether this association has an associated association class, ot not. - */ - public boolean hasAssociationClass(); - + * @return {@code true} if this association has an associated association + * class, ot not. + */ + boolean hasAssociationClass(); /** - * Returns whether this attribute is static or not. - * - * @return a boolean indicating whether this attribute is static or not. + * @return {@code true} if this attribute is static or not. */ - public boolean isStatic(); - + boolean isStatic(); /** - * Returns whether this attribute is final or not. - * - * @return a boolean indicating whether this attribute is final or not. + * @return {@code true} if this attribute is final or not. */ - public boolean isFinal(); - + boolean isFinal(); /** - * true if this attribute is navigable - * @return true if this attribute is navigable + * @return {@code true} if this attribute is navigable */ - public boolean isNavigable(); - + boolean isNavigable(); /** - * true if this attribute is isIndexed - * @return true if this attribute is isIndexed + * @return {@code true} if this attribute is isIndexed */ - public boolean isIndexed(); - + boolean isIndexed(); } //ObjectModelAttribute Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java 2010-01-29 17:41:08 UTC (rev 808) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java 2010-01-29 17:42:17 UTC (rev 809) @@ -35,44 +35,47 @@ public interface ObjectModelParameter extends ObjectModelElement { /** - * Returns the type of this parameter. - * - * @return the type of this parameter. - */ - public String getType(); + * Returns the type of this parameter. + * + * @return the type of this parameter. + */ + String getType(); - /** - * Returns the minimal multiplicity of this parameter. - * The <tt>-1</tt> value means infinite. - * - * @return the minimal multiplicity of this parameter. - */ - public int getMinMultiplicity(); + /** + * Returns the minimal multiplicity of this parameter. + * The <tt>-1</tt> value means infinite. + * + * @return the minimal multiplicity of this parameter. + */ + int getMinMultiplicity(); /** - * Returns the maximal multiplicity of this parameter. - * The <tt>-1</tt> value means infinite. - * - * @return the maximal multiplicity of this parameter. - */ - public int getMaxMultiplicity(); + * Returns the maximal multiplicity of this parameter. + * The <tt>-1</tt> value means infinite. + * + * @return the maximal multiplicity of this parameter. + */ + int getMaxMultiplicity(); /** * true if this parameter is isOrdered - * @return true if this parameter is isOrdered + * + * @return {@code true} if this parameter is isOrdered */ - public boolean isOrdered(); + boolean isOrdered(); /** * true if this parameter is isUnique - * @return true if this parameter is isUnique + * + * @return {@code true} if this parameter is isUnique */ - public boolean isUnique(); + boolean isUnique(); /** * default value of this parameter + * * @return a String for the defaultValue (must be interpreted depending on the parameter type) */ - public String getDefaultValue(); + String getDefaultValue(); } //ObjectModelParameter

1 0

r808 - trunk/eugene/src/main/xsl
by tchemit＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: tchemit Date: 2010-01-29 18:41:08 +0100 (Fri, 29 Jan 2010) New Revision: 808 Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl Log: obtain defaultValue of attribute from xmi 1.2 to objectmodel Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-01-28 11:40:21 UTC (rev 807) +++ trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-01-29 17:41:08 UTC (rev 808) @@ -639,7 +639,14 @@ <xsl:for-each select="UML:ModelElement.comment/UML:Comment"> <xsl:call-template name="UMLComment"/> </xsl:for-each> - + +  + <xsl:if test="UML:Attribute.initialValue"> + <xsl:attribute name="defaultValue"> + <xsl:value-of select="UML:Attribute.initialValue/UML:Expression/@body"/> + </xsl:attribute> + </xsl:if> + <xsl:call-template name="stereotype"/> </xsl:element>

1 0

r807 - in trunk/maven-eugene-plugin/src/site: . fr/rst rst
by jcouteau＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: jcouteau Date: 2010-01-28 12:40:21 +0100 (Thu, 28 Jan 2010) New Revision: 807 Added: trunk/maven-eugene-plugin/src/site/fr/rst/example.rst trunk/maven-eugene-plugin/src/site/rst/example.rst Modified: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst trunk/maven-eugene-plugin/src/site/rst/usage.rst trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml Log: Translate usage doc from english to french Add an examples page with a simple and a complex configuration Added: trunk/maven-eugene-plugin/src/site/fr/rst/example.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/fr/rst/example.rst (rev 0) +++ trunk/maven-eugene-plugin/src/site/fr/rst/example.rst 2010-01-28 11:40:21 UTC (rev 807) @@ -0,0 +1,143 @@ +Examples +======== + + +:Authors: Jean Couteau +:Contact: couteau(a)codelutin.com +:Revision: $Revision: 649 $ +:Date: $Date: 2009-10-21 14:21:03 +0200 (Wed, 21 Oct 2009) $ + + +.. contents:: + +Cette page regroupe deux examples de configuration/utilisation du plugin +dans un pom. Le premier example est très simple, le second est plus complexe +et est censé ammener une complète compréhension du plugin combiné à la +documentation des usages_ . + +.. _usages: usage.html + +Example simple +-------------- + +Cet example va générer les entitées du package org.nuiton.eugene.demopackage à +partir des fichiers zargo présents dans le répertoire src/main/xmi. + +:: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + + <executions> + + <execution> + <phase>generate-sources</phase> +  + <configuration> +  + <fullPackagePath>org.nuiton.eugene.demopackage</fullPackagePath> +  + <defaultPackage>org.nuiton.eugene.demopackage</defaultPackage> +  + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer, + org.nuiton.topia.generator.BeanTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <-- dependency to topia to use their template --> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + </dependencies> + </plugin> + +Example complexe +---------------- + +Cet example utilise deux fichiers zargo en entrée et va les générer différemment. + +Les deux premières phases sont communes, ensuite on distingues deux executions, +une par fichier spécifiant les différents templates à utiliser pour chaque +fichier model. + +:: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <configuration> + <defaultPackage>org.nuiton.eugene.demopackage</defaultPackage> + <fullPackagePath>org.nuiton.eugene.demopackage</fullPackagePath> + </configuration> + + <executions> + +  + <execution> + <phase>generate-sources</phase> + <id>toModel</id> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <-- Execution that transforms the entities.objectmodel file using + specific templates from topia --> + <execution> + <phase>generate-sources</phase> + <id>model-to-entities</id> + <configuration> + <inputs>model:target/generated-sources/models:entities.objectmodel</inputs> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <-- Execution that transforms the beans.objectmodel file using + other specific templates from topia --> + <execution> + <phase>generate-sources</phase> + <id>model-to-bean</id> + <configuration> + <inputs> + <input>model:target/generated-sources/models:beans.objectmodel</input> + </inputs> + <templates>org.nuiton.topia.generator.BeanTransformer</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + </executions> + +  + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst 2010-01-26 21:06:43 UTC (rev 806) +++ trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst 2010-01-28 11:40:21 UTC (rev 807) @@ -14,4 +14,313 @@ smart-generate -------------- -*TODO translate me in french from the english version* +Ce 'goal' permet de lancer une génération intelligente, en chaînant les +différentes phases de génération. + +En suivant les conventions de maven (et la configuration par défaut), il est +conseillé de respecter au maximum les cnventions de plugin afin d'éviter de gros +mals de crâne... + +modelType +********* + +Propriété invariante du 'goal', *modelType* est le type de modèle à traiter. + +Il y a actuellement deux types de modèles : + +- objectmmodel +- statemodel + +inputs +****** + +Pour définir ce qu'il faut générer, vous devez remplir la configuration des +*inputs*. + +Chaque entrée des 'inputs' est associée à une phase de génération (référez-vous +à la section suivante pour en savoir plus sur les phases). + +Une entrée des 'inputs' est définie par : + +- une phase (zargo, xmi ou model) +- un répertoire contenant les fichiers à inclure +- un 'pattern' d'inclusion + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +Si vous souhaitez utiliser plusieurs entrées, vous pouvez aussi écrire : + +:: + + <execution> + <configuration> + <inputs> + <input>zargo</input> + <input>xmi</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +Une entrée peut avoir trois formes : + +- <input>XXX</input> : utilise la phase XXX avec sa configuration par défaut. +- <input>dir:includes</input> : utilise le répertoire donné et utilise le 'pattern' d'exclusion pour définir la phase à utiliser. +- <input>XXX:dir:includes</input> : utilise la phase XXX avec le répertoire et le 'pattern d'inclusion' donnés. + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <inputs>src/main/myzargo:**/*.zargo</inputs> + <inputs>zargo:src/main/myzargo2:**/*.zargo2</inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + +phases +****** + +Une phase (aussi appellée un 'writer' a pour but de générer quelque chose avec +la possibilité de déclencher la phase chaînée *suivante*. + +Pour le moment, nous avons défini quelques phases de génération : + +- zargo +- xmi +- model + +Chaque phase a un protocole d'entrée et un protocole de sortie : + +:: + + zargo --> xmi + xmi --> model + model --> no output protocol (at the moment) + +Donc si vous donnez la phase zargo, le plugin essaiera de chaîner zargo --> xmi --> model. + +Il est possible de ne pas effectuer une phase en utilisant la propriété *skipInputs*. + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +lancera les phases zargo et xmi mais pas la phase model. + +Il y a aussi quelques propriété spécifiques à chaque phase. + +Phase zargo +~~~~~~~~~~~ + +This phase permits to take some zargo files to extract form them the xmi files. + +Example: + +:: + + <execution> + <configuration> + <inputs>zargo</inputs> + <skipInputs>xmi,model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +détectera tous les fichiers zargo (en utilisant la configuration par défaut de +la phase zargo) et extraira les fichiers xmi. + +La configuration par défaut de la phase zargo est : + +- répertoire source : src/main/xmi +- 'pattern' d'inclusion : **/*.zargo +- répertoire de sortie : target/generated-sources/xmi + +Cette phase n'a pas de configuration spécifique. + +Phase xmi +~~~~~~~~~ + +Cette phase permet de prendre des fichiers xmi pour construire des fichiers +objectmodel (ou statemodel). + +Example: + +:: + + <execution> + <configuration> + <inputs>xmi</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +détectera tous les fichiers xmi (en utilisant la configuration par défaut de la +phase xmi) et créera des fichiers model. + +La configuration pour la phase xmi est : + +- répertoire source : src/main/xmi +- 'pattern' d'inclusion : **/*.xmi +- répertoire de sortie : target/generated-sources/modles + +Cette phase défini quelques propriétés spécifiques : + +- *fullPackagePath* : le package généré. +- *resolver* : le resolver de ressource à utiliser. + +Phase model +~~~~~~~~~~~ + +Cette phase permet de prendre des fichiers model pour générer des fichiers (java +ou autre) en utilisant des templates. + +Example: + +:: + + <execution> + <configuration> + <inputs>model:target/generated-sources/models:observe.objectmodel</inputs> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + +La configuration par défaut pour la phase model est : + +- répertoire source : src/main/models +- 'pattern' d'inclusion : **/*.objectmodel +- répertoire de sortie : target/generated-sources/java + +Cette phase défini des propriétés spécifiques : + +- *defaultPackage* : package par défaut +- *templates* : templates à utiliser +- *excludeTemplates* : templates à exclure +- *generatedPackages* : packages à générer + +available-data +-------------- + +Ce 'goal' aide les utilisateurs à déterminer quel type de donnée peut-être +utilisé avec la configuration actuelle du plugin. + +Ce 'goal' ne peut être utilisé que par invocation directe en console et non dans +votre pom car son objectif est d'afficher des informations dans la console. + +Lancez seulement + +::xmi + + mvn eugene:available-data + +pour obtenir toutes les informations disponibles. + +Example: + +:: + + [INFO] [eugene:available-data {execution: default-cli}] + [INFO] Get datas for data types : [modeltype, writer, modelreader, modeltemplate] + Found 2 modeltypes : + [statemodel] with implementation 'org.nuiton.eugene.models.state.xml.StateModelImpl' + [objectmodel] with implementation 'org.nuiton.eugene.models.object.xml.ObjectModelImpl' + Found 3 writers : + [xmi] with implementation 'org.nuiton.eugene.plugin.writer.XmiChainedFileWriter + inputProtocol : xmi + outputProtocol : model + defaultIncludes : **/*.xmi + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + [model2Java] with implementation 'org.nuiton.eugene.plugin.writer.ModelChainedFileWriter + inputProtocol : model + outputProtocol : null + defaultIncludes : **/*.*model + defaultInputDirectory : src/main/models + defaultTestInputDirectory : src/test/models' + [zargo2xmi] with implementation 'org.nuiton.eugene.plugin.writer.ZargoChainedFileWriter + inputProtocol : zargo + outputProtocol : xmi + defaultIncludes : **/*.zargo + defaultInputDirectory : src/main/xmi + defaultTestInputDirectory : src/test/xmi' + Found 2 modelreaders : + [statemodel] with implementation 'org.nuiton.eugene.models.state.StateModelReader' + [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' + Found one modeltemplate : + [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' + +copyVersionFiles +---------------- + +Ce 'goal' permet de garder les mappings hibernate intacts pour chaque version du +model. + +zargo2xmi +--------- + +Génération 'stupide' de zargo vers xmi sans chaînage des générations. + +Utilisez plutôt le 'goal' *smart-generate*. + +xmi2objectmodel +--------------- + +Génération 'stupide' de xmi vers objectmodel sans chaînage des générations. + +Utilisez plutôt le 'goal' *smart-generate*. + +xmi2statemodel +-------------- + +Génération 'stupide' de xmi vers statemodel sans chaînage des générations. + +Utilisez plutôt le 'goal' *smart-generate*. + +generate +-------- + +Génération 'stupide' de model vers java et autres sans chaînage des générations. + +Utilisez plutôt le 'goal' *smart-generate*. Added: trunk/maven-eugene-plugin/src/site/rst/example.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/rst/example.rst (rev 0) +++ trunk/maven-eugene-plugin/src/site/rst/example.rst 2010-01-28 11:40:21 UTC (rev 807) @@ -0,0 +1,147 @@ +Examples +======== + + +:Authors: Jean Couteau +:Contact: couteau(a)codelutin.com +:Revision: $Revision: 649 $ +:Date: $Date: 2009-10-21 14:21:03 +0200 (Wed, 21 Oct 2009) $ + + +.. contents:: + +This page groups two plugin configuration/usage examples in a pom. The first +example is very simple, the second is more complex and aimed to bring a better +understanding of the plugin combined with the usages_ documentation. + +Cette page regroupe deux examples de configuration/utilisation du plugin +dans un pom. Le premier example est très simple, le second est plus complexe +et est censé ammener une complète compréhension du plugin combiné à la +documentation des usages_ . + +.. _usages: usage.html + +Simple example +-------------- + +This example will generate the entities and interfaces from the package +org.nuiton.eugene.demopackage from the zargo files present in the src/main/xmi +directory. + +:: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + + <executions> + + <execution> + <phase>generate-sources</phase> +  + <configuration> +  + <fullPackagePath>org.nuiton.eugene.demopackage</fullPackagePath> +  + <defaultPackage>org.nuiton.eugene.demopackage</defaultPackage> +  + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer, + org.nuiton.topia.generator.BeanTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <-- dependency to topia to use their template --> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + </dependencies> + </plugin> + +Complex example +--------------- + +This example uses two zargo files as input and will generate them separately. + +The two first phases are common, then two executions are configured, one per +file, specificating the different templates to use for each model file. + +:: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <configuration> + <defaultPackage>org.nuiton.eugene.demopackage</defaultPackage> + <fullPackagePath>org.nuiton.eugene.demopackage</fullPackagePath> + </configuration> + + <executions> + +  + <execution> + <phase>generate-sources</phase> + <id>toModel</id> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <skipInputs>model</skipInputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <-- Execution that transforms the entities.objectmodel file using + specific templates from topia --> + <execution> + <phase>generate-sources</phase> + <id>model-to-entities</id> + <configuration> + <inputs>model:target/generated-sources/models:entities.objectmodel</inputs> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <-- Execution that transforms the beans.objectmodel file using + other specific templates from topia --> + <execution> + <phase>generate-sources</phase> + <id>model-to-bean</id> + <configuration> + <inputs> + <input>model:target/generated-sources/models:beans.objectmodel</input> + </inputs> + <templates>org.nuiton.topia.generator.BeanTransformer</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + </executions> + +  + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/site/rst/usage.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/rst/usage.rst 2010-01-26 21:06:43 UTC (rev 806) +++ trunk/maven-eugene-plugin/src/site/rst/usage.rst 2010-01-28 11:40:21 UTC (rev 807) @@ -15,17 +15,19 @@ smart-generate -------------- -This goal permits to launch a smart (understood as intelligent) generation, chaining different generation phases. +This goal permits to launch a smart (understood as intelligent) generation, +chaining different generation phases. -Following the maven spirit of using convention (and then default configuration) you should always try to respect the -plugin convention to avoid big headaches... +Following the maven spirit of using convention (and then default configuration) +you should always try to respect the plugin convention to avoid big headaches... modelType ********* -An invariant of the goal is the type of model to treate given by the configuration property *modelType*. +An invariant of the goal is the type of model to treate given by the +configuration property *modelType*. -actually there is two types of model : +At the moment there is two types of model : - objectmodel - statemodel @@ -35,9 +37,10 @@ To define what to generate, you must fill the *inputs* configuration. -Each inputs entry is bind to a phase of generation (see next section to learn more about phases). +Each inputs entry is bind to a phase of generation (see next section to learn +more about phases). -an input entry is defined by : +An input entry is defined by : - a phase (zargo, xmi or model) - a input directory @@ -56,7 +59,7 @@ </goals> </execution> -If you wants to use more than one entry, you can also write : +If you want to use more than one entry, you can also write : :: @@ -75,7 +78,7 @@ An input can have three forms : -- <input>XXX</input> : use the XXX phase with his default configuration +- <input>XXX</input> : use the XXX phase with its default configuration - <input>dir:includes</input> : use the given directory with the given phase and detects from the includes pattern the phase to use - <input>XXX:dir:includes</input> : use the XXX phase with the given directory and includes pattern @@ -98,7 +101,8 @@ phases ****** -A phase (also called a writer) aims to generate something with possibility to fire a *next* chained phase. +A phase (also called a writer) aims to generate something with possibility to +fire a *next* chained phase. At the moment we have defined several phases of generation : @@ -139,7 +143,7 @@ zargo phase ~~~~~~~~~~~ -This phase permits to take some zargo files to extract form them the xmi files. +This phase permits to take some zargo files to extract the xmi files from them. Example: @@ -155,7 +159,8 @@ </goals> </execution> -will detects all zargo files (using the default configuration for zargo phase) and extract xmi files. +will detect all zargo files (using the default configuration for zargo phase) +and extract their xmi files. The default configuration for the zargo phase is : @@ -168,7 +173,8 @@ xmi phase ~~~~~~~~~ -This phase permits to take some xmi files to build some objectmoldel (or staemodel) files. +This phase permits to take some xmi files to build some objectmoldel (or +statemodel) files. Example: @@ -185,7 +191,8 @@ </goals> </execution> -will detects all xmi files (using the default configuration for xmi phase) and create model files. +will detect all xmi files (using the default configuration for xmi phase) and +create model files from them. The default configuration for the xmi phase is : @@ -201,7 +208,8 @@ model phase ~~~~~~~~~~~ -This phase permits to take some model files to generate some files (java and others) using the given templates +This phase permits to take some model files to generate some files (java and +others) using the given templates. Example: @@ -237,10 +245,11 @@ available-data -------------- -This goals help users to determine all type of data that can be used with your current configuration of plugin. +This goal help users to determine all types of data that can be used with their +current configuration of plugin. -The goal can only be used by direct invocation in console and not in your pom as his purpose is only to display some -stuff in your console. +The goal can only be used by direct invocation in console and not in the pom as +its purpose is only to display some stuff in the console. Just type @@ -248,7 +257,7 @@ mvn eugene:available-data -to obtain all datas available. +to obtain all data available. Example: @@ -287,32 +296,32 @@ copyVersionFiles ---------------- -This goals permits to keep hibernate mappings for each version of model version. +This goal permits to keep hibernate mappings for each version of model version. zargo2xmi --------- 'Stupid' generation from zargo to xmi files with no chained stuff. -Prefer use now the *smart-generate* goal. +Prefer using the *smart-generate* goal. xmi2objectmodel --------------- 'Stupid' generation from xmi files to object model files with no chained stuff. -Prefer use now the *smart-generate* goal. +Prefer using the *smart-generate* goal. xmi2statemodel -------------- 'Stupid' generation from xmi files to state model files with no chained stuff. -Prefer use now the *smart-generate* goal. +Prefer using the *smart-generate* goal. generate -------- 'Stupid' generation from model files to java and other files with no chained stuff. -Prefer use now the *smart-generate* goal. +Prefer using the *smart-generate* goal. Modified: trunk/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-26 21:06:43 UTC (rev 806) +++ trunk/maven-eugene-plugin/src/site/site_en.xml 2010-01-28 11:40:21 UTC (rev 807) @@ -20,6 +20,7 @@ <menu name="User"> <item href="index.html" name="Index"/> <item href="usage.html" name="Usage"/> + <item href="example.html" name="Examples"/> <item name="Goals" href="plugin-info.html"> <item name="smart-generate" href="smart-generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/> Modified: trunk/maven-eugene-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-26 21:06:43 UTC (rev 806) +++ trunk/maven-eugene-plugin/src/site/site_fr.xml 2010-01-28 11:40:21 UTC (rev 807) @@ -24,6 +24,7 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> <item href="usage.html" name="Utilisation"/> + <item href="example.html" name="Examples"/> <item name="Goals" href="plugin-info.html"> <item name="smart-generate" href="smart-generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/>

1 0

r806 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:06:43 +0100 (Tue, 26 Jan 2010) New Revision: 806 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 08:56:08 UTC (rev 805) +++ trunk/pom.xml 2010-01-26 21:06:43 UTC (rev 806) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <artifactId>eugene</artifactId>

1 0

r805 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: fdesbois Date: 2010-01-26 09:56:08 +0100 (Tue, 26 Jan 2010) New Revision: 805 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Log: Change log level to debug Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-24 23:38:09 UTC (rev 804) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-26 08:56:08 UTC (rev 805) @@ -93,8 +93,8 @@ @Override public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { - if (log.isInfoEnabled()) { - log.info(clazz.getQualifiedName()); + if (log.isDebugEnabled()) { + log.debug(clazz.getQualifiedName()); } preparePrefix(clazz); @@ -156,8 +156,8 @@ @Override public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { - if (log.isInfoEnabled()) { - log.info(interfacez.getQualifiedName()); + if (log.isDebugEnabled()) { + log.debug(interfacez.getQualifiedName()); } preparePrefix(interfacez); @@ -219,8 +219,8 @@ @Override public void generateFromEnum(Writer output, ObjectModelEnumeration enumz) throws IOException { - if (log.isInfoEnabled()) { - log.info(enumz.getQualifiedName()); + if (log.isDebugEnabled()) { + log.debug(enumz.getQualifiedName()); } preparePrefix(enumz); generateHeader(output, enumz); // Imports, package et documentation

1 0