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

r1001 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 18:24:18 +0100 (Fri, 26 Nov 2010) New Revision: 1001 Url: http://nuiton.org/repositories/revision/eugene/1001 Log: fix tag value detection at model level Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 18:40:54 UTC (rev 1000) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-26 17:24:18 UTC (rev 1001) @@ -98,7 +98,7 @@ * @since 2.2.1 */ protected Pattern modelTagValuePattern = Pattern - .compile("model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)+)"); + .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); public static final String MODEL = "model"; @@ -190,7 +190,7 @@ return result; } - protected Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + public Properties loadModelPropertiesFile(File propFile, ObjectModel model) { Properties prop = new RecursiveProperties(); try { FileInputStream inStream = new FileInputStream(propFile);

1 0

r1000 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 19:40:54 +0100 (Thu, 25 Nov 2010) New Revision: 1000 Url: http://nuiton.org/repositories/revision/eugene/1000 Log: Anomalie #1100: User not warned when an entry of the model properties file can not be attached Evolution #1098: Improve tagValue detection Evolution #1099: Can use tagvalue or now also tagValue in model properties file Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 09:04:45 UTC (rev 999) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 18:40:54 UTC (rev 1000) @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.List; +import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.digester.Digester; @@ -50,7 +51,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.RecursiveProperties; import org.nuiton.util.StringUtil; -import org.xml.sax.SAXException; /** * To read object model files into an memory object model. @@ -76,6 +76,9 @@ public static final String CLASS = "class"; /** + * Pattern to define tag values authorized at classifier level in the model + * properties file. + * * L'expression réguliere match les chaines de type * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] * fr.isisfish.entities.Population.class.stereotype=entity @@ -86,8 +89,17 @@ * fr.isisfish.entities.Population.operation.getRegion.tagvalue.pk=... */ protected Pattern propertiesPattern = Pattern - .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation)\\.)(?:([_a-z0-9][_a-zA-Z0-9]*)\\.)?(?:(stereotype|tagvalue)\\.?)([_a-z0-9][_a-zA-Z0-9]*)?"); + .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype|tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?"); + /** + * Pattern to define tag values authorized at model level in the model + * properties file. + * + * @since 2.2.1 + */ + protected Pattern modelTagValuePattern = Pattern + .compile("model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)+)"); + public static final String MODEL = "model"; /** @@ -114,14 +126,10 @@ try { digester.push(model); model = (ObjectModel) digester.parse(file); - } catch (IOException e) { + } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Unable to parse ObjectModel input file : " + file, e); } - } catch (SAXException e) { - if (log.isWarnEnabled()) { - log.warn("Unable to parse ObjectModel input file : " + file, e); - } } // recherche est charge le fichier propriete associe au modele @@ -129,7 +137,6 @@ String ext = FileUtil.extension(file); String name = FileUtil.basename(file, "." + ext); File propFile = new File(dir, name + ".properties"); - RecursiveProperties prop = new RecursiveProperties(); if (!propFile.exists()) { if (log.isInfoEnabled()) { log.info("Pas de fichier de propriete " + propFile @@ -140,145 +147,7 @@ log.info("Lecture du fichier de propriete " + propFile + " associé au model"); } - try { - FileInputStream inStream = new FileInputStream(propFile); - try { - prop.load(inStream); - } finally { - inStream.close(); - } - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible de lire le fichier de propriete " - + propFile, eee); - } - } - - // on ajoute les proprietes du fichier associe au model - for (Enumeration<Object> e = prop.keys(); e.hasMoreElements();) { - String key = (String) e.nextElement(); - String value = prop.getProperty(key); - - if (key.startsWith(MODEL)) { - - // model tag value - - if (!key.startsWith("model.tagvalue.")) { - if (log.isWarnEnabled()) { - log.warn("only tagvalue is allowed on model in properties"); - } - continue; - } - String tag = key.substring("model.tagvalue.".length()); - - ObjectModelImpl modelImpl = (ObjectModelImpl) model; - if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { - - // push directly the version in the model version - // property - modelImpl.setVersion(value); - } - ObjectModelImplTagValue tagvalue = new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - modelImpl.addTagValue(tagvalue); - continue; - } - - // element tag value - Matcher matcher = propertiesPattern.matcher(key); - - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "'"); - } - - if (matcher.find()) { - // fqn is fully qualified name of class - String fqn = matcher.group(1); - fqn = StringUtil.substring(fqn, 0, -1); // remove ended - // . - // target is class, attribute or operation - String target = matcher.group(2); - String targetName = matcher.group(3); - // type is stereotype or tagvalue - String type = matcher.group(4); - String tag = matcher.group(5); - - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "' => " - + "fqn:" + fqn + " target:" + target - + " targetName:" + targetName - + " type:" + type + " tag:" + tag); - } - - ObjectModelClassifier omc = model.getClassifier(fqn); - if (omc == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find classifier for " + - fqn + " from tag value " + key); - } - continue; - } - - if (!(omc instanceof ObjectModelClassifierImpl)) { - // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message - if (log.isWarnEnabled()) { - log.warn("Can't add properties to model, " + - "it's not an " + - "ObjectModelClassifierImpl : " + - omc.getQualifiedName()); - } - continue; - } - - List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); - if (CLASS.equals(target)) { - elems.add(omc); - } else if (ATTRIBUTE.equals(target)) { - - ObjectModelAttribute attr = - getAttribute((ObjectModelClass)omc, targetName); - elems.add(attr); - - } else if (OPERATION.equals(target)) { - elems.addAll(omc.getOperations(targetName)); - } - for (Object elem1 : elems) { - if (elem1 == null) { - if (log.isWarnEnabled()) { - log.warn("can not attach tagValue " + - key + " on a null element."); - } - continue; - } - ObjectModelElementImpl elem = - (ObjectModelElementImpl) elem1; - if (STEREOTYPE.equals(type)) { - // pour les stereotypes - ObjectModelImplRef stereotype = new ObjectModelImplRef(); - stereotype.setName(value); - elem.addStereotype(stereotype); - continue; - } - - if (TAGVALUE.equals(type)) { - // pour les tagvalues - ObjectModelImplTagValue tagvalue = - new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - if (log.isDebugEnabled()) { - log.debug("tagValue:" + tagvalue - + ", tag:" + tag - + ", value:" + value - + ", element:" + elem); - } - elem.addTagValue(tagvalue); - - } - } - } - } + loadModelPropertiesFile(propFile, model); } } if (log.isDebugEnabled()) { @@ -287,13 +156,6 @@ } } return model; - /*try { - generate(objectModel, destDir); - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Unable to generate for file", eee); - } - }*/ } /** @@ -327,4 +189,165 @@ } return result; } + + protected Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + Properties prop = new RecursiveProperties(); + try { + FileInputStream inStream = new FileInputStream(propFile); + try { + prop.load(inStream); + } finally { + inStream.close(); + } + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible de lire le fichier de propriete " + + propFile, eee); + } + } + // on ajoute les proprietes du fichier associe au model + for (Enumeration<Object> e = prop.keys(); e.hasMoreElements();) { + String key = (String) e.nextElement(); + String value = prop.getProperty(key); + + if (key.startsWith(MODEL)) { + + // model tag value + + Matcher matcher = modelTagValuePattern.matcher(key); + + if (!matcher.find()) { + if (log.isWarnEnabled()) { + log.warn("Invalid model tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); + } + continue; + } + String tag = matcher.group(2); +// if (!key.startsWith("model.tagvalue.") || +// !key.startsWith("model.tagValue.")) { +// if (log.isWarnEnabled()) { +// log.warn("Invalid tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); +// } +// continue; +// } +// String tag = key.substring("model.tagvalue.".length()); + + ObjectModelImpl modelImpl = (ObjectModelImpl) model; + if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { + + // push directly the version in the model version + // property + modelImpl.setVersion(value); + } + modelImpl.addTagValue(tag, value); + continue; + } + + // element tag value + Matcher matcher = propertiesPattern.matcher(key); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "'"); + } + + if (!matcher.find()) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : syntax is not correct."); + } + continue; + } + + String fqn = matcher.group(1); + fqn = StringUtil.substring(fqn, 0, -1); // remove ended + // . + // target is class, attribute or operation + String target = matcher.group(2); + String targetName = matcher.group(3); + // type is stereotype or tagvalue + String type = matcher.group(4); + String tag = matcher.group(5); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "' => " + + "fqn:" + fqn + " target:" + target + + " targetName:" + targetName + + " type:" + type + " tag:" + tag); + } + + ObjectModelClassifier omc = model.getClassifier(fqn); + if (omc == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + + "] : Could not find classifier for " + fqn); + } + continue; + } + + //todo tchemit 2010-11-25 : what does it mean ? every thing extends ObjectModelClassifierImpl + if (!(omc instanceof ObjectModelClassifierImpl)) { + // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message + if (log.isWarnEnabled()) { + log.warn("Can't add properties to model, " + + "it's not an " + + "ObjectModelClassifierImpl : " + + omc.getQualifiedName()); + } + continue; + } + + List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); + if (CLASS.equals(target)) { + elems.add(omc); + } else if (ATTRIBUTE.equals(target)) { + + ObjectModelAttribute attr = + getAttribute((ObjectModelClass) omc, targetName); + elems.add(attr); + + } else if (OPERATION.equals(target)) { + elems.addAll(omc.getOperations(targetName)); + } + + if (elems.isEmpty()) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : Could not find any element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "'."); + } + } + for (Object elem1 : elems) { + if (elem1 == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : Element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "' is null."); + } + continue; + } + ObjectModelElementImpl elem = + (ObjectModelElementImpl) elem1; + if (STEREOTYPE.equals(type)) { + // pour les stereotypes + ObjectModelImplRef stereotype = new ObjectModelImplRef(); + stereotype.setName(value); + elem.addStereotype(stereotype); + continue; + } + + if (TAGVALUE.equals(type)) { + // pour les tagvalues + ObjectModelImplTagValue tagvalue = + new ObjectModelImplTagValue(); + tagvalue.setName(tag); + tagvalue.setValue(value); + if (log.isDebugEnabled()) { + log.debug("tagValue:" + tagvalue + + ", tag:" + tag + + ", value:" + value + + ", element:" + elem); + } + elem.addTagValue(tagvalue); + + } + } + } + + return prop; + } }

1 0

r999 - in trunk/eugene/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 10:04:45 +0100 (Thu, 25 Nov 2010) New Revision: 999 Url: http://nuiton.org/repositories/revision/eugene/999 Log: Evolution #1096: Add method GeneratorUtil.removeGenericsDefinition Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-23 16:49:52 UTC (rev 998) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-25 09:04:45 UTC (rev 999) @@ -557,13 +557,30 @@ /** * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. * See JUnit test for matching expressions. - * + * * @param str FullQualifiedName for an attribute type (for exemple) * @return the simple name associated to the str given */ public static String getSimpleName(String str) { + String result = getSimpleName(str, false); + return result; + } + + /** + * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. + * See JUnit test for matching expressions. + * + * @param str FullQualifiedName for an attribute type (for exemple) + * @param removeGenericDefinition a flag to remove any generic definition at the beginning of the expression + * @return the simple name associated to the str given + * @since 2.2.1 + */ + public static String getSimpleName(String str, boolean removeGenericDefinition) { + if (removeGenericDefinition) { + str = removeGenericDefinition(str); + } // variable array type - boolean variableArrayType=false; + boolean variableArrayType = false; if (str.endsWith("...")) { variableArrayType = true; str = str.substring(0, str.length() - 3); @@ -580,6 +597,53 @@ } /** + * Remove any generics definition at the beginning of a string. + * <p/> + * For example : + * <pre> + * <T> T -> T + * </pre> + * + * @param str the string to parse + * @return the string without any + * @since 2.2.1 + */ + public static String removeGenericDefinition(String str) { + + // always trim the string + String result = str.trim(); + + if (!result.startsWith("<")) { + + // not starting by a generics definition, no treatment to do + return str; + } + + int i = 0; + for (int length = result.length(), count = 0; i < length; i++) { + char c = result.charAt(i); + if ('<' == c) { + count++; + } else if ('>' == c) { + count--; + } + if (count == 0) { + break; + } + } + + // the i position was on the last closing caracter, can safely + // remove until this position + 1 + result = result.substring(i + 1); + + // remove any starting spaces + while (result.startsWith(" ")) { + result = result.substring(1); + } + return result; + } + + /** * Parse a fully qualified generic java type, and extract each * imbricated types. * Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-23 16:49:52 UTC (rev 998) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-25 09:04:45 UTC (rev 999) @@ -26,18 +26,16 @@ package org.nuiton.eugene; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; -import static org.junit.Assert.*; +import java.util.Set; + +import static org.junit.Assert.assertEquals; + /** * * @author fdesbois @@ -49,22 +47,6 @@ public GeneratorUtilTest() { } - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test public void testGetOperationParametersListName() { log.info("getOperationParametersListName"); @@ -121,6 +103,7 @@ assertEquals("String param1, Date param2", result); } + /** * Test of getSimpleName method, of class GeneratorUtil. */ @@ -140,6 +123,12 @@ log.info(str + " -> " + result); assertEquals(expResult, result); + str = "<T> java.util.List<T>"; + expResult = "<T> List<T>"; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; expResult = "List<? extends Bonzoms>"; result = GeneratorUtil.getSimpleName(str); @@ -214,7 +203,196 @@ assertEquals(expResult, result); } + /** + * Test of getSimpleName method with removing generics definition, + * of class GeneratorUtil. + */ @Test + public void testGetSimpleNameAndRemoveGenericsDefinition() { + log.info("getSimpleName"); + + String str = "List"; + String expResult = "List"; + String result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Regex"; + expResult = "Regex"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T> java.util.List<T>"; + expResult = "List<T>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + expResult = "List<? extends Bonzoms>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<org.chorem.jtimer.Jtimer>"; + expResult = "List<Jtimer>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Set<java.util.Collection<java.util.Collection<java.util.Collection" + + "<java.lang.String>>>>"; + expResult = "Set<Collection<Collection<Collection<String>>>>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Map<org.chorem.jtimer.Jtimer, java.util.Collection<java.lang.String>>"; + expResult = "Map<Jtimer, Collection<String>>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "new java.util.HashMap<org.chorem.jtimer.Jtimer, T extends java.lang.String>()"; + expResult = "new HashMap<Jtimer, T extends String>()"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<O>"; + expResult = "Class<O>"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "2.0"; + expResult = "2.0"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "\"eric.chatellier\""; + expResult = "\"eric.chatellier\""; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T extends org.nuiton.topia.TopiaEntity, D extends org.nuiton.topia.TopiaDAO<? super T>> D"; + expResult = "D"; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Object..."; + expResult = "Object..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.lang.Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str, true); + log.info(str + " -> " + result); + assertEquals(expResult, result); + } + + + /** + * Test of removeGenericDefinition method, of class GeneratorUtil. + */ + @Test + public void testRemoveGenericDefinition() { + log.info("removeGenericDefinition"); + + String str = "List"; + String expResult = "List"; + String result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.Regex"; + expResult = "java.util.Regex"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T> java.util.List<T>"; + expResult = "java.util.List<T>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + + str = " <T> java.util.List<T> "; + expResult = "java.util.List<T>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + + str = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + expResult = "java.util.List<? extends org.chorem.bonzoms.Bonzoms>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.util.List<org.chorem.jtimer.Jtimer>"; + expResult = "java.util.List<org.chorem.jtimer.Jtimer>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<O>"; + expResult = "Class<O>"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "2.0"; + expResult = "2.0"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "\"eric.chatellier\""; + expResult = "\"eric.chatellier\""; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "<T extends org.nuiton.topia.TopiaEntity, D extends org.nuiton.topia.TopiaDAO<? super T>> D"; + expResult = "D"; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Object..."; + expResult = "Object..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.lang.Class<A>..."; + expResult = "java.lang.Class<A>..."; + result = GeneratorUtil.removeGenericDefinition(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + } + + @Test public void testGetTypesList() { String str = "List"; Set<String> results = GeneratorUtil.getTypesList(str);

1 0

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

23 Nov '10

Author: tchemit Date: 2010-11-23 17:49:52 +0100 (Tue, 23 Nov 2010) New Revision: 998 Url: http://nuiton.org/repositories/revision/eugene/998 Log: Anomalie #1092: Annotations not generated on attributes Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-11-22 14:09:37 UTC (rev 997) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-11-23 16:49:52 UTC (rev 998) @@ -389,12 +389,7 @@ }*/ } -// String annotation = attr.getTagValue(TAG_ANNOTATION); -// if (annotation != null && annotation.length() > 0) { -///* <%=annotation%> -//*/ -// } - + generateAnnotations(output, clazz, attr); String attrName = attr.getName(); String attrVisibility = attr.getVisibility(); String attrType = GeneratorUtil.getSimpleName(attr.getType());

1 0

r997 - trunk
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 15:09:37 +0100 (Mon, 22 Nov 2010) New Revision: 997 Url: http://nuiton.org/repositories/revision/eugene/997 Log: use i18n 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:29:35 UTC (rev 996) +++ trunk/pom.xml 2010-11-22 14:09:37 UTC (rev 997) @@ -380,7 +380,7 @@ <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion>  <locales>en,fr</locales>

1 0

r996 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:29:35 +0100 (Sun, 21 Nov 2010) New Revision: 996 Url: http://nuiton.org/repositories/revision/eugene/996 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 10:05:46 UTC (rev 995) +++ trunk/pom.xml 2010-11-21 14:29:35 UTC (rev 996) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>eugene</artifactId>

1 0

r995 - trunk
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 11:05:46 +0100 (Fri, 19 Nov 2010) New Revision: 995 Url: http://nuiton.org/repositories/revision/eugene/995 Log: clean versions in pom + remove Stephane Chorlet from codelutin organization Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 07:48:45 UTC (rev 994) +++ trunk/pom.xml 2010-11-19 10:05:46 UTC (rev 995) @@ -341,8 +341,6 @@ <developer> <name>Stéphane Chorlet</name> <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> <role>developer</role> @@ -382,11 +380,9 @@  <projectId>eugene</projectId> - <antVersion>1.8.0</antVersion> <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> -   <locales>en,fr</locales> @@ -415,7 +411,6 @@ <version>${processorPluginVersion}</version> </plugin> - <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId>

1 0

r994 - in trunk: ant-eugene-task/src/license eugene/src/license maven-eugene-plugin/src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 08:48:45 +0100 (Fri, 19 Nov 2010) New Revision: 994 Url: http://nuiton.org/repositories/revision/eugene/994 Log: use new thrid-partys missing files (maven-license-plugin 3.0) Modified: trunk/ant-eugene-task/src/license/THIRD-PARTY.properties trunk/eugene/src/license/THIRD-PARTY.properties trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties Modified: trunk/ant-eugene-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,43 +1,21 @@ -### -# #%L -# EUGene :: Ant task -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 +# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:19:52 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.apache.ant--ant--1.8.0=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:28:07 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant--1.8.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/eugene/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/eugene/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,18 +1,20 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 +# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 09:01:58 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:26:28 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,22 +1,24 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD +# - BSD License # - Common Public License Version 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:22:18 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:29:01 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0

1 0

r993 - trunk
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 22:36:37 +0100 (Thu, 18 Nov 2010) New Revision: 993 Url: http://nuiton.org/repositories/revision/eugene/993 Log: use mavenpom 2.4.1-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 15:10:17 UTC (rev 992) +++ trunk/pom.xml 2010-11-18 21:36:37 UTC (rev 993) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> @@ -420,10 +420,6 @@ <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> <configuration> -  - <excludes> - <exclude>**/THIRD-PARTY.properties</exclude> - </excludes> <extraExtensions> <objectmodel>xml</objectmodel> <xsl>xml</xsl>

1 0

r992 - trunk
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 16:10:17 +0100 (Thu, 18 Nov 2010) New Revision: 992 Url: http://nuiton.org/repositories/revision/eugene/992 Log: Evolution #1067: Updates nuiton-utils to 1.5.2 + reuse mavenpom default libs versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 15:08:25 UTC (rev 991) +++ trunk/pom.xml 2010-11-18 15:10:17 UTC (rev 992) @@ -58,6 +58,13 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>2.0</version> @@ -79,33 +86,9 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - - <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.8.0</version> + <version>${antVersion}</version> <scope>provided</scope> </dependency> @@ -283,7 +266,7 @@ <version>1.5.15</version> </dependency> - <dependency> +  </dependencies> </dependencyManagement> @@ -399,10 +382,11 @@  <projectId>eugene</projectId> - <ant.version>1.8.0</ant.version> + <antVersion>1.8.0</antVersion> <processorPluginVersion>1.0.4</processorPluginVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <mavenVersion>2.2.1</mavenVersion> + <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> +   <locales>en,fr</locales>

1 0