- Wikitty-devel - mailman.cloud.codelutin.com

Evolution de WikittyService et utilisation dans les projets
by Benjamin POUSSIN 27 May '10

27 May '10

Salut, Voici les evolutions que je prévois: - Conversion de AbstractWikittyService en WikittyServiceImpl * les 3 methodes get(Storage,SearchEngin,ExtStorage) qui sont actuellements abstraires sont implantées et retournent des objets qui sont passé en paramètre du constructeur. * suppression des (JDBC|JPA|...)WikittyService puisque maintenant ils ne servent plus. Il faut simplement instancier le Impl avec les bons paramètres - Ajout de cache * création d'un classe WikittyCache qui servira d'abstraction au choix technique de cache (maison, jboss, ehcache, ...) * Création d'une sous classe à WikittyServiceImpl: WikittyServiceCached qui surcharge les opérations qui peuvent/doivent être cachées * création d'une sous classe à WikittyProxy: WikittyProxyCached qui surcharge les opérations qui peuvent/doivent être cachées * Les classes WikittyProxy* sont paramètres par <WS extends WikittyService> et on a une méthode getWikittyService(): WS - Utilisation pour les projets * soit on utilise directement WikittyProxyCached, car on a pas besoin de méthode supplémentaire dans le service * soit on étend l'interface WikittyService pour ajouter des méthodes dont on a besoin pour le projet. + on implante cette interface en étendant WikittyServiceCached + on étend WikittyProxyCached pour supporter les nouvelles opérations métier et la nouvelle classe proxy force le typage de la classe avec le bon WikittyService -- Benjamin -------------------- tél: +33 (0) 2 40 50 29 28 email: poussin(a)codelutin.com () campagne du ruban ascii http://www.codelutin.com /\ pour les mails en ascii

2 1

Facetisations+triage
by Brossaud Benoît 26 May '10

26 May '10

Bonjour, Voici la configuration dans laquelle je suis: J'ai un objet qui a comme champs ou plutot attributs: - List<String> toto - et des autres Facetisation: Est-il possible de facetiser sur toto? Et si oui comment utiliser les FacetTopics par la suite? Triage: Est-il possible de faire un eq sur toto en passant une list. Genre eq(FQ_FIELD_toto, List<string>). Si oui va-t-il comparer strictement les deux listes, ou va t-il "regarder" si toto contient les elements de la list passee? Merci par avance, Benoit

2 1

Re: [Wikitty-devel] [Wikitty-commits] r54 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by Tony Chemit 17 May '10

17 May '10

Yo, Petites questions innocentes : 1) tu utilise les tranformer ? 2) tu as vu les évolution d'eugene ? Car il serait bien qu'on commence à mutualiser un peu les templates. Plutôt que de continuer a écrire des Générators inmaintenables... Le Mon, 17 May 2010 10:38:51 +0200 (CEST), echatellier(a)users.nuiton.org a écrit : > Author: echatellier > Date: 2010-05-17 10:38:51 +0200 (Mon, 17 May 2010) > New Revision: 54 > > Url: http://nuiton.org/repositories/revision/wikitty/54 > > Log: > Add interface/abstract/impl generation. > Add property change support. > > Added: > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java > Removed: > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java > Modified: > trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java > trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java > trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java > trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java > > Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java > =================================================================== > --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -17,6 +17,7 @@ > > package org.nuiton.wikitty; > > +import java.beans.PropertyChangeListener; > import java.io.Serializable; > import java.util.Collection; > > @@ -77,5 +78,35 @@ > * @return > */ > public FieldType getFieldType(String ext, String fieldName); > + > + /** > + * Ajoute un listener gloable > + * > + * @param listener le listener à ajouter > + */ > + void addPropertyChangeListener(PropertyChangeListener listener); > > + /** > + * Supprime un listener globable. > + * > + * @param listener le listener à supprimer > + */ > + void removePropertyChangeListener(PropertyChangeListener listener); > + > + /** > + * Ajoute un listener sur la propriété {@code propertyName} > + * > + * @param propertyName le nom de la propriété > + * @param listener le listener à ajouter > + */ > + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); > + > + /** > + * Supprime un listener sur la propriété {@code propertyName} > + * > + * @param propertyName le nom de la propriété > + * @param listener le listener à supprimer > + */ > + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); > + > } > > Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java > =================================================================== > --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -17,6 +17,8 @@ > > package org.nuiton.wikitty; > > +import java.beans.PropertyChangeListener; > +import java.beans.PropertyChangeSupport; > import java.util.Collection; > import java.util.HashMap; > import java.util.LinkedHashMap; > @@ -32,8 +34,11 @@ > */ > public class BusinessEntityBean implements BusinessEntity { > > - private static final long serialVersionUID = 1L; > + /** serialVersionUID. */ > + private static final long serialVersionUID = 5245199905431320116L; > > + protected transient PropertyChangeSupport propertyChangeSupport; > + > protected String id; > protected String version; > > @@ -89,4 +94,37 @@ > throw new UnsupportedOperationException("Not supported yet."); > } > > + /* > + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) > + */ > + @Override > + public void addPropertyChangeListener(PropertyChangeListener listener) { > + propertyChangeSupport.addPropertyChangeListener(listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) > + */ > + @Override > + public void removePropertyChangeListener(PropertyChangeListener listener) { > + propertyChangeSupport.removePropertyChangeListener(listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) > + */ > + @Override > + public void addPropertyChangeListener(String propertyName, > + PropertyChangeListener listener) { > + propertyChangeSupport.addPropertyChangeListener(propertyName, listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) > + */ > + @Override > + public void removePropertyChangeListener(String propertyName, > + PropertyChangeListener listener) { > + propertyChangeSupport.removePropertyChangeListener(propertyName, listener); > + } > } > > Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java > =================================================================== > --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -17,6 +17,8 @@ > > package org.nuiton.wikitty; > > +import java.beans.PropertyChangeListener; > +import java.beans.PropertyChangeSupport; > import java.util.Collection; > import java.util.Collections; > > @@ -32,16 +34,20 @@ > */ > public class BusinessEntityWikitty implements BusinessEntity { > > - private static final long serialVersionUID = 1L; > + /** serialVersionUID. */ > + private static final long serialVersionUID = -4399752739887114180L; > > + protected transient PropertyChangeSupport propertyChangeSupport; > + > protected Wikitty wikitty; > > public BusinessEntityWikitty(Wikitty wi) { > + propertyChangeSupport = new PropertyChangeSupport(this); > setWikitty(wi); > } > > public BusinessEntityWikitty() { > - setWikitty(new Wikitty()); > + this(new Wikitty()); > } > > public String getWikittyId() { > @@ -98,4 +104,38 @@ > public Collection<WikittyExtension> getStaticExtensions() { > return Collections.emptyList(); > } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) > + */ > + @Override > + public void addPropertyChangeListener(PropertyChangeListener listener) { > + propertyChangeSupport.addPropertyChangeListener(listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) > + */ > + @Override > + public void removePropertyChangeListener(PropertyChangeListener listener) { > + propertyChangeSupport.removePropertyChangeListener(listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) > + */ > + @Override > + public void addPropertyChangeListener(String propertyName, > + PropertyChangeListener listener) { > + propertyChangeSupport.addPropertyChangeListener(propertyName, listener); > + } > + > + /* > + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) > + */ > + @Override > + public void removePropertyChangeListener(String propertyName, > + PropertyChangeListener listener) { > + propertyChangeSupport.removePropertyChangeListener(propertyName, listener); > + } > } > > Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java (rev 0) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -0,0 +1,445 @@ > +package org.nuiton.wikitty.generator; > + > +import java.io.File; > +import java.io.IOException; > +import java.io.Writer; > +import java.util.ArrayList; > +import java.util.Collection; > +import java.util.Collections; > +import java.util.HashSet; > +import java.util.List; > +import java.util.Set; > + > +import java.util.regex.Matcher; > +import java.util.regex.Pattern; > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import org.nuiton.eugene.GeneratorUtil; > +import org.nuiton.eugene.models.object.ObjectModelAttribute; > +import org.nuiton.eugene.models.object.ObjectModelClass; > + > +/** > + * Possible enhancement: > + * - generateParentMethod can generate attribut method access that call > + * the same method on parent instance class. For that we must have one attribut > + * instance by parent. This attribut we must be created in setWikitty method > + * and used same wikitty object. > + * > + * @author poussin > + */ > +public class BusinessEntityAbstractGenerator extends WikengoCommonGenerator { > + > + private static final Log log = LogFactory.getLog(BusinessEntityAbstractGenerator.class); > + > + static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); > + > + protected String EXT_NAME; > + > + @Override > + public String getFilenameForClass(ObjectModelClass clazz) { > + String fqn = clazz.getQualifiedName(); > + log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); > + return fqn.replace('.', File.separatorChar) + "Abstract.java"; > + } > + > + public void generateFromClass(Writer output, ObjectModelClass clazz) > + throws IOException { > + if (!EugengoUtils.isBusinessEntity(clazz)) { > + log.info( clazz.getName() + " is not a business entity"); > + return; > + } > + > + log.info("Generate Business entity abstract" + clazz.getName() + "... "); > + generateCopyright(output); > + > + EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); > + > + String packageName = clazz.getPackageName(); > + String name = clazz.getName() + "Abstract"; > +/*{package <%=packageName%>; > + > +}*/ > + ObjectModelClass superClass = findSuperClass(clazz); > + > + clearImports(); > + addImport(clazz); > + addImport(superClass); > + addImport("org.nuiton.wikitty.WikittyUtil"); > + addImport("org.nuiton.wikitty.Wikitty"); > + addImport("org.nuiton.wikitty.BusinessEntityWikitty"); > + addImport("org.nuiton.wikitty.WikittyExtension"); > + addImport(Collection.class); > + addImport(Collections.class); > + addImport(List.class); > + addImport(ArrayList.class); > + String parentImpl = null; > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + addImport(parent); > + parentImpl = parent.getQualifiedName() + "Impl"; > + addImport( parentImpl ); > + } > + } > + lookForAttributeImports(clazz); > + generateImports(output, packageName); > + > + generateClazzDocumentation(output, clazz); > + String extendsString = " extends " + ( parentImpl != null ? parentImpl : getType("org.nuiton.wikitty.BusinessEntityWikitty") ); > + > + String implementsString = "implements " + getType(clazz.getQualifiedName()); > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + implementsString += ", " + getType(parent.getQualifiedName()); > + } > + } > + > +/*{public abstract class <%=name%><%=extendsString%> <%=implementsString%> { > + > +}*/ > + > + String svUID = GeneratorUtil.computeSerialVersionUID(clazz); > +/*{ private static final long serialVersionUID = <%=svUID%>; > + > +}*/ > + > + generateWikittyExtension(output, clazz); > + > + generateStaticAttributes(output, clazz); > + > +/*{ > + public <%=name%>() { > + super(); > + } > + > + public <%=name%>(BusinessEntityWikitty wi) { > + super(wi.getWikitty()); > + } > + > + public <%=name%>(Wikitty wi) { > + super(wi); > + } > + > +}*/ > + > + generateAttributeAccessMethod(output, clazz); > + > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + generateParentMethod(output, parent); > + } > + } > + > +/*{ @Override > + public Collection<WikittyExtension> getStaticExtensions() { > + return extensions; > + } > + > + > +} //<%=name%> > +}*/ > + > + } > + > + > + > + // Utilitarian methods > + > + public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { > + for (ObjectModelAttribute attr : clazz.getAttributes()) { > + if (attr.isNavigable() && !attr.isStatic() > + && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { > + if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { > + //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! > + generateCollectionAttributeAccessors(output, attr); > + } else { > + generateWikittyAttributeAccessors(output, attr); > + } > + } > + } > + } > + > + private void generateWikittyExtension(Writer output, > + ObjectModelClass clazz) throws IOException { > + String version = clazz.getTagValue("version"); > + > + // Since wikitty 1.3, version need to be dotted > + if ( version == null ) { > + version = "1.0"; > + } > + > + // get requires from parent > + String requires = null; > + String separator = ""; > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + String parentExtName = "EXT_" + parent.getName().toUpperCase(); > + > + if (requires == null) { > + requires = ""; > + } > + > + requires += separator + parent.getName() + "." + parentExtName; > + // dans le cas où on aurait un heritage multiple :) > + // FIXME EC-20100420 gerer les extensions multiples > + separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; > + } > + } > + > +/*{ static final protected List<WikittyExtension> extensions; > + static final public WikittyExtension extension<%=clazz.getName()%> = > + new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, > + WikittyUtil.buildFieldMapExtension(}*/ > + > + separator = ""; > + for (ObjectModelAttribute attr : clazz.getAttributes()) { > + if (attr.isNavigable() && !attr.isStatic() && > + (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { > +/*{<%=separator%> > + }*/ > + generateAttribute(output, attr); > + separator = ","; > + } > + } > +/*{)); > + static { > + ArrayList<WikittyExtension> exts = new ArrayList<WikittyExtension>(); > +}*/ > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > +/*{ > + exts.addAll(<%=parent.getName()%>Abstract.extensions); > +}*/ > + } > + } > +/*{ > + // EC-20100420 add current extension after parent ones > + // if current is loaded before required extension > + // load failed because required extension is missing > + exts.add(extension<%=clazz.getName()%>); > + > + extensions = Collections.unmodifiableList(exts); > + } > +}*/ > + } > + > + private void generateAttribute(Writer output, ObjectModelAttribute attr) > + throws IOException { > + String attrType = computeType(attr); > + if (EugengoUtils.notEmpty(attrType)) { > + attrType = getType(attrType); > + } else { > + return; > + } > + > + String attrName = attr.getName(); > + String card = ""; > + > + //TODO ymartel 20090812: a better way to manage those DataTypes in the model? > + if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { > + card = "[0-*]"; > + // List<String> > + Matcher match = extractTypeOnCollection.matcher(attrType); > + if (match.matches()) { > + attrType = match.group(1); > + } > + } > + > + if (!commonTypes.contains(attrType)) { > + attrType = "Wikitty"; > + } else if(commonNumerics.contains(attrType)) { > + attrType = "Numeric"; > + } else if(commonStrings.contains(attrType)) { > + attrType = "String"; > + } > + > + > + int maxMultiplicity = attr.getMaxMultiplicity(); > + if ((maxMultiplicity != 0 && maxMultiplicity != 1)){ > + card = "[" + attr.getMinMultiplicity() + "-"; > + if (maxMultiplicity == -1) { > + card += "*]"; > + } else { > + card += maxMultiplicity + "]"; > + } > + } > + > + // FIXME EC-20100420 attr.isUnique() always return true for > + // attributes (maybe use tagValue instead) > + String unique = attr.isUnique() ? " unique" : ""; > + > + String tagValues = ""; > + if ("designation".equals(attr.getName())) { > + System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); > + } > + for (String tag : attr.getTagValues().keySet()) { > + String value = attr.getTagValue(tag); > + tagValues += " " + tag + "=" + value; > + } > + > +/*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/ > + } > + > + private void generateParentMethod(Writer output, > + ObjectModelClass clazz) throws IOException { > + > + // we must generate method for parent of parent > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + generateParentMethod(output, parent); > + } > + } > + > + // generate method acces for parent attribut > + generateAttributeAccessMethod(output, clazz); > + } > + > + protected void generateWikittyAttributeAccessors(Writer output, > + ObjectModelAttribute attr) throws IOException { > + > + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); > + > + String attrType = computeType(attr); > + if (EugengoUtils.notEmpty(attrType)) { > + attrType = getType(attrType, true); > + } else { > + return; > + } > + > + // FIXME EC-20100421 cette methode peut retourner List<String> > + // et generer la methode getWikitty().getFieldAsList<String>() > + // qui ne peut pas compiler > + String methodAccessName = getFieldAccessMethodName(attr); > + > + String attrName = attr.getName(); > + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); > + > +/*{ > + public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { > + Object oldValue = getField(<%=EXT_NAME%>, "<%=attrName%>"); > + getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); > + propertyChangeSupport.firePropertyChange("<%=attrName%>", oldValue, <%=attrName%>); > + } > + > + public <%=attrType%> get<%=attrNameCapitalized%>() { > + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); > + return result; > + } > + > +}*/ > + } > + > + /** > + * Give the string to put after getFieldAs???, only some type is accepted > + * and we must convert BusinessEntity to Wikitty string > + * @param type > + * @return > + */ > + protected String getFieldAccessMethodName(ObjectModelAttribute attr) { > + String result = computeType(attr); > + result = getType(result, true); > + > + boolean isCollection = (attr.getMaxMultiplicity() != 0 > + && attr.getMaxMultiplicity() != 1); > + if (isCollection) { > + if (attr.isUnique()) { > + result = "Set"; > + } else { > + result = "List"; > + } > + } else { > + // test for Date > + if ("java.util.Date".equals(result) || "Date".equals(result)) { > + result = "Date"; > + } else if (getModel().hasClass(result)) { // test for Wikitty object > + ObjectModelClass fieldClass = getModel().getClass(result); > + if (EugengoUtils.isBusinessEntity(fieldClass)) { > + // for wikittyDto we use String for Id > + result = "Wikitty"; > + } > + } else if (null != getModel().getEnumeration(result)) { > + result = "String"; > + } > + } > + result = EugengoUtils.toUpperCaseFirstLetter(result); > + > + return result; > + } > + > + protected void generateCollectionAttributeAccessors(Writer output, > + ObjectModelAttribute attr) throws IOException { > + > + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); > + > + String attrType = computeType(attr); > + if (EugengoUtils.notEmpty(attrType)) { > + attrType = getType(attrType, true); > + } else { > + return; > + } > + > + // get collection element type for add and remove method arguement type > + String elementType = getType(attr.getType(), true); > + > + String methodAccessName = getFieldAccessMethodName(attr); > + > + String attrName = attr.getName(); > + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); > +/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { > + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); > + return result; > + } > + > + public void add<%=attrNameCapitalized%>(<%=elementType%> element) { > + getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); > + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); > + } > + > + public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { > + getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); > + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); > + } > + > + public void clear<%=attrNameCapitalized%>() { > + getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); > + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); > + } > + > +}*/ > + } > + > + private static Set<String> commonNumerics; > + static { > + commonNumerics = new HashSet<String>(); > + commonNumerics.add("byte"); > + commonNumerics.add("Byte"); > + commonNumerics.add("short"); > + commonNumerics.add("Short"); > + commonNumerics.add("int"); > + commonNumerics.add("Integer"); > + commonNumerics.add("long"); > + commonNumerics.add("Long"); > + commonNumerics.add("float"); > + commonNumerics.add("Float"); > + commonNumerics.add("double"); > + commonNumerics.add("Double"); > + } > + > + private static Set<String> commonStrings; > + static { > + commonStrings = new HashSet<String>(); > + commonStrings.add("char"); > + commonStrings.add("Char"); > + commonStrings.add("String"); > + } > + > + private static Set<String> commonTypes; > + static { > + commonTypes = new HashSet<String>(); > + commonTypes.addAll(commonNumerics); > + commonTypes.addAll(commonStrings); > + commonTypes.add("boolean"); > + commonTypes.add("Boolean"); > + commonTypes.add("Date"); > + } > + > +} > > > Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java > ___________________________________________________________________ > Added: svn:keywords > + Author Date Id Revision HeadURL > > Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -24,10 +24,7 @@ > * Generate pure Bean Object (no wikitty object internaly stored) > * > * @author poussin > - * > - * @deprecated since 2.0 will be removed soon > */ > -@Deprecated > public class BusinessEntityBeanGenerator extends WikengoCommonGenerator { > > private static final Log log = LogFactory.getLog(BusinessEntityBeanGenerator.class); > @@ -88,7 +85,9 @@ > generateClazzDocumentation(output, clazz); > String extendsString = " extends " + ( parentBean != null ? parentBean : getType("org.nuiton.wikitty.BusinessEntityBean") ); > String abstractString = ""; > - if (clazz.isAbstract()) { > + > + // Temp fix, if operation, set it as abstract > + if (clazz.isAbstract() || !clazz.getOperations().isEmpty()) { > abstractString += "abstract "; > } > > @@ -99,11 +98,7 @@ > } > } > > -/*{/** > - * @deprecated since 2.0 will be removed soon > - *) > -@Deprecated > -public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { > +/*{public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { > > }*/ > > > Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -1,444 +0,0 @@ > -package org.nuiton.wikitty.generator; > - > -import java.io.File; > -import java.io.IOException; > -import java.io.Writer; > -import java.util.ArrayList; > -import java.util.Collection; > -import java.util.Collections; > -import java.util.HashSet; > -import java.util.List; > -import java.util.Set; > - > -import java.util.regex.Matcher; > -import java.util.regex.Pattern; > -import org.apache.commons.logging.Log; > -import org.apache.commons.logging.LogFactory; > -import org.nuiton.eugene.GeneratorUtil; > -import org.nuiton.eugene.models.object.ObjectModelAttribute; > -import org.nuiton.eugene.models.object.ObjectModelClass; > - > -/** > - * Possible enhancement: > - * - generateParentMethod can generate attribut method access that call > - * the same method on parent instance class. For that we must have one attribut > - * instance by parent. This attribut we must be created in setWikitty method > - * and used same wikitty object. > - * > - * @author poussin > - */ > -public class BusinessEntityGenerator extends WikengoCommonGenerator { > - > - private static final Log log = LogFactory.getLog(BusinessEntityGenerator.class); > - > - static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); > - > - protected String EXT_NAME; > - > - @Override > - public String getFilenameForClass(ObjectModelClass clazz) { > - String fqn = clazz.getQualifiedName(); > - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); > - return fqn.replace('.', File.separatorChar) + "Impl.java"; > - } > - > - public void generateFromClass(Writer output, ObjectModelClass clazz) > - throws IOException { > - if (!EugengoUtils.isBusinessEntity(clazz)) { > - log.info( clazz.getName() + " is not a business entity"); > - return; > - } > - > - log.info("Generate Business entity " + clazz.getName() + "... "); > - generateCopyright(output); > - > - EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); > - > - String packageName = clazz.getPackageName(); > - String name = clazz.getName() + "Impl"; > -/*{package <%=packageName%>; > - > -}*/ > - ObjectModelClass superClass = findSuperClass(clazz); > - > - clearImports(); > - addImport(clazz); > - addImport(superClass); > - addImport("org.nuiton.wikitty.WikittyUtil"); > - addImport("org.nuiton.wikitty.Wikitty"); > - addImport("org.nuiton.wikitty.BusinessEntityWikitty"); > - addImport("org.nuiton.wikitty.WikittyExtension"); > - addImport(Collection.class); > - addImport(Collections.class); > - addImport(List.class); > - addImport(ArrayList.class); > - String parentImpl = null; > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > - addImport(parent); > - parentImpl = parent.getQualifiedName() + "Impl"; > - addImport( parentImpl ); > - } > - } > - lookForAttributeImports(clazz); > - generateImports(output, packageName); > - > - generateClazzDocumentation(output, clazz); > - String extendsString = " extends " + ( parentImpl != null ? parentImpl : getType("org.nuiton.wikitty.BusinessEntityWikitty") ); > - String abstractString = ""; > - if (clazz.isAbstract()) { > - abstractString += "abstract "; > - } > - > - String implementsString = "implements " + getType(clazz.getQualifiedName()); > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > - implementsString += ", " + getType(parent.getQualifiedName()); > - } > - } > - > -/*{public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { > - > -}*/ > - > - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); > -/*{ private static final long serialVersionUID = <%=svUID%>; > - > -}*/ > - > - generateWikittyExtension(output, clazz); > - > - generateStaticAttributes(output, clazz); > - > -/*{ > - public <%=name%>() { > - super(); > - } > - > - public <%=name%>(BusinessEntityWikitty wi) { > - super(wi.getWikitty()); > - } > - > - public <%=name%>(Wikitty wi) { > - super(wi); > - } > - > -}*/ > - > - generateAttributeAccessMethod(output, clazz); > - > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > - generateParentMethod(output, parent); > - } > - } > - > -/*{ @Override > - public Collection<WikittyExtension> getStaticExtensions() { > - return extensions; > - } > - > - > -} //<%=name%> > -}*/ > - > - } > - > - > - > - // Utilitarian methods > - > - public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { > - for (ObjectModelAttribute attr : clazz.getAttributes()) { > - if (attr.isNavigable() && !attr.isStatic() > - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { > - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { > - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! > - generateCollectionAttributeAccessors(output, attr); > - } else { > - generateWikittyAttributeAccessors(output, attr); > - } > - } > - } > - } > - > - private void generateWikittyExtension(Writer output, > - ObjectModelClass clazz) throws IOException { > - String version = clazz.getTagValue("version"); > - > - // Since wikitty 1.3, version need to be dotted > - if ( version == null ) { > - version = "1.0"; > - } > - > - // get requires from parent > - String requires = null; > - String separator = ""; > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > - String parentExtName = "EXT_" + parent.getName().toUpperCase(); > - > - if (requires == null) { > - requires = ""; > - } > - > - requires += separator + parent.getName() + "." + parentExtName; > - // dans le cas où on aurait un heritage multiple :) > - // FIXME EC-20100420 gerer les extensions multiples > - separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; > - } > - } > - > -/*{ static final protected List<WikittyExtension> extensions; > - static final public WikittyExtension extension<%=clazz.getName()%> = > - new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, > - WikittyUtil.buildFieldMapExtension(}*/ > - > - separator = ""; > - for (ObjectModelAttribute attr : clazz.getAttributes()) { > - if (attr.isNavigable() && !attr.isStatic() && > - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { > -/*{<%=separator%> > - }*/ > - generateAttribute(output, attr); > - separator = ","; > - } > - } > -/*{)); > - static { > - ArrayList<WikittyExtension> exts = new ArrayList<WikittyExtension>(); > -}*/ > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > -/*{ > - exts.addAll(<%=parent.getName()%>Impl.extensions); > -}*/ > - } > - } > -/*{ > - // EC-20100420 add current extension after parent ones > - // if current is loaded before required extension > - // load failed because required extension is missing > - exts.add(extension<%=clazz.getName()%>); > - > - extensions = Collections.unmodifiableList(exts); > - } > -}*/ > - } > - > - private void generateAttribute(Writer output, ObjectModelAttribute attr) > - throws IOException { > - String attrType = computeType(attr); > - if (EugengoUtils.notEmpty(attrType)) { > - attrType = getType(attrType); > - } else { > - return; > - } > - > - String attrName = attr.getName(); > - String card = ""; > - > - //TODO ymartel 20090812: a better way to manage those DataTypes in the model? > - if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { > - card = "[0-*]"; > - // List<String> > - Matcher match = extractTypeOnCollection.matcher(attrType); > - if (match.matches()) { > - attrType = match.group(1); > - } > - } > - > - if (!commonTypes.contains(attrType)) { > - attrType = "Wikitty"; > - } else if(commonNumerics.contains(attrType)) { > - attrType = "Numeric"; > - } else if(commonStrings.contains(attrType)) { > - attrType = "String"; > - } > - > - > - int maxMultiplicity = attr.getMaxMultiplicity(); > - if ((maxMultiplicity != 0 && maxMultiplicity != 1)){ > - card = "[" + attr.getMinMultiplicity() + "-"; > - if (maxMultiplicity == -1) { > - card += "*]"; > - } else { > - card += maxMultiplicity + "]"; > - } > - } > - > - // FIXME EC-20100420 attr.isUnique() always return true for > - // attributes (maybe use tagValue instead) > - String unique = attr.isUnique() ? " unique" : ""; > - > - String tagValues = ""; > - if ("designation".equals(attr.getName())) { > - System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); > - } > - for (String tag : attr.getTagValues().keySet()) { > - String value = attr.getTagValue(tag); > - tagValues += " " + tag + "=" + value; > - } > - > -/*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/ > - } > - > - private void generateParentMethod(Writer output, > - ObjectModelClass clazz) throws IOException { > - > - // we must generate method for parent of parent > - for (ObjectModelClass parent : clazz.getSuperclasses()) { > - if (EugengoUtils.isBusinessEntity(parent)) { > - generateParentMethod(output, parent); > - } > - } > - > - // generate method acces for parent attribut > - generateAttributeAccessMethod(output, clazz); > - } > - > - protected void generateWikittyAttributeAccessors(Writer output, > - ObjectModelAttribute attr) throws IOException { > - > - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); > - > - String attrType = computeType(attr); > - if (EugengoUtils.notEmpty(attrType)) { > - attrType = getType(attrType, true); > - } else { > - return; > - } > - > - // FIXME EC-20100421 cette methode peut retourner List<String> > - // et generer la methode getWikitty().getFieldAsList<String>() > - // qui ne peut pas compiler > - String methodAccessName = getFieldAccessMethodName(attr); > - > - String attrName = attr.getName(); > - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); > - > -/*{ > - public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { > - getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); > - } > - > - public <%=attrType%> get<%=attrNameCapitalized%>() { > - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); > - return result; > - } > - > -}*/ > - } > - > - /** > - * Give the string to put after getFieldAs???, only some type is accepted > - * and we must convert BusinessEntity to Wikitty string > - * @param type > - * @return > - */ > - protected String getFieldAccessMethodName(ObjectModelAttribute attr) { > - String result = computeType(attr); > - result = getType(result, true); > - > - boolean isCollection = (attr.getMaxMultiplicity() != 0 > - && attr.getMaxMultiplicity() != 1); > - if (isCollection) { > - if (attr.isUnique()) { > - result = "Set"; > - } else { > - result = "List"; > - } > - } else { > - // test for Date > - if ("java.util.Date".equals(result) || "Date".equals(result)) { > - result = "Date"; > - } else if (getModel().hasClass(result)) { // test for Wikitty object > - ObjectModelClass fieldClass = getModel().getClass(result); > - if (EugengoUtils.isBusinessEntity(fieldClass)) { > - // for wikittyDto we use String for Id > - result = "Wikitty"; > - } > - } else if (null != getModel().getEnumeration(result)) { > - result = "String"; > - } > - } > - result = EugengoUtils.toUpperCaseFirstLetter(result); > - > - return result; > - } > - > - protected void generateCollectionAttributeAccessors(Writer output, > - ObjectModelAttribute attr) throws IOException { > - > - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); > - > - String attrType = computeType(attr); > - if (EugengoUtils.notEmpty(attrType)) { > - attrType = getType(attrType, true); > - } else { > - return; > - } > - > - // get collection element type for add and remove method arguement type > - String elementType = getType(attr.getType(), true); > - > - String methodAccessName = getFieldAccessMethodName(attr); > - > - String attrName = attr.getName(); > - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); > -/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { > - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); > - return result; > - } > - > - public void add<%=attrNameCapitalized%>(<%=elementType%> element) { > - getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); > - } > - > - public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { > - getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); > - } > - > - public void clear<%=attrNameCapitalized%>() { > - getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); > - } > - > -}*/ > - } > - > - private static Set<String> commonNumerics; > - static { > - commonNumerics = new HashSet<String>(); > - commonNumerics.add("byte"); > - commonNumerics.add("Byte"); > - commonNumerics.add("short"); > - commonNumerics.add("Short"); > - commonNumerics.add("int"); > - commonNumerics.add("Integer"); > - commonNumerics.add("long"); > - commonNumerics.add("Long"); > - commonNumerics.add("float"); > - commonNumerics.add("Float"); > - commonNumerics.add("double"); > - commonNumerics.add("Double"); > - } > - > - private static Set<String> commonStrings; > - static { > - commonStrings = new HashSet<String>(); > - commonStrings.add("char"); > - commonStrings.add("Char"); > - commonStrings.add("String"); > - } > - > - private static Set<String> commonTypes; > - static { > - commonTypes = new HashSet<String>(); > - commonTypes.addAll(commonNumerics); > - commonTypes.addAll(commonStrings); > - commonTypes.add("boolean"); > - commonTypes.add("Boolean"); > - commonTypes.add("Date"); > - } > - > -} > > Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java (rev 0) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -0,0 +1,150 @@ > +package org.nuiton.wikitty.generator; > + > +import java.io.File; > +import java.io.IOException; > +import java.io.Writer; > +import java.util.ArrayList; > +import java.util.Collection; > +import java.util.Collections; > +import java.util.HashSet; > +import java.util.List; > +import java.util.Set; > + > +import java.util.regex.Matcher; > +import java.util.regex.Pattern; > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import org.nuiton.eugene.GeneratorUtil; > +import org.nuiton.eugene.models.object.ObjectModelAttribute; > +import org.nuiton.eugene.models.object.ObjectModelClass; > + > +/** > + * Possible enhancement: > + * - generateParentMethod can generate attribut method access that call > + * the same method on parent instance class. For that we must have one attribut > + * instance by parent. This attribut we must be created in setWikitty method > + * and used same wikitty object. > + * > + * @author poussin > + */ > +public class BusinessEntityImplGenerator extends WikengoCommonGenerator { > + > + private static final Log log = LogFactory.getLog(BusinessEntityImplGenerator.class); > + > + @Override > + public String getFilenameForClass(ObjectModelClass clazz) { > + String fqn = clazz.getQualifiedName(); > + log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); > + return fqn.replace('.', File.separatorChar) + "Impl.java"; > + } > + > + public void generateFromClass(Writer output, ObjectModelClass clazz) > + throws IOException { > + if (!EugengoUtils.isBusinessEntity(clazz)) { > + log.info( clazz.getName() + " is not a business entity"); > + return; > + } > + > + // On ne génère pas le impl si l'entité a des opérations > + if (clazz.getOperations().size() > 0) { > + return; > + } > + > + log.info("Generate Business entity impl" + clazz.getName() + "... "); > + generateCopyright(output); > + > + String packageName = clazz.getPackageName(); > + String className = clazz.getName(); > + String name = className + "Impl"; > +/*{package <%=packageName%>; > + > +}*/ > + ObjectModelClass superClass = findSuperClass(clazz); > + > + clearImports(); > + addImport(clazz); > + addImport(superClass); > + addImport("org.nuiton.wikitty.WikittyUtil"); > + addImport("org.nuiton.wikitty.Wikitty"); > + addImport("org.nuiton.wikitty.BusinessEntityWikitty"); > + addImport("org.nuiton.wikitty.WikittyExtension"); > + addImport(Collection.class); > + addImport(Collections.class); > + addImport(List.class); > + addImport(ArrayList.class); > + String parentImpl = null; > + for (ObjectModelClass parent : clazz.getSuperclasses()) { > + if (EugengoUtils.isBusinessEntity(parent)) { > + addImport(parent); > + parentImpl = parent.getQualifiedName() + "Impl"; > + addImport( parentImpl ); > + } > + } > + lookForAttributeImports(clazz); > + generateImports(output, packageName); > + > + generateClazzDocumentation(output, clazz); > + String abstractString = ""; > + if (clazz.isAbstract()) { > + abstractString += "abstract "; > + } > + > +/*{public <%=abstractString%>class <%=className%>Impl extends <%=className%>Abstract { > + > +}*/ > + > + String svUID = GeneratorUtil.computeSerialVersionUID(clazz); > +/*{ private static final long serialVersionUID = <%=svUID%>; > + > + public <%=name%>() { > + super(); > + } > + > + public <%=name%>(BusinessEntityWikitty wi) { > + super(wi.getWikitty()); > + } > + > + public <%=name%>(Wikitty wi) { > + super(wi); > + } > + > +} //<%=name%> > +}*/ > + } > + > + private static Set<String> commonNumerics; > + static { > + commonNumerics = new HashSet<String>(); > + commonNumerics.add("byte"); > + commonNumerics.add("Byte"); > + commonNumerics.add("short"); > + commonNumerics.add("Short"); > + commonNumerics.add("int"); > + commonNumerics.add("Integer"); > + commonNumerics.add("long"); > + commonNumerics.add("Long"); > + commonNumerics.add("float"); > + commonNumerics.add("Float"); > + commonNumerics.add("double"); > + commonNumerics.add("Double"); > + } > + > + private static Set<String> commonStrings; > + static { > + commonStrings = new HashSet<String>(); > + commonStrings.add("char"); > + commonStrings.add("Char"); > + commonStrings.add("String"); > + } > + > + private static Set<String> commonTypes; > + static { > + commonTypes = new HashSet<String>(); > + commonTypes.addAll(commonNumerics); > + commonTypes.addAll(commonStrings); > + commonTypes.add("boolean"); > + commonTypes.add("Boolean"); > + commonTypes.add("Date"); > + } > + > +} > > > Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java > ___________________________________________________________________ > Added: svn:keywords > + Author Date Id Revision HeadURL > > Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -3,11 +3,16 @@ > import java.io.File; > import java.io.IOException; > import java.io.Writer; > +import java.util.Collection; > +import java.util.Set; > > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > import org.nuiton.eugene.models.object.ObjectModelAttribute; > import org.nuiton.eugene.models.object.ObjectModelClass; > +import org.nuiton.eugene.models.object.ObjectModelClassifier; > +import org.nuiton.eugene.models.object.ObjectModelOperation; > +import org.nuiton.eugene.models.object.ObjectModelParameter; > > /** > * Interface for BusinessEntity, interfaces are needed for multiple inheritance > @@ -74,6 +79,8 @@ > generateStaticAttributes(output, clazz); > > generateAttributeAccessMethod(output, clazz); > + > + generateInterfaceOperations(output, clazz); > > /*{ > } //<%=name%> > @@ -149,4 +156,45 @@ > }*/ > } > > + private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { > + for (ObjectModelOperation op : classifier.getOperations()) { > + String opName = op.getName(); > +/*{ /** > +}*/ > + if (EugengoUtils.hasDocumentation(op)) { > + String opDocumentation = op.getDocumentation(); > +/*{ * <%=opName%> : <%=opDocumentation%> > +}*/ > + } > + Collection<ObjectModelParameter> params = op.getParameters(); > + for (ObjectModelParameter param : params) { > + String paramName = param.getName(); > + String paramDocumentation = param.getDocumentation(); > +/*{ * @param <%=paramName%> <%=paramDocumentation%> > + }*/ > + } > + String opVisibility = op.getVisibility(); > + String opType = op.getReturnType(); > +/*{ *) > + <%=opVisibility%> <%=opType%> <%=opName%>(}*/ > + String comma = ""; > + for (ObjectModelParameter param : params) { > + String paramName = param.getName(); > + String paramType = param.getType(); > +/*{<%=comma%><%=paramType%> <%=paramName%>}*/ > + comma = ", "; > + } > +/*{)}*/ > + Set<String> exceptions = op.getExceptions(); > + comma = " throws "; > + for (String exception : exceptions) { > +/*{<%=comma%><%=exception%>}*/ > + comma = ", "; > + } > +/*{; > + > +}*/ > + } > + } > + > } > > Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java > =================================================================== > --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-05-12 15:08:48 UTC (rev 53) > +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-05-17 08:38:51 UTC (rev 54) > @@ -31,7 +31,8 @@ > > // Wikitty (Interface, impl...) > BusinessEntityInterfaceGenerator.class, > - BusinessEntityGenerator.class, > + BusinessEntityAbstractGenerator.class, > + BusinessEntityImplGenerator.class, > BusinessEntityBeanGenerator.class > > )); > > _______________________________________________ > Wikitty-commits mailing list > Wikitty-commits(a)list.nuiton.org > http://list.nuiton.org/cgi-bin/mailman/listinfo/wikitty-commits -- Tony Chemit -------------------- tél: +33 (0) 2 40 50 29 28 email: chemit(a)codelutin.com http://www.codelutin.com

2 2

Changement de groupId et de package
by Eric Chatellier 12 May '10

12 May '10

Bonjour, Wikitty a changé de groupId en 'org.nuiton.wikitty' et pour l'occassion est passé en v2.0. Les noms de packages également. Par contre, il a été déplacé dans 'org.nuiton' mais il est très difficile de faire du "self-contained". Le dépot sharengo est utilisé car il n'y a pas exactement les mêmes dépendances que sur central (en travaillant un peu, on devrait y arriver). Le problème est l'utilisation du repos jboss, un grand nombre de dépendances en dépendent. -- Éric<chatellier(a)codelutin.com> Tel: 02 40 50 29 28 http://www.codelutin.com

1 0

[ANN] - org.sharengo.wikengo.core-wikitty 1.5 released
by nuiton.org Release Notification 11 May '10

11 May '10

2 1

Release wikitty
by Eric Chatellier 11 May '10

11 May '10

Bonjour, Pour info, wikitty va être tagué aujourd'hui (1.5 ?) Cordialement. -- Éric<chatellier(a)codelutin.com> Tel: 02 40 50 29 28 http://www.codelutin.com

1 0

Migration des wikitty chargées depuis un criteria
by Eric Chatellier 06 May '10

06 May '10

Bonjour, Lorsque l'on charge un wikitty via un restore, celui ci est automatiquement migré : Wikitty result = getWikittyStorage().restore(transaction, id); if(result != null) { result = upgradeData(transaction, result); } par contre, lorsqu'on charge une liste de wikitty via une recherche criteria, ils n'ont pas l'air d'être migré. Donc à la sauvegarde des entités chargé sans restore, on a l'erreur : org.sharengo.wikitty.WikittyException: org.sharengo.wikitty.WikittyException: Field Client.validEmail is not a fully qualified field name at org.sharengo.wikitty.AbstractWikittyService.store(AbstractWikittyService.java:141) at org.sharengo.wikitty.WikittyProxy.store(WikittyProxy.java:55) at com.jurismarches.vradi.services.VradiStorageServiceImpl.updateEntity(VradiStorageServiceImpl.java:163) ... 36 more Caused by: org.sharengo.wikitty.WikittyException: org.sharengo.wikitty.WikittyException: Field Client.validEmail is not a fully qualified field name at org.sharengo.wikitty.solr.WikittySearchEnginSolr.store(WikittySearchEnginSolr.java:524) at org.sharengo.wikitty.AbstractWikittyService.store(AbstractWikittyService.java:112) at org.sharengo.wikitty.AbstractWikittyService.store(AbstractWikittyService.java:135) ... 38 more Caused by: org.sharengo.wikitty.WikittyException: Field Client.validEmail is not a fully qualified field name at org.sharengo.wikitty.Wikitty.getFieldType(Wikitty.java:238) at org.sharengo.wikitty.solr.WikittySearchEnginSolr.createIndexDocument(WikittySearchEnginSolr.java:786) at org.sharengo.wikitty.solr.WikittySearchEnginSolr.store(WikittySearchEnginSolr.java:512) ... 40 more Caused by: org.sharengo.wikitty.WikittyException: field 'validEmail' doesn't exists on extension 'Client' at org.sharengo.wikitty.Wikitty.getFieldType(Wikitty.java:231) ... 42 more -- Éric<chatellier(a)codelutin.com> Tel: 02 40 50 29 28 http://www.codelutin.com

2 1

Erreur JTA/JMS
by Eric Chatellier 06 May '10

06 May '10

Bonjour, L'erreur suivante survient lorsqu'on effectue deux actions de suite dans la file JMS. WARN he.activemq.broker.TransportConnection.Service 285 - Async error occurred: javax.transaction.xa.XAException: Transaction 'XID:131076:00000000000000000000ffff7f0000010000a68c4bdee86d0000000041726a756e613a3432363336:00000000000000000000ffff7f0000010000a68c4bdee86d00000006' has not been started. javax.transaction.xa.XAException: Transaction 'XID:131076:00000000000000000000ffff7f0000010000a68c4bdee86d0000000041726a756e613a3432363336:00000000000000000000ffff7f0000010000a68c4bdee86d00000006' has not been started. at org.apache.activemq.broker.TransactionBroker.getTransaction(TransactionBroker.java:266) at org.apache.activemq.broker.TransactionBroker.send(TransactionBroker.java:208) at org.apache.activemq.broker.BrokerFilter.send(BrokerFilter.java:126) at org.apache.activemq.broker.CompositeDestinationBroker.send(CompositeDestinationBroker.java:95) at org.apache.activemq.broker.MutableBrokerFilter.send(MutableBrokerFilter.java:133) at org.apache.activemq.broker.TransportConnection.processMessage(TransportConnection.java:446) at org.apache.activemq.command.ActiveMQMessage.visit(ActiveMQMessage.java:631) at org.apache.activemq.broker.TransportConnection.service(TransportConnection.java:300) at org.apache.activemq.broker.TransportConnection$1.onCommand(TransportConnection.java:178) at org.apache.activemq.transport.TransportFilter.onCommand(TransportFilter.java:68) at org.apache.activemq.transport.WireFormatNegotiator.onCommand(WireFormatNegotiator.java:113) at org.apache.activemq.transport.InactivityMonitor.onCommand(InactivityMonitor.java:216) at org.apache.activemq.transport.TransportSupport.doConsume(TransportSupport.java:84) at org.apache.activemq.transport.tcp.TcpTransport.doRun(TcpTransport.java:204) at org.apache.activemq.transport.tcp.TcpTransport.run(TcpTransport.java:186) at java.lang.Thread.run(Thread.java:619) Pour info, l'erreur est reproductible via le code src/test/java/org/sharengo/wikitty/multistorage/test/MultiStorageTest.java du module core-wikitty-multistorage-impl. J'ai l'impression qu'il utilise la première transaction lors du second appel (mais il ne peut pas la redémarré). Sinon, a ce que j'ai compris, le XATopicSession de JMS s'apparente plus ou moins à une transaction. Donc au lieu d'instancier un seul XATopicSession par service, si j'instancie un XATopicSession par appel de store(Wikitty) ca fonctionne mieux. Mais peut être que ce n'est pas du tout cela, et j'ai peut-être du coup modifié le fonctionnement des transactions :( -- Éric<chatellier(a)codelutin.com> Tel: 02 40 50 29 28 http://www.codelutin.com

2 1

Mettre au propre le projet
by Tony Chemit 29 Apr '10

29 Apr '10

Yo, Il serait bien que le projet maintenant qu'il est chez nous s'uniformise avec le reste de nos libs. Je pense notamment : - nom des modules Wikitty :: XXX plutot que les groupId. - supprimer les dépendances vers sharengo - que les tests passent :) Qui le fait ? -- Tony Chemit -------------------- tél: +33 (0) 2 40 50 29 28 email: chemit(a)codelutin.com http://www.codelutin.com

4 3

Le site maven/mavenpom sharengo parent ?
by Jean Couteau 23 Apr '10

23 Apr '10

J'ai rajouté un peu de doc sur la migration wikitty. Je voulais mettre ça dans le site, mais il prend pas le rst, j'ai voulu rajouter la génération rst du site dans le pom, mais j'ai une erreur : [ERROR] FATAL ERROR [INFO] ------------------------------------------------------------------------ [INFO] org/apache/maven/doxia/sink/StructureSink org.apache.maven.doxia.sink.StructureSink [INFO] ------------------------------------------------------------------------ [INFO] Trace java.lang.NoClassDefFoundError: org/apache/maven/doxia/sink/StructureSink at org.apache.maven.doxia.module.xhtml.XhtmlSink.link(XhtmlSink.java:1013) at org.apache.maven.doxia.module.xhtml.XhtmlSink.link(XhtmlSink.java:989) at org.apache.maven.reporting.AbstractMavenReportRenderer.link(AbstractMavenReportRenderer.java:263) at org.apache.maven.reporting.AbstractMavenReportRenderer.linkPatternedText(AbstractMavenReportRenderer.java:376) at org.apache.maven.report.projectinfo.IssueTrackingReport$IssueTrackingRenderer.renderBody(IssueTrackingReport.java:132) at org.apache.maven.reporting.AbstractMavenReportRenderer.render(AbstractMavenReportRenderer.java:65) at org.apache.maven.report.projectinfo.IssueTrackingReport.executeReport(IssueTrackingReport.java:63) at org.apache.maven.reporting.AbstractMavenReport.generate(AbstractMavenReport.java:90) at org.apache.maven.plugins.site.ReportDocumentRenderer.renderDocument(ReportDocumentRenderer.java:139) at org.apache.maven.doxia.siterenderer.DefaultSiteRenderer.renderModule(DefaultSiteRenderer.java:269) at org.apache.maven.doxia.siterenderer.DefaultSiteRenderer.render(DefaultSiteRenderer.java:101) at org.apache.maven.plugins.site.SiteMojo.renderLocale(SiteMojo.java:133) at org.apache.maven.plugins.site.SiteMojo.execute(SiteMojo.java:100) at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:490) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138) at org.apache.maven.cli.MavenCli.main(MavenCli.java:362) at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430) at org.codehaus.classworlds.Launcher.main(Launcher.java:375) Caused by: java.lang.ClassNotFoundException: org.apache.maven.doxia.sink.StructureSink at java.net.URLClassLoader$1.run(URLClassLoader.java:202) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:190) at java.lang.ClassLoader.loadClass(ClassLoader.java:307) at org.codehaus.classworlds.RealmClassLoader.loadClassDirect(RealmClassLoader.java:195) at org.codehaus.classworlds.DefaultClassRealm.loadClass(DefaultClassRealm.java:255) at org.codehaus.classworlds.DefaultClassRealm.loadClass(DefaultClassRealm.java:274) at org.codehaus.classworlds.RealmClassLoader.loadClass(RealmClassLoader.java:214) at java.lang.ClassLoader.loadClass(ClassLoader.java:248) ... 32 more Je veux changer le parent pour voir et mettre mavenpom4redmine. Je génère bien le site, mais pas les wikitty (failed to validate POM). Du coup ma question : Est-ce qu'on est obligé d'avoir le mavenpom sharengo en parent ? Est-ce qu'il y a un moyen de générer le site en rst en gardant le mavenpom sharengo en parent ? Faut que je fasse la doc en apt ? Enfin bref, comment faire pour générer le site ?

4 6