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

r1102 - trunk
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 19:23:25 +0200 (Thu, 22 Sep 2011) New Revision: 1102 Url: http://nuiton.org/repositories/revision/eugene/1102 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 11:38:33 UTC (rev 1101) +++ trunk/pom.xml 2011-09-22 17:23:25 UTC (rev 1102) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>eugene</artifactId> @@ -469,12 +469,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd" /> + <include name="**/*.xsd"/> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd" /> + <include name="**/*.dtd"/> </fileset> </copy> </tasks>

1 0

r1101 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 13:38:33 +0200 (Thu, 22 Sep 2011) New Revision: 1101 Url: http://nuiton.org/repositories/revision/eugene/1101 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 2011-09-22 11:38:32 UTC (rev 1100) +++ trunk/ant-eugene-task/pom.xml 2011-09-22 11:38:33 UTC (rev 1101) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-09-22 11:38:32 UTC (rev 1100) +++ trunk/eugene/pom.xml 2011-09-22 11:38:33 UTC (rev 1101) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-09-22 11:38:32 UTC (rev 1100) +++ trunk/maven-eugene-plugin/pom.xml 2011-09-22 11:38:33 UTC (rev 1101) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 11:38:32 UTC (rev 1100) +++ trunk/pom.xml 2011-09-22 11:38:33 UTC (rev 1101) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4 + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.4</url> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> <distributionManagement>

1 0

r1100 - in tags: . eugene-2.4
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 13:38:32 +0200 (Thu, 22 Sep 2011) New Revision: 1100 Url: http://nuiton.org/repositories/revision/eugene/1100 Log: [maven-release-plugin] copy for tag eugene-2.4 Added: tags/eugene-2.4/ Property changes on: tags/eugene-2.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

r1099 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 13:38:31 +0200 (Thu, 22 Sep 2011) New Revision: 1099 Url: http://nuiton.org/repositories/revision/eugene/1099 Log: [maven-release-plugin] prepare release eugene-2.4 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 2011-09-22 11:36:28 UTC (rev 1098) +++ trunk/ant-eugene-task/pom.xml 2011-09-22 11:38:31 UTC (rev 1099) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-09-22 11:36:28 UTC (rev 1098) +++ trunk/eugene/pom.xml 2011-09-22 11:38:31 UTC (rev 1099) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-09-22 11:36:28 UTC (rev 1098) +++ trunk/maven-eugene-plugin/pom.xml 2011-09-22 11:38:31 UTC (rev 1099) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 11:36:28 UTC (rev 1098) +++ trunk/pom.xml 2011-09-22 11:38:31 UTC (rev 1099) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.4</url> </scm> <distributionManagement> @@ -469,12 +469,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd"/> + <include name="**/*.xsd" /> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd"/> + <include name="**/*.dtd" /> </fileset> </copy> </tasks>

1 0

r1098 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 13:36:28 +0200 (Thu, 22 Sep 2011) New Revision: 1098 Url: http://nuiton.org/repositories/revision/eugene/1098 Log: add license header Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java 2011-09-22 10:00:42 UTC (rev 1097) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java 2011-09-22 11:36:28 UTC (rev 1098) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.models.object; import org.nuiton.util.StringUtil;

1 0

r1097 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator
by tchemit＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: tchemit Date: 2011-09-22 12:00:42 +0200 (Thu, 22 Sep 2011) New Revision: 1097 Url: http://nuiton.org/repositories/revision/eugene/1097 Log: validates if the model has no name Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java 2011-09-22 09:00:33 UTC (rev 1096) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java 2011-09-22 10:00:42 UTC (rev 1097) @@ -25,23 +25,23 @@ package org.nuiton.eugene.models.object.validator; -import java.util.ArrayList; -import java.util.List; - +import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; +import java.util.ArrayList; +import java.util.List; + /** * <p> * Validateur de modèle. * Cette classe faite pour être surchargée parcours le modèle et appelle * différentes méthodes pour tester la validité de ses composants. Chacune de - * ces méthodes renvoi "true" si la partie du modèle analysée est valide et + * ces méthodes renvoi "true" si la partie du modèle analysée est valide et * "false" dans le cas contraire. Lorsqu'une erreur est trouvée, elle est * ajoutée au validateur par le biais de la méthode "addError". * Puis l'objet faisant appel au validateur peut récupérer la liste des erreurs @@ -51,9 +51,7 @@ * * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public class ObjectModelValidator { protected ObjectModel model; @@ -69,6 +67,8 @@ * Renvoie la liste des erreurs constatées pdt la validation. Si aucune * erreur n'a été constatée ou si la validation n'a pas été effectuée, la * liste renvoyeé sera vide. + * + * @return list of errors found while validation. */ public List<String> getErrors() { return errors; @@ -76,6 +76,8 @@ /** * Valide le modèle et renvoie faux si il n'est pas valide + * + * @return {@code true} if model is valid, {@code false} otherwise. */ public boolean validate() { if (errors.size() > 0) { @@ -103,6 +105,13 @@ } protected boolean validateModel(ObjectModel model) { + + // check model has a name + String modelName = model.getName(); + if (StringUtils.isBlank(modelName)) { + + addError(model, "model has no name"); + } return true; } @@ -126,12 +135,13 @@ return true; } - protected void addError(ObjectModelElement onElement, String reason) { + protected void addError(Object onElement, String reason) { String elementString = onElement.toString(); if (onElement instanceof ObjectModelAttribute) { - elementString = ((ObjectModelClassifier) onElement + ObjectModelAttribute attribute = (ObjectModelAttribute) onElement; + elementString = ((ObjectModelClassifier) attribute .getDeclaringElement()).getQualifiedName() - + "#" + onElement.getName(); + + "#" + attribute.getName(); } else if (onElement instanceof ObjectModelClassifier) { ObjectModelClassifier classifier = (ObjectModelClassifier) onElement; elementString = classifier.getQualifiedName();

1 0

r1096 - in trunk/eugene/src/main/java/org/nuiton/eugene: . models/object
by tchemit＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: tchemit Date: 2011-09-22 11:00:33 +0200 (Thu, 22 Sep 2011) New Revision: 1096 Url: http://nuiton.org/repositories/revision/eugene/1096 Log: Evolution #1746: Add a serialVersionUID generator Added: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-09-21 18:02:48 UTC (rev 1095) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-09-22 09:00:33 UTC (rev 1096) @@ -35,6 +35,7 @@ import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.SerialVersionUIDBuilder; import org.nuiton.util.StringUtil; import java.io.File; @@ -486,7 +487,7 @@ StringBuffer result = new StringBuffer(); Collection<ObjectModelAttribute> params = clazz.getAttributes(); - for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext();) { + for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext(); ) { ObjectModelAttribute attr = j.next(); result.append(getAttributeType(attr, true)).append(" ").append(attr.getName()); if (j.hasNext()) { @@ -577,7 +578,9 @@ * * @param clazz the class to use * @return the generated serialVersionUID + * @deprecated since 2.4, prefer use the method {@link #generateSerialVersionUID(ObjectModelClassifier)} */ + @Deprecated public static String computeSerialVersionUID(ObjectModelClass clazz) { String query = clazz.getQualifiedName() + "#"; for (ObjectModelAttribute attr : clazz.getAttributes()) { @@ -682,7 +685,6 @@ } /** - * * @param str the string to parse * @return the string without any * @since 2.3.2 @@ -713,7 +715,7 @@ // the i position was on the last closing caracter, can safely // remove until this position + 1 - String prefix = result.substring(0,i+1); + String prefix = result.substring(0, i + 1); String end = result.substring(i + 1); // remove any starting spaces @@ -855,4 +857,15 @@ return value; } + /** + * Generates the serialVersionUID of the given {@code classifier}. + * + * @param classifier the classifier + * @return the value of the serialVersionUID + */ + public static long generateSerialVersionUID(ObjectModelClassifier classifier) { + long result = SerialVersionUIDBuilder.computeDefaultSUID(classifier); + return result; + } + } // GeneratorUtil Added: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java 2011-09-22 09:00:33 UTC (rev 1096) @@ -0,0 +1,110 @@ +package org.nuiton.eugene.models.object; + +import org.nuiton.util.StringUtil; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * To build seriablVersionUID for a givne objectModelClassifier. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class SerialVersionUIDBuilder { + + protected ObjectModelClassifier clazz; + + protected List<String> interfaceSignatures; + + protected List<String> fieldSignatures; + + protected List<String> methodSignatures; + + public static long computeDefaultSUID(ObjectModelClassifier psiClass) { + + SerialVersionUIDBuilder builder = new SerialVersionUIDBuilder(psiClass); + long result = builder.buildUID(); + return result; + } + + public SerialVersionUIDBuilder(ObjectModelClassifier clazz) { + this.clazz = clazz; + + interfaceSignatures = new ArrayList<String>(); + for (ObjectModelInterface method : clazz.getInterfaces()) { + interfaceSignatures.add(method.getQualifiedName()); + } + Collections.sort(interfaceSignatures); + if (clazz instanceof ObjectModelClass) { + ObjectModelClass objectModelClass = (ObjectModelClass) clazz; + for (ObjectModelClass modelClass : + objectModelClass.getSuperclasses()) { + interfaceSignatures.add(modelClass.getQualifiedName()); + } + } + + methodSignatures = new ArrayList<String>(); + for (ObjectModelOperation method : + clazz.getAllInterfaceOperations(true)) { + StringBuilder sb = new StringBuilder(); + sb.append(method.getReturnType()).append(method.getName()); + for (ObjectModelParameter parameter : method.getParameters()) { + sb.append(parameter.getType()).append(parameter.getName()); + } + for (String exception : method.getExceptions()) { + sb.append(exception); + } + methodSignatures.add(sb.toString()); + } + Collections.sort(methodSignatures); + + fieldSignatures = new ArrayList<String>(); + for (ObjectModelAttribute field : clazz.getAllInterfaceAttributes()) { + StringBuilder sb = new StringBuilder(); + sb.append(field.getType()).append(field.getName()); + fieldSignatures.add(sb.toString()); + } + Collections.sort(fieldSignatures); + } + + public long buildUID() { + StringBuilder sb = new StringBuilder(); + + String className = clazz.getName(); + sb.append(className); + + for (String interfactSignature : getFieldSignatures()) { + sb.append(interfactSignature); + } + + for (String fieldSignature : getFieldSignatures()) { + sb.append(fieldSignature); + } + + for (String methodSignature : getMethodSignatures()) { + sb.append(methodSignature); + } + + byte[] digestBytes = StringUtil.encodeSHA1(sb.toString()).getBytes(); + long serialVersionUID = 0L; + for (int i = Math.min(digestBytes.length, 8) - 1; i >= 0; i--) { + serialVersionUID = serialVersionUID << 8 | digestBytes[i] & 0xFF; + } + return serialVersionUID; + + } + + public List<String> getInterfaceSignatures() { + return interfaceSignatures; + } + + public List<String> getFieldSignatures() { + return fieldSignatures; + } + + public List<String> getMethodSignatures() { + return methodSignatures; + } +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1095 - in trunk: eugene/src/main/java/org/nuiton/eugene/writer maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org Sept. 21, 2011

Sept. 21, 2011

Author: tchemit Date: 2011-09-21 20:02:48 +0200 (Wed, 21 Sep 2011) New Revision: 1095 Url: http://nuiton.org/repositories/revision/eugene/1095 Log: Anomalie #1438: Classpath model resolution fails on windows (use String inputPath instead of File inputDirectory in ChainedFileWriterEntry) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java 2011-09-21 11:01:18 UTC (rev 1094) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java 2011-09-21 18:02:48 UTC (rev 1095) @@ -146,16 +146,16 @@ * Obtain for a given {@code inputDirectory}, all files to treate. * * @param configuration the shared configuration - * @param inputDirectory the input directory + * @param inputPath the input path (can be a directory or a classpath path) * @param includePattern the include pattern separated by comma - * @param inClassPath a flag to say if we should search in classp-ath + * @param inClassPath a flag to say if we should search in classpath * @return the list of resources detected * @throws IOException if any IO pb while searching resources * @throws IllegalArgumentException if no include pattern given * @since 2.1.3 */ List<URL> getFiles(ChainedFileWriterConfiguration configuration, - File inputDirectory, + String inputPath, List<String> includePattern, boolean inClassPath) throws IOException, IllegalArgumentException; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2011-09-21 11:01:18 UTC (rev 1094) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2011-09-21 18:02:48 UTC (rev 1095) @@ -25,7 +25,7 @@ package org.nuiton.eugene.writer; -import java.io.File; +import org.apache.commons.lang.builder.ToStringBuilder; /** * Definition of of the chained writer entry. @@ -38,8 +38,8 @@ */ public class ChainedFileWriterEntry { - /** input directory of entry */ - protected File inputDirectory; + /** input path of entry (can be a directory or a classpath entry) */ + protected String inputPath; /** include pattern of entry */ protected String includePattern; @@ -47,22 +47,22 @@ /** * Flag to knwon if resources should be searched in classpath. * <p/> - * If sets to {@code true}, then the {@link #inputDirectory} is the + * If sets to {@code true}, then the {@link #inputPath} is the * absolute path where to seek resources in classpath. * * @since 2.1.3 */ protected boolean useClassPath; - public ChainedFileWriterEntry(File inputDirectory, + public ChainedFileWriterEntry(String inputPath, String includePattern, boolean useClassPath) { - this(inputDirectory, includePattern); + this(inputPath, includePattern); this.useClassPath = useClassPath; } - public ChainedFileWriterEntry(File inputDirectory, String includePattern) { - this.inputDirectory = inputDirectory; + public ChainedFileWriterEntry(String inputPath, String includePattern) { + this.inputPath = inputPath; this.includePattern = includePattern; } @@ -70,11 +70,17 @@ return includePattern; } - public File getInputDirectory() { - return inputDirectory; + public String getInputPath() { + return inputPath; } public boolean isUseClassPath() { return useClassPath; } + + @Override + public String toString() { + String s = ToStringBuilder.reflectionToString(this); + return s; + } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2011-09-21 11:01:18 UTC (rev 1094) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2011-09-21 18:02:48 UTC (rev 1095) @@ -302,11 +302,11 @@ } // first thing is to merge entries (normal ones and classpath ones) - Map<File, List<String>> normalEntries = new HashMap<File, List<String>>(); - Map<File, List<String>> classpathEntries = new HashMap<File, List<String>>(); + Map<String, List<String>> normalEntries = new HashMap<String, List<String>>(); + Map<String, List<String>> classpathEntries = new HashMap<String, List<String>>(); for (ChainedFileWriterEntry e : writer.getEntries()) { - Map<File, List<String>> currentMap; + Map<String, List<String>> currentMap; if (e.isUseClassPath()) { @@ -315,7 +315,7 @@ currentMap = normalEntries; } - File input = e.getInputDirectory(); + String input = e.getInputPath(); List<String> includes = currentMap.get(input); if (includes == null) { includes = new ArrayList<String>(); @@ -339,7 +339,7 @@ } protected void addFilesToTreate(ChainedFileWriter writer, - Map<File, List<String>> entries, + Map<String, List<String>> entries, ChainedFileWriterData result, boolean useClassPath) throws IOException { @@ -351,21 +351,21 @@ Map<File, List<File>> filesByRoot = result.getFilesByRoot(); Map<File, List<File>> resourcesByFile = result.getResourcesByFile(); - for (Map.Entry<File, List<String>> entry : entries.entrySet()) { - File inputDirectory = entry.getKey(); + for (Map.Entry<String, List<String>> entry : entries.entrySet()) { + String inputDirectory = entry.getKey(); // final input directory to use (for class-path entries, we will // replace the class-path path by the extracted path - File realInputDirectory = inputDirectory; + File realInputDirectory = new File(inputDirectory); if (useClassPath) { // use the extracted path as input directory, otherwise there - // will have a problem : the incoming inputDirectory will not be + // will have a problem : the incoming inputPath will not be // an ancestor of his resources, so prefer to use the extracted // path which fix this problem. - String inputPath = inputDirectory.getAbsolutePath(); + String inputPath = inputDirectory; if (inputPath.equals("/")) { realInputDirectory = extractDirectory; } else { @@ -532,7 +532,7 @@ configuration.isTestPhase() ? writer.getDefaultTestInputDirectory() : writer.getDefaultInputDirectory() - ), + ).getAbsolutePath(), writer.getDefaultIncludes() ); return writerEntry; @@ -584,7 +584,7 @@ String includes = matcher.group(2); ChainedFileWriterEntry writerEntry = new ChainedFileWriterEntry( - new File(inputPath), + inputPath, includes, true ); @@ -638,7 +638,7 @@ String includes = matcher.group(2); ChainedFileWriterEntry writerEntry = new ChainedFileWriterEntry( - new File(configuration.getBasedir(), inputPath), + new File(configuration.getBasedir(), inputPath).getAbsolutePath(), includes ); return writerEntry; @@ -689,7 +689,7 @@ //TODO tchemit 2010-09-22 Should be able to do a pattern research ChainedFileWriterEntry writerEntry = new ChainedFileWriterEntry( - new File(inputPath), + inputPath, includes, true ); @@ -740,7 +740,7 @@ String inputPath = matcher.group(2); String includes = matcher.group(3); ChainedFileWriterEntry writerEntry = new ChainedFileWriterEntry( - new File(configuration.getBasedir(), inputPath), + new File(configuration.getBasedir(), inputPath).getAbsolutePath(), includes ); return writerEntry; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2011-09-21 11:01:18 UTC (rev 1094) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2011-09-21 18:02:48 UTC (rev 1095) @@ -495,8 +495,7 @@ } if (dryRun || isVerbose()) { for (ChainedFileWriterEntry entry : writer.getEntries()) { - getLog().info(" entry : " + entry.getInputDirectory() + - " - " + entry.getIncludePattern()); + getLog().info(" entry : " + entry); } if (dryRun) { continue; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java 2011-09-21 11:01:18 UTC (rev 1094) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java 2011-09-21 18:02:48 UTC (rev 1095) @@ -80,7 +80,7 @@ @Override public final List<URL> getFiles(ChainedFileWriterConfiguration configuration, - File inputDirectory, + String inputPath, List<String> includePattern, boolean inClassPath) throws MalformedURLException, IllegalArgumentException { @@ -92,7 +92,7 @@ if (!inClassPath) { DirectoryScanner ds = new DirectoryScanner(); - + File inputDirectory = new File(inputPath); ds.setBasedir(inputDirectory); ds.setIncludes(includePattern.toArray(new String[includePattern.size()])); ds.setExcludes(null); @@ -111,7 +111,7 @@ for (String pattern : includePattern) { - String path = inputDirectory.getAbsolutePath(); + String path = inputPath; //FIXME must change the file.separator to / if (!path.endsWith("/")) {

1 0

r1094 - trunk
by tchemit＠users.nuiton.org Sept. 21, 2011

Sept. 21, 2011

Author: tchemit Date: 2011-09-21 13:01:18 +0200 (Wed, 21 Sep 2011) New Revision: 1094 Url: http://nuiton.org/repositories/revision/eugene/1094 Log: T?\195?\162che #1631: Updates to nuiton-utils 2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-12 11:09:10 UTC (rev 1093) +++ trunk/pom.xml 2011-09-21 11:01:18 UTC (rev 1094) @@ -365,7 +365,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.1</processorPluginVersion> - <nuitonUtilsVersion>2.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.3.2</nuitonI18nVersion>

1 0

r1093 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 13:09:10 +0200 (Mon, 12 Sep 2011) New Revision: 1093 Url: http://nuiton.org/repositories/revision/eugene/1093 Log: fix parent Anomalie #1738: import missing when generating i18n prefix with no attributes 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 2011-09-09 16:05:12 UTC (rev 1092) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-09-12 11:09:10 UTC (rev 1093) @@ -845,21 +845,17 @@ addBlock(output, ObjectModelModifier.STATIC); StringBuilder buffer = new StringBuilder(300); + addImport(output, I18n.class); addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); - boolean useI18n = false; for (ObjectModelAttribute attr : input.getAttributes()) { //tchemit-20100225 only treate navigable relations if (attr.isNavigable()) { - useI18n=true; addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName()) ); } } - if (useI18n) { - addImport(output, I18n.class); - } setOperationBody(block, buffer.toString()); }

1 0