November 2009 - Topia-commits - mailman.cloud.codelutin.com

r1674 - branches/from2.2.2-eugene2-beta/topia-service-replication/src/test/java/org/nuiton/topia/replication
by fdesbois＠users.nuiton.org Nov. 27, 2009

Nov. 27, 2009

Author: fdesbois Date: 2009-11-27 18:04:46 +0100 (Fri, 27 Nov 2009) New Revision: 1674 Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java Log: change int to long type for size() method Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2009-11-27 17:01:06 UTC (rev 1673) +++ branches/from2.2.2-eugene2-beta/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2009-11-27 17:04:46 UTC (rev 1674) @@ -433,8 +433,8 @@ for (TopiaEntityEnum c : contracts) { TopiaDAO<? extends TopiaEntity> daoSrc = ctxt.getDAO(c.getContract()); TopiaDAO<? extends TopiaEntity> daoDst = ctxt2.getDAO(c.getContract()); - int nbSrc = daoSrc.size(); - int nbDst = daoDst.size(); + long nbSrc = daoSrc.size(); + long nbDst = daoDst.size(); assertEquals("le nombres d'entites de type " + c + " devrait etre " + nbSrc + " mais est " + nbDst, nbSrc, nbDst); List<String> idsSrc = daoSrc.findAllIds(); List<String> idsDst = daoDst.findAllIds();

1 0

r1673 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence
by fdesbois＠users.nuiton.org Nov. 27, 2009

Nov. 27, 2009

Author: fdesbois Date: 2009-11-27 18:01:06 +0100 (Fri, 27 Nov 2009) New Revision: 1673 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Log: Evol #135 : Use of count(*) for counting entities from the DAO method size() Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2009-11-26 09:24:50 UTC (rev 1672) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2009-11-27 17:01:06 UTC (rev 1673) @@ -134,12 +134,12 @@ throws TopiaException; /** - * TODO modifier l'implantation pour faire un simple count sur la base + * Compte le nombre d'entites en base * - * @return la taille de ? + * @return le nombre total d'entites existantes * @throws TopiaException */ - int size() throws TopiaException; + long size() throws TopiaException; /** * Recherche la classe en utilisant la cle naturelle, chaque champs de la Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2009-11-26 09:24:50 UTC (rev 1672) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2009-11-27 17:01:06 UTC (rev 1673) @@ -752,15 +752,15 @@ } /** - * TODO implanter une facon plus rapide de recupere la size (count direct - * sur la base) ? - * - * Si la methode doit charger les objets, on faut le dire :) + * Utilisation du count(*) en HQL pour recuperer le nombre d'entites du type lie au DAO + * @return un long correspondant au nombre d'entités existantes en base */ @Override - public int size() throws TopiaException { - int result = findAll().size(); - return result; + public long size() throws TopiaException { + //int result = findAll().size(); + + List result = this.getContext().find("SELECT count(*) FROM " + getEntityClass().getName() + "Impl"); + return (Long)result.get(0); } @Override

2 1

r1672 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 26, 2009

Nov. 26, 2009

Author: fdesbois Date: 2009-11-26 10:24:50 +0100 (Thu, 26 Nov 2009) New Revision: 1672 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java Log: Ano #132 : Resolve issue for generation of an entity with two links with associationClass Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-25 17:47:54 UTC (rev 1671) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-26 09:24:50 UTC (rev 1672) @@ -403,10 +403,12 @@ // tmp.addAll(<%=ref%>); // } /*{ - org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); - List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); - if (findAllByProperties != null) { - tmp.addAll(findAllByProperties); + { + org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); + List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); + if (findAllByProperties != null) { + tmp.addAll(findAllByProperties); + } } }*/ }

1 0

r1671 - in trunk: topia-persistence/src/site/rst topia-service-history/src/site/rst
by fdesbois＠users.nuiton.org Nov. 25, 2009

Nov. 25, 2009

Author: fdesbois Date: 2009-11-25 18:47:54 +0100 (Wed, 25 Nov 2009) New Revision: 1671 Modified: trunk/topia-persistence/src/site/rst/Todo.rst trunk/topia-service-history/src/site/rst/index.rst Log: Add todo (must add evol in redmine) Modified: trunk/topia-persistence/src/site/rst/Todo.rst =================================================================== --- trunk/topia-persistence/src/site/rst/Todo.rst 2009-11-24 17:44:06 UTC (rev 1670) +++ trunk/topia-persistence/src/site/rst/Todo.rst 2009-11-25 17:47:54 UTC (rev 1671) @@ -143,6 +143,8 @@ - Generation des UI par defaut (JAXX et JSP) - prendre en compte le contenu de l'onglet doc des entités et attributs jusqu'au -- pour les tooltips (doc tooltips/doc user/doc dev) +- tag-value calculated sur les attributs calculés (gestion utile pour l'historisation) + --> génération : annotation @Calculated A reflechir (voir si c vraiment utile) -------------------------------------- Modified: trunk/topia-service-history/src/site/rst/index.rst =================================================================== --- trunk/topia-service-history/src/site/rst/index.rst 2009-11-24 17:44:06 UTC (rev 1670) +++ trunk/topia-service-history/src/site/rst/index.rst 2009-11-25 17:47:54 UTC (rev 1671) @@ -1,4 +1,11 @@ ToPIA Historique Service ======================== -Permet de conserver l'ensemble des actions réalisées sur la base de données. \ No newline at end of file +Permet de conserver l'ensemble des actions réalisées sur la base de données. + +TODO +---- + +- Sauvegarde des valeurs des champs pour create/update (Attention gérer les collection). +- Ne plus utiliser NoHistory mais plutôt une liste des entités à historiser (include / exclude) dans la configuration +- Gérer cas d'un attribut calculated (tag-value) \ No newline at end of file

1 0

r1670 - in trunk: . src/site
by fdesbois＠users.nuiton.org Nov. 24, 2009

Nov. 24, 2009

Author: fdesbois Date: 2009-11-24 18:44:06 +0100 (Tue, 24 Nov 2009) New Revision: 1670 Modified: trunk/pom.xml trunk/src/site/site.xml Log: - Use mavenpom 1.1.1-SNAPSHOT - Change url for jrst Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-13 13:38:15 UTC (rev 1669) +++ trunk/pom.xml 2009-11-24 17:44:06 UTC (rev 1670) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-11-13 13:38:15 UTC (rev 1669) +++ trunk/src/site/site.xml 2009-11-24 17:44:06 UTC (rev 1670) @@ -8,14 +8,14 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="../../jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> </poweredBy> <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="index.html" /> </breadcrumbs> <menu name="Utilisateur">

1 0

r1669 - in branches/from2.2.2-eugene2-beta/topia-persistence: . src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 13, 2009

Nov. 13, 2009

Author: fdesbois Date: 2009-11-13 14:38:15 +0100 (Fri, 13 Nov 2009) New Revision: 1669 Added: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaBean.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaInterface.java Removed: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml Log: Rename transformers Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-13 13:01:01 UTC (rev 1668) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-13 13:38:15 UTC (rev 1669) @@ -141,7 +141,7 @@ <testPhase>true</testPhase> <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceTransformer,org.nuiton.topia.generator.BeanTransformer</templates> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.ObjectModelTransformerToJavaInterface,org.nuiton.topia.generator.ObjectModelTransformerToJavaBean</templates> <fullPackagePath>org.nuiton.topia</fullPackagePath> <extractedPackages>org.nuiton.topia</extractedPackages> <defaultPackage>org.nuiton.topia</defaultPackage> Deleted: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2009-11-13 13:01:01 UTC (rev 1668) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2009-11-13 13:38:15 UTC (rev 1669) @@ -1,425 +0,0 @@ -/* - * *##% - * ToPIA - Persistence - * Copyright (C) 2007 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.topia.generator; - -import org.apache.commons.lang.StringUtils; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.*; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/*{generator option: parentheses = false}*/ - -/*{generator option: writeString = +}*/ -/** - * BeanTransformer - * - * Created: 28 oct. 2009 - * - * @author fdesbois - * @version $Revision: 692 $ - * - * Mise a jour: $Date: 2009-11-04 18:41:32 +0100 (mer. 04 nov. 2009) $ - * par : $Author: fdesbois $ - */ -public class BeanTransformer extends ObjectModelTransformerToJava { - - private static final Log log = LogFactory.getLog(BeanTransformer.class); - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN) && - !clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { - return; - } - - ObjectModelClass resultClass = null; - if (clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { - resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); - } else { - resultClass = createClass(clazz.getName(), clazz.getPackageName()); - } - - List<ObjectModelAttribute> attributes = (List<ObjectModelAttribute>) clazz.getAttributes(); - - createForDTO(resultClass, clazz, attributes); - - // Set superclass - Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); - if (j.hasNext()) { - ObjectModelClass p = j.next(); - setSuperClass(resultClass, p.getQualifiedName()); - } - - // Add interfaces from inputModel - for (Iterator<ObjectModelInterface> i = clazz.getInterfaces().iterator(); i.hasNext();) { - ObjectModelClassifier parentInterface = i.next(); - addInterface(resultClass, parentInterface.getQualifiedName()); - } - - // Default constructor - ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); - - createListeners(resultClass, clazz); - - boolean hasEntity = false; - boolean hasMultipleAttribute = false; - String toStringAppend = ""; // Append pour la méthode toString() - String initTabs = ""; // initialisation des tableaux dans le constructeur - - // Add attributes with getter/setter - for (ObjectModelAttribute attr : attributes) { - - if (attr.isNavigable() || attr.hasAssociationClass()) { - String attrType = attr.getType(); - String simpleType = GeneratorUtil.getSimpleName(attrType); - String attrName = attr.getName(); - String attrNameCapitalized = StringUtils.capitalize(attrName); - - // multiple attribute - if (attr.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ARRAY)) { - - int maxSize = attr.getMaxMultiplicity(); - int maxSizeMoinsUn = maxSize - 1; - - initTabs += "\n\tthis." + attrName + " = new " + attrType + "[" + maxSize + "];"; - - // Set Value - ObjectModelOperation setValue = addOperation(resultClass, "set" + attrNameCapitalized, - "void", ObjectModelModifier.PUBLIC); - addParameter(setValue, "int", "index"); - addParameter(setValue, attrType, "value"); - addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); - setOperationBody(setValue, "" - /*{ - if (index >= <%=maxSize%> || index < 0) { - throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + - "index must be between 0 and <%=maxSizeMoinsUn%>"); - } - <%=simpleType%>[] oldValue = get<%=attrNameCapitalized%>(); - this.<%=attrName%>[index] = value; - firePropertyChange("<%=attrName%>", oldValue, this.<%=attrName%>); - }*/ - ); - - // Get Value - ObjectModelOperation getValue = addOperation(resultClass, "get" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(getValue, "int", "index"); - addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); - setOperationBody(getValue, "" - /*{ - if (index >= <%=maxSize%> || index < 0) { - throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + - "index must be between 0 and <%=maxSizeMoinsUn%>"); - } - return this.<%=attrName%>[index]; - }*/ - ); - - attrType += "[]"; - simpleType = GeneratorUtil.getSimpleName(attrType); - } else if (GeneratorUtil.isNMultiplicity(attr)) { - hasMultipleAttribute = true; - - // Add getChild - ObjectModelOperation getChild = addOperation(resultClass, "get" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - <%=simpleType%> o = getChild(<%=attrName%>, index); - return o; - }*/ - ); - - // Add getEntity - ObjectModelClass attrEntity = null; - if (getModel().hasClass(attr.getType())) { - attrEntity = getModel().getClass(attr.getType()); - } - boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)); - - if (isEntity) { - hasEntity = true; - ObjectModelOperation getChildEntity = addOperation(resultClass, "get" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(getChildEntity, String.class.getName(), "topiaId"); - setOperationBody(getChildEntity, "" - /*{ - <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); - return o; - }*/ - ); - } - - // Add addChild - ObjectModelOperation addChild = addOperation(resultClass, "add" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(addChild, attrType, attrName); - setOperationBody(addChild, "" - - /*{ - get<%=attrNameCapitalized%>().add(<%=attrName%>); - firePropertyChange("<%=attrName%>", null, <%=attrName%>); - return <%=attrName%>; - }*/ - ); - - // Add removeChild - ObjectModelOperation removeChild = addOperation(resultClass, "remove" + attrNameCapitalized, - "boolean", ObjectModelModifier.PUBLIC); - addParameter(removeChild, attrType, attrName); - setOperationBody(removeChild, "" - - /*{ - boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); - if (removed) { - firePropertyChange("<%=attrName%>", <%=attrName%>, null); - } - return removed; - }*/ - ); - - // Change type for Multiple attribute - if (attr.isOrdered()) { - attrType = List.class.getName() + "<" + attrType + ">"; - } else { - attrType = Collection.class.getName() + "<" + attrType + ">"; - } - simpleType = GeneratorUtil.getSimpleName(attrType); - } // end multiple attribute - - if (attr.hasAssociationClass()) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - attrType = attr.getAssociationClass().getName(); - } - - // Add attribute to the class - String visibility = attr.getVisibility(); - addAttribute(resultClass, attrName, attrType, "", ObjectModelModifier.toValue(visibility)); - - // Add getter operation - ObjectModelOperation getter = addOperation(resultClass, "get" + attrNameCapitalized, attrType, - ObjectModelModifier.PUBLIC); - setOperationBody(getter, "" - /*{ - return this.<%=attrName%>; - }*/ - ); - - // Add setter operation - ObjectModelOperation setter = addOperation(resultClass, "set" + attrNameCapitalized, "void", - ObjectModelModifier.PUBLIC); - addParameter(setter, attrType, "newValue"); - setOperationBody(setter, "" - /*{ - <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); - this.<%=attrName%> = newValue; - firePropertyChange("<%=attrName%>", oldValue, newValue); - }*/ - ); - - // toString append for toString method - toStringAppend += "\n\t\t.append(\"" + attrName + "\", this." + attrName + ")"; - - } - } - - // Add helper operations - if (hasMultipleAttribute) { - ObjectModelOperation getChild = addOperation(resultClass, "getChild", "<T> T", - ObjectModelModifier.PROTECTED); - addParameter(getChild, "java.util.Collection<T>", "childs"); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - if (childs != null) { - int i = 0; - for (T o : childs) { - if (index == i) { - return o; - } - i++; - } - } - return null; - }*/ - ); - } - - if (hasEntity) { - ObjectModelOperation getEntity = addOperation(resultClass, "getEntity", - "<T extends org.nuiton.topia.persistence.TopiaEntity> T", ObjectModelModifier.PROTECTED); - addParameter(getEntity, "java.util.Collection<T>", "childs"); - addParameter(getEntity, "java.lang.String", "topiaId"); - setOperationBody(getEntity, "" - /*{ - if (childs != null) { - for (T o : childs) { - if (topiaId.equals(o.getTopiaId())) { - return o; - } - } - } - return null; - }*/ - ); - } - - // Set body for default constructor - setOperationBody(constructor, "" - /*{ - pcs = new PropertyChangeSupport(this);<%=initTabs%> - }*/ - ); - - // Add operations - for (ObjectModelOperation op : clazz.getOperations()) { - String visibility = op.getVisibility(); - ObjectModelOperation resultOperation = addOperation(resultClass, op.getName(), op.getReturnType(), - ObjectModelModifier.toValue(visibility), ObjectModelModifier.ABSTRACT); - - for (ObjectModelParameter param : op.getParameters()) { - addParameter(resultOperation, param.getType(), param.getName()); - } - - for (String exception : op.getExceptions()) { - addException(resultOperation, exception); - } - } - - // Add toString operation - ObjectModelOperation toString = addOperation(resultClass, "toString", "java.lang.String", - ObjectModelModifier.PUBLIC); // FIXME manque Override - addImport(resultClass, "org.apache.commons.lang.builder.ToStringBuilder"); - setOperationBody(toString, "" - /*{ - String result = new ToStringBuilder(this)<%=toStringAppend%>. - toString(); - return result; - }*/ - ); - - } - - private void createForDTO(ObjectModelClass resultClass, ObjectModelClass inputClass, List<ObjectModelAttribute> attributes) { - - // Add Serializable implements for DTO generation - if (!inputClass.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { - return; - - } - - addInterface(resultClass, "java.io.Serializable"); - String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", inputClass, getModel()); - if (svUID != null) { - addConstant(resultClass, "serialVersionUID", "long", svUID, ObjectModelModifier.PUBLIC); - } - - for (ObjectModelDependency dependency : inputClass.getDependencies()) { - ObjectModelClass supplier = (ObjectModelClass)dependency.getSupplier(); - - // ENTITY dependency - // Copy all primitives attributes from the Entity (supplier) to the DTO - // Prepare a list to future generation of all object generated attributes - if (supplier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { - if (log.isInfoEnabled()) { - log.info("Create primitive and date fields in DTO from Entity : " - + supplier.getQualifiedName()); - } - for (ObjectModelAttribute attr : supplier.getAttributes()) { - if (TopiaGeneratorUtil.isPrimitiveType(attr) || TopiaGeneratorUtil.isDateType(attr)) { - attributes.add(attr); - } - } - } - } - } - - protected void createListeners(ObjectModelClass resultClass, ObjectModelClass inputClass) { - - addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", - ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); - - // Add PropertyListener - String propType = "java.beans.PropertyChangeListener"; - String strType = String.class.getName(); - String objectType = Object.class.getName(); - - ObjectModelOperation addPropertyChangeListener = addOperation(resultClass, - "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(addPropertyChangeListener, propType, "listener"); - setOperationBody(addPropertyChangeListener, "" - /*{ - pcs.addPropertyChangeListener(listener); - }*/ - ); - - ObjectModelOperation addPropertyChangeListenerPlus = addOperation(resultClass, - "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(addPropertyChangeListenerPlus, strType, "propertyName"); - addParameter(addPropertyChangeListenerPlus, propType, "listener"); - setOperationBody(addPropertyChangeListenerPlus, "" - /*{ - pcs.addPropertyChangeListener(propertyName, listener); - }*/ - ); - - ObjectModelOperation removePropertyChangeListener = addOperation(resultClass, - "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(removePropertyChangeListener, propType, "listener"); - setOperationBody(removePropertyChangeListener, "" - /*{ - pcs.removePropertyChangeListener(listener); - }*/ - ); - - ObjectModelOperation removePropertyChangeListenerPlus = addOperation(resultClass, - "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(removePropertyChangeListenerPlus, strType, "propertyName"); - addParameter(removePropertyChangeListenerPlus, propType, "listener"); - setOperationBody(removePropertyChangeListenerPlus, "" - /*{ - pcs.removePropertyChangeListener(propertyName, listener); - }*/ - ); - - ObjectModelOperation firePropertyChange = addOperation(resultClass, - "firePropertyChange", "void", ObjectModelModifier.PROTECTED); - addParameter(firePropertyChange, strType, "propertyName"); - addParameter(firePropertyChange, objectType, "oldValue"); - addParameter(firePropertyChange, objectType, "newValue"); - setOperationBody(firePropertyChange, "" - /*{ - pcs.firePropertyChange(propertyName, oldValue, newValue); - }*/ - ); - } - - -} Deleted: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2009-11-13 13:01:01 UTC (rev 1668) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2009-11-13 13:38:15 UTC (rev 1669) @@ -1,64 +0,0 @@ - -package org.nuiton.topia.generator; - -import java.util.Iterator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; - -/** - * InterfaceTransformer - * - * Created: 7 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class InterfaceTransformer extends ObjectModelTransformerToJava { - - private static final Log log = LogFactory.getLog(InterfaceTransformer.class); - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!interfacez.getStereotypes().isEmpty()) { - // can only generate an interface with there is no other stereotypes - return; - } - - ObjectModelInterface resultInterface = createInterface(interfacez.getName(), interfacez.getPackageName()); - - // extend interface - Iterator<ObjectModelInterface> it = interfacez.getInterfaces().iterator(); - if (it.hasNext()) { - ObjectModelInterface extend = it.next(); - addInterface(resultInterface, extend.getQualifiedName()); - } - - // constant attributes - for (ObjectModelAttribute attr : interfacez.getAttributes()) { - if (!attr.isStatic() && StringUtils.isNotEmpty(attr.getDefaultValue())) { // only static attribut with value - addConstant(resultInterface, attr.getName(), attr.getType(), attr.getDefaultValue(), ObjectModelModifier.PUBLIC); - } - } - - // interface operations - for (ObjectModelOperation op : interfacez.getOperations()) { - ObjectModelOperation resultOp = addOperation(resultInterface, op.getName(), op.getReturnType()); - for (ObjectModelParameter param : op.getParameters()) { - addParameter(resultOp, param.getType(), param.getName()); - } - for (String exception : op.getExceptions()) { - addException(resultOp, exception); - } - } - } -} Copied: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaBean.java (from rev 1666, branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java) =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaBean.java (rev 0) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaBean.java 2009-11-13 13:38:15 UTC (rev 1669) @@ -0,0 +1,425 @@ +/* + * *##% + * ToPIA - Persistence + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.topia.generator; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.*; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ +/** + * BeanTransformer + * + * Created: 28 oct. 2009 + * + * @author fdesbois + * @version $Revision: 692 $ + * + * Mise a jour: $Date: 2009-11-04 18:41:32 +0100 (mer. 04 nov. 2009) $ + * par : $Author: fdesbois $ + */ +public class ObjectModelTransformerToJavaBean extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(ObjectModelTransformerToJavaBean.class); + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN) && + !clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { + return; + } + + ObjectModelClass resultClass = null; + if (clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { + resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); + } else { + resultClass = createClass(clazz.getName(), clazz.getPackageName()); + } + + List<ObjectModelAttribute> attributes = (List<ObjectModelAttribute>) clazz.getAttributes(); + + createForDTO(resultClass, clazz, attributes); + + // Set superclass + Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + setSuperClass(resultClass, p.getQualifiedName()); + } + + // Add interfaces from inputModel + for (Iterator<ObjectModelInterface> i = clazz.getInterfaces().iterator(); i.hasNext();) { + ObjectModelClassifier parentInterface = i.next(); + addInterface(resultClass, parentInterface.getQualifiedName()); + } + + // Default constructor + ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); + + createListeners(resultClass, clazz); + + boolean hasEntity = false; + boolean hasMultipleAttribute = false; + String toStringAppend = ""; // Append pour la méthode toString() + String initTabs = ""; // initialisation des tableaux dans le constructeur + + // Add attributes with getter/setter + for (ObjectModelAttribute attr : attributes) { + + if (attr.isNavigable() || attr.hasAssociationClass()) { + String attrType = attr.getType(); + String simpleType = GeneratorUtil.getSimpleName(attrType); + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + + // multiple attribute + if (attr.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ARRAY)) { + + int maxSize = attr.getMaxMultiplicity(); + int maxSizeMoinsUn = maxSize - 1; + + initTabs += "\n\tthis." + attrName + " = new " + attrType + "[" + maxSize + "];"; + + // Set Value + ObjectModelOperation setValue = addOperation(resultClass, "set" + attrNameCapitalized, + "void", ObjectModelModifier.PUBLIC); + addParameter(setValue, "int", "index"); + addParameter(setValue, attrType, "value"); + addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); + setOperationBody(setValue, "" + /*{ + if (index >= <%=maxSize%> || index < 0) { + throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + + "index must be between 0 and <%=maxSizeMoinsUn%>"); + } + <%=simpleType%>[] oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%>[index] = value; + firePropertyChange("<%=attrName%>", oldValue, this.<%=attrName%>); + }*/ + ); + + // Get Value + ObjectModelOperation getValue = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getValue, "int", "index"); + addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); + setOperationBody(getValue, "" + /*{ + if (index >= <%=maxSize%> || index < 0) { + throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + + "index must be between 0 and <%=maxSizeMoinsUn%>"); + } + return this.<%=attrName%>[index]; + }*/ + ); + + attrType += "[]"; + simpleType = GeneratorUtil.getSimpleName(attrType); + } else if (GeneratorUtil.isNMultiplicity(attr)) { + hasMultipleAttribute = true; + + // Add getChild + ObjectModelOperation getChild = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + <%=simpleType%> o = getChild(<%=attrName%>, index); + return o; + }*/ + ); + + // Add getEntity + ObjectModelClass attrEntity = null; + if (getModel().hasClass(attr.getType())) { + attrEntity = getModel().getClass(attr.getType()); + } + boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)); + + if (isEntity) { + hasEntity = true; + ObjectModelOperation getChildEntity = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChildEntity, String.class.getName(), "topiaId"); + setOperationBody(getChildEntity, "" + /*{ + <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); + return o; + }*/ + ); + } + + // Add addChild + ObjectModelOperation addChild = addOperation(resultClass, "add" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(addChild, attrType, attrName); + setOperationBody(addChild, "" + + /*{ + get<%=attrNameCapitalized%>().add(<%=attrName%>); + firePropertyChange("<%=attrName%>", null, <%=attrName%>); + return <%=attrName%>; + }*/ + ); + + // Add removeChild + ObjectModelOperation removeChild = addOperation(resultClass, "remove" + attrNameCapitalized, + "boolean", ObjectModelModifier.PUBLIC); + addParameter(removeChild, attrType, attrName); + setOperationBody(removeChild, "" + + /*{ + boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + if (removed) { + firePropertyChange("<%=attrName%>", <%=attrName%>, null); + } + return removed; + }*/ + ); + + // Change type for Multiple attribute + if (attr.isOrdered()) { + attrType = List.class.getName() + "<" + attrType + ">"; + } else { + attrType = Collection.class.getName() + "<" + attrType + ">"; + } + simpleType = GeneratorUtil.getSimpleName(attrType); + } // end multiple attribute + + if (attr.hasAssociationClass()) { + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + + // Add attribute to the class + String visibility = attr.getVisibility(); + addAttribute(resultClass, attrName, attrType, "", ObjectModelModifier.toValue(visibility)); + + // Add getter operation + ObjectModelOperation getter = addOperation(resultClass, "get" + attrNameCapitalized, attrType, + ObjectModelModifier.PUBLIC); + setOperationBody(getter, "" + /*{ + return this.<%=attrName%>; + }*/ + ); + + // Add setter operation + ObjectModelOperation setter = addOperation(resultClass, "set" + attrNameCapitalized, "void", + ObjectModelModifier.PUBLIC); + addParameter(setter, attrType, "newValue"); + setOperationBody(setter, "" + /*{ + <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%> = newValue; + firePropertyChange("<%=attrName%>", oldValue, newValue); + }*/ + ); + + // toString append for toString method + toStringAppend += "\n\t\t.append(\"" + attrName + "\", this." + attrName + ")"; + + } + } + + // Add helper operations + if (hasMultipleAttribute) { + ObjectModelOperation getChild = addOperation(resultClass, "getChild", "<T> T", + ObjectModelModifier.PROTECTED); + addParameter(getChild, "java.util.Collection<T>", "childs"); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + if (childs != null) { + int i = 0; + for (T o : childs) { + if (index == i) { + return o; + } + i++; + } + } + return null; + }*/ + ); + } + + if (hasEntity) { + ObjectModelOperation getEntity = addOperation(resultClass, "getEntity", + "<T extends org.nuiton.topia.persistence.TopiaEntity> T", ObjectModelModifier.PROTECTED); + addParameter(getEntity, "java.util.Collection<T>", "childs"); + addParameter(getEntity, "java.lang.String", "topiaId"); + setOperationBody(getEntity, "" + /*{ + if (childs != null) { + for (T o : childs) { + if (topiaId.equals(o.getTopiaId())) { + return o; + } + } + } + return null; + }*/ + ); + } + + // Set body for default constructor + setOperationBody(constructor, "" + /*{ + pcs = new PropertyChangeSupport(this);<%=initTabs%> + }*/ + ); + + // Add operations + for (ObjectModelOperation op : clazz.getOperations()) { + String visibility = op.getVisibility(); + ObjectModelOperation resultOperation = addOperation(resultClass, op.getName(), op.getReturnType(), + ObjectModelModifier.toValue(visibility), ObjectModelModifier.ABSTRACT); + + for (ObjectModelParameter param : op.getParameters()) { + addParameter(resultOperation, param.getType(), param.getName()); + } + + for (String exception : op.getExceptions()) { + addException(resultOperation, exception); + } + } + + // Add toString operation + ObjectModelOperation toString = addOperation(resultClass, "toString", "java.lang.String", + ObjectModelModifier.PUBLIC); // FIXME manque Override + addImport(resultClass, "org.apache.commons.lang.builder.ToStringBuilder"); + setOperationBody(toString, "" + /*{ + String result = new ToStringBuilder(this)<%=toStringAppend%>. + toString(); + return result; + }*/ + ); + + } + + private void createForDTO(ObjectModelClass resultClass, ObjectModelClass inputClass, List<ObjectModelAttribute> attributes) { + + // Add Serializable implements for DTO generation + if (!inputClass.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { + return; + + } + + addInterface(resultClass, "java.io.Serializable"); + String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", inputClass, getModel()); + if (svUID != null) { + addConstant(resultClass, "serialVersionUID", "long", svUID, ObjectModelModifier.PUBLIC); + } + + for (ObjectModelDependency dependency : inputClass.getDependencies()) { + ObjectModelClass supplier = (ObjectModelClass)dependency.getSupplier(); + + // ENTITY dependency + // Copy all primitives attributes from the Entity (supplier) to the DTO + // Prepare a list to future generation of all object generated attributes + if (supplier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + if (log.isInfoEnabled()) { + log.info("Create primitive and date fields in DTO from Entity : " + + supplier.getQualifiedName()); + } + for (ObjectModelAttribute attr : supplier.getAttributes()) { + if (TopiaGeneratorUtil.isPrimitiveType(attr) || TopiaGeneratorUtil.isDateType(attr)) { + attributes.add(attr); + } + } + } + } + } + + protected void createListeners(ObjectModelClass resultClass, ObjectModelClass inputClass) { + + addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", + ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); + + // Add PropertyListener + String propType = "java.beans.PropertyChangeListener"; + String strType = String.class.getName(); + String objectType = Object.class.getName(); + + ObjectModelOperation addPropertyChangeListener = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListener, propType, "listener"); + setOperationBody(addPropertyChangeListener, "" + /*{ + pcs.addPropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation addPropertyChangeListenerPlus = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListenerPlus, strType, "propertyName"); + addParameter(addPropertyChangeListenerPlus, propType, "listener"); + setOperationBody(addPropertyChangeListenerPlus, "" + /*{ + pcs.addPropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListener = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListener, propType, "listener"); + setOperationBody(removePropertyChangeListener, "" + /*{ + pcs.removePropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListenerPlus = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListenerPlus, strType, "propertyName"); + addParameter(removePropertyChangeListenerPlus, propType, "listener"); + setOperationBody(removePropertyChangeListenerPlus, "" + /*{ + pcs.removePropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation firePropertyChange = addOperation(resultClass, + "firePropertyChange", "void", ObjectModelModifier.PROTECTED); + addParameter(firePropertyChange, strType, "propertyName"); + addParameter(firePropertyChange, objectType, "oldValue"); + addParameter(firePropertyChange, objectType, "newValue"); + setOperationBody(firePropertyChange, "" + /*{ + pcs.firePropertyChange(propertyName, oldValue, newValue); + }*/ + ); + } + + +} Property changes on: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaBean.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaInterface.java (from rev 1665, branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java) =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaInterface.java (rev 0) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaInterface.java 2009-11-13 13:38:15 UTC (rev 1669) @@ -0,0 +1,64 @@ + +package org.nuiton.topia.generator; + +import java.util.Iterator; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; + +/** + * InterfaceTransformer + * + * Created: 7 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ObjectModelTransformerToJavaInterface extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(ObjectModelTransformerToJavaInterface.class); + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.getStereotypes().isEmpty()) { + // can only generate an interface with there is no other stereotypes + return; + } + + ObjectModelInterface resultInterface = createInterface(interfacez.getName(), interfacez.getPackageName()); + + // extend interface + Iterator<ObjectModelInterface> it = interfacez.getInterfaces().iterator(); + if (it.hasNext()) { + ObjectModelInterface extend = it.next(); + addInterface(resultInterface, extend.getQualifiedName()); + } + + // constant attributes + for (ObjectModelAttribute attr : interfacez.getAttributes()) { + if (!attr.isStatic() && StringUtils.isNotEmpty(attr.getDefaultValue())) { // only static attribut with value + addConstant(resultInterface, attr.getName(), attr.getType(), attr.getDefaultValue(), ObjectModelModifier.PUBLIC); + } + } + + // interface operations + for (ObjectModelOperation op : interfacez.getOperations()) { + ObjectModelOperation resultOp = addOperation(resultInterface, op.getName(), op.getReturnType()); + for (ObjectModelParameter param : op.getParameters()) { + addParameter(resultOp, param.getType(), param.getName()); + } + for (String exception : op.getExceptions()) { + addException(resultOp, exception); + } + } + } +} Property changes on: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/ObjectModelTransformerToJavaInterface.java ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r1668 - in branches/from2.2.2-eugene2-beta: topia-persistence/src/main/java/org/nuiton/topia/generator topia-soa/src/main/java/org/nuiton/topia/generator topia-ui/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 13, 2009

Nov. 13, 2009

Author: fdesbois Date: 2009-11-13 14:01:01 +0100 (Fri, 13 Nov 2009) New Revision: 1668 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java branches/from2.2.2-eugene2-beta/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java Log: Refactor Generator parent into Template with applyTemplate method instead of generate Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -42,7 +42,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -36,7 +36,6 @@ import java.io.IOException; import java.io.Writer; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelClass; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -40,7 +40,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -36,7 +36,6 @@ import java.io.IOException; import java.io.Writer; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelOperation; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -34,7 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -36,7 +36,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -37,7 +37,6 @@ import java.io.Writer; import java.util.Collection; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelOperation; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -34,7 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -37,7 +37,7 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.nuiton.eugene.Generator; +import org.nuiton.eugene.AbstractGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; @@ -145,7 +145,7 @@ * @param generator le générateur donné * @return le package par défaut du générator donné */ - public static String getDefaultPackage(Generator generator) { + public static String getDefaultPackage(AbstractGenerator<?> generator) { String packageName = generator.getProperty(PROPERTY_DEFAULT_PACKAGE); if (packageName == null || "".equals(packageName)) { packageName = DEFAULT_PACKAGE; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -113,7 +113,7 @@ } @Override - public void generate(ObjectModel model, File destDir) throws IOException { + public void applyTemplate(ObjectModel model, File destDir) throws IOException { //On n'empeche pas la génération si le modèle n'est pas valide validateModel(model); @@ -156,7 +156,7 @@ if(log.isDebugEnabled()) { log.debug("call template : " + generatorClass.getSimpleName()); } - generator.generate(model, destDir); + generator.applyTemplate(model, destDir); } } Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -34,7 +34,7 @@ private static final Log log = LogFactory.getLog(TopiaApplicationServiceMetaGenerator.class); @Override - public void generate(ObjectModel model, File destDir) throws IOException { + public void applyTemplate(ObjectModel model, File destDir) throws IOException { generateApplicationService(model, destDir); @@ -58,7 +58,7 @@ } gen = new ServiceInterfaceGenerator(); gen.setParent(this); - gen.generate(model, destDir); + gen.applyTemplate(model, destDir); // Genere les abstract des services if(log.isDebugEnabled()) { @@ -66,7 +66,7 @@ } gen = new ServiceAbstractGenerator(); gen.setParent(this); - gen.generate(model, destDir); + gen.applyTemplate(model, destDir); // Genere les impl des services if(log.isDebugEnabled()) { @@ -74,7 +74,7 @@ } gen = new ServiceImplGenerator(); gen.setParent(this); - gen.generate(model, destDir); + gen.applyTemplate(model, destDir); } } //TopiaApplicationServiceMetaGenerator Modified: branches/from2.2.2-eugene2-beta/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) +++ branches/from2.2.2-eugene2-beta/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java 2009-11-13 13:01:01 UTC (rev 1668) @@ -73,7 +73,7 @@ * @param destDir le dossier de destination */ @Override - public void generate(StateModel stateModel, File destDir) throws IOException { + public void applyTemplate(StateModel stateModel, File destDir) throws IOException { this.model = stateModel;

1 0

r1667 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 12, 2009

Nov. 12, 2009

Author: fdesbois Date: 2009-11-12 21:29:22 +0100 (Thu, 12 Nov 2009) New Revision: 1667 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java Log: Resolve npe Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-11-12 11:48:05 UTC (rev 1666) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-11-12 20:29:22 UTC (rev 1667) @@ -134,7 +134,7 @@ throws IOException { for (Class<? extends ObjectModelGenerator> generatorClass : DEFAULT_GENERATORS) { ObjectModelGenerator generator; - if (excludeTemplates.contains(generatorClass.getName())) { + if (getExcludeTemplates().contains(generatorClass.getName())) { // exclude generator log.info("exclude generator " + generatorClass); continue;

1 0

r1666 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 12, 2009

Nov. 12, 2009

Author: fdesbois Date: 2009-11-12 12:48:05 +0100 (Thu, 12 Nov 2009) New Revision: 1666 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Log: Add support for array attribute type in Bean/DTO generation Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2009-11-07 17:24:52 UTC (rev 1665) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2009-11-12 11:48:05 UTC (rev 1666) @@ -80,11 +80,15 @@ addInterface(resultClass, parentInterface.getQualifiedName()); } + // Default constructor + ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); + createListeners(resultClass, clazz); boolean hasEntity = false; boolean hasMultipleAttribute = false; - String toStringAppend = ""; + String toStringAppend = ""; // Append pour la méthode toString() + String initTabs = ""; // initialisation des tableaux dans le constructeur // Add attributes with getter/setter for (ObjectModelAttribute attr : attributes) { @@ -96,7 +100,49 @@ String attrNameCapitalized = StringUtils.capitalize(attrName); // multiple attribute - if (GeneratorUtil.isNMultiplicity(attr)) { + if (attr.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ARRAY)) { + + int maxSize = attr.getMaxMultiplicity(); + int maxSizeMoinsUn = maxSize - 1; + + initTabs += "\n\tthis." + attrName + " = new " + attrType + "[" + maxSize + "];"; + + // Set Value + ObjectModelOperation setValue = addOperation(resultClass, "set" + attrNameCapitalized, + "void", ObjectModelModifier.PUBLIC); + addParameter(setValue, "int", "index"); + addParameter(setValue, attrType, "value"); + addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); + setOperationBody(setValue, "" + /*{ + if (index >= <%=maxSize%> || index < 0) { + throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + + "index must be between 0 and <%=maxSizeMoinsUn%>"); + } + <%=simpleType%>[] oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%>[index] = value; + firePropertyChange("<%=attrName%>", oldValue, this.<%=attrName%>); + }*/ + ); + + // Get Value + ObjectModelOperation getValue = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getValue, "int", "index"); + addException(setValue, "java.lang.ArrayIndexOutOfBoundsException"); + setOperationBody(getValue, "" + /*{ + if (index >= <%=maxSize%> || index < 0) { + throw new ArrayIndexOutOfBoundsException("Wrong index [" + index + "] for array <%=attrName%>," + + "index must be between 0 and <%=maxSizeMoinsUn%>"); + } + return this.<%=attrName%>[index]; + }*/ + ); + + attrType += "[]"; + simpleType = GeneratorUtil.getSimpleName(attrType); + } else if (GeneratorUtil.isNMultiplicity(attr)) { hasMultipleAttribute = true; // Add getChild @@ -245,6 +291,13 @@ ); } + // Set body for default constructor + setOperationBody(constructor, "" + /*{ + pcs = new PropertyChangeSupport(this);<%=initTabs%> + }*/ + ); + // Add operations for (ObjectModelOperation op : clazz.getOperations()) { String visibility = op.getVisibility(); @@ -313,14 +366,6 @@ addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); - // Default constructor - ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); - setOperationBody(constructor, "" - /*{ - pcs = new PropertyChangeSupport(this); - }*/ - ); - // Add PropertyListener String propType = "java.beans.PropertyChangeListener"; String strType = String.class.getName(); Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-11-07 17:24:52 UTC (rev 1665) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-11-12 11:48:05 UTC (rev 1666) @@ -73,6 +73,8 @@ public static final String STEREOTYPE_UNIQUE = "unique"; /** Stéréotype pour les attributs étant des clés primaires */ public static final String STEREOTYPE_PRIMARYKAY = "primaryKey"; + /** Stéréotype pour les attributs considérés comme des tableaux */ + public static final String STEREOTYPE_ARRAY = "array"; /** Tag pour le type de persistence */ public static final String TAG_PERSISTENCE_TYPE = "persistenceType"; /** Tag pour le nom du champ / entité en BD */

1 0

r1665 - in branches/from2.2.2-eugene2-beta/topia-persistence: . src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 7, 2009

Nov. 7, 2009

Author: fdesbois Date: 2009-11-07 18:24:52 +0100 (Sat, 07 Nov 2009) New Revision: 1665 Added: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java Log: Deprecated InterfaceGenerator for InterfaceTransformer Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 17:19:52 UTC (rev 1664) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-07 17:24:52 UTC (rev 1665) @@ -141,7 +141,7 @@ <testPhase>true</testPhase> <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceGenerator,org.nuiton.topia.generator.BeanTransformer</templates> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceTransformer,org.nuiton.topia.generator.BeanTransformer</templates> <fullPackagePath>org.nuiton.topia</fullPackagePath> <extractedPackages>org.nuiton.topia</extractedPackages> <defaultPackage>org.nuiton.topia</defaultPackage> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-07 17:24:52 UTC (rev 1665) @@ -18,23 +18,23 @@ /*{generator option: parentheses = true}*/ /*{generator option: writeString = output.write}*/ -/* * -* EntityGenerator.java -* -* Created: 12 déc. 2005 -* -* @author Arnaud Thimel <thimel(a)codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ +/** + * InterfaceGenerator.java + * + * Created: 12 déc. 2005 + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + * @deprecated use InterfaceTransformer template instead + */ package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Generator; import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -48,6 +48,7 @@ import java.util.Collection; import java.util.Set; +@Deprecated public class InterfaceGenerator extends ObjectModelGenerator { //InterfaceGenerator /** Logger for this class */ Added: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java (rev 0) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2009-11-07 17:24:52 UTC (rev 1665) @@ -0,0 +1,64 @@ + +package org.nuiton.topia.generator; + +import java.util.Iterator; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; + +/** + * InterfaceTransformer + * + * Created: 7 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class InterfaceTransformer extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(InterfaceTransformer.class); + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.getStereotypes().isEmpty()) { + // can only generate an interface with there is no other stereotypes + return; + } + + ObjectModelInterface resultInterface = createInterface(interfacez.getName(), interfacez.getPackageName()); + + // extend interface + Iterator<ObjectModelInterface> it = interfacez.getInterfaces().iterator(); + if (it.hasNext()) { + ObjectModelInterface extend = it.next(); + addInterface(resultInterface, extend.getQualifiedName()); + } + + // constant attributes + for (ObjectModelAttribute attr : interfacez.getAttributes()) { + if (!attr.isStatic() && StringUtils.isNotEmpty(attr.getDefaultValue())) { // only static attribut with value + addConstant(resultInterface, attr.getName(), attr.getType(), attr.getDefaultValue(), ObjectModelModifier.PUBLIC); + } + } + + // interface operations + for (ObjectModelOperation op : interfacez.getOperations()) { + ObjectModelOperation resultOp = addOperation(resultInterface, op.getName(), op.getReturnType()); + for (ObjectModelParameter param : op.getParameters()) { + addParameter(resultOp, param.getType(), param.getName()); + } + for (String exception : op.getExceptions()) { + addException(resultOp, exception); + } + } + } +}

1 0

r1664 - in branches/from2.2.2-eugene2-beta: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org Nov. 6, 2009

Nov. 6, 2009

Author: fdesbois Date: 2009-11-06 18:19:52 +0100 (Fri, 06 Nov 2009) New Revision: 1664 Added: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java Modified: branches/from2.2.2-eugene2-beta/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java Log: - Change processor version to interpret Transformer - Add headers for processor - Deprecated BeanGenerator for BeanTransformer Modified: branches/from2.2.2-eugene2-beta/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 17:19:52 UTC (rev 1664) @@ -196,7 +196,7 @@  <eugene.version>2.0.0-beta-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> - <processor.version>1.0.1</processor.version> + <processor.version>1.0.2-SNAPSHOT</processor.version> <i18n.version>1.0.2-SNAPSHOT</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 17:19:52 UTC (rev 1664) @@ -141,7 +141,7 @@ <testPhase>true</testPhase> <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceGenerator,org.nuiton.topia.generator.BeanGenerator</templates> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceGenerator,org.nuiton.topia.generator.BeanTransformer</templates> <fullPackagePath>org.nuiton.topia</fullPackagePath> <extractedPackages>org.nuiton.topia</extractedPackages> <defaultPackage>org.nuiton.topia</defaultPackage> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * BeanGenerator.java * @@ -60,7 +63,9 @@ /** * DTO generator + * @deprecated Use BeanTransformer template instead */ +@Deprecated public class BeanGenerator extends ObjectModelGenerator { /** Added: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java (rev 0) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -0,0 +1,380 @@ +/* + * *##% + * ToPIA - Persistence + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.topia.generator; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.*; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ +/** + * BeanTransformer + * + * Created: 28 oct. 2009 + * + * @author fdesbois + * @version $Revision: 692 $ + * + * Mise a jour: $Date: 2009-11-04 18:41:32 +0100 (mer. 04 nov. 2009) $ + * par : $Author: fdesbois $ + */ +public class BeanTransformer extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(BeanTransformer.class); + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN) && + !clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { + return; + } + + ObjectModelClass resultClass = null; + if (clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { + resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); + } else { + resultClass = createClass(clazz.getName(), clazz.getPackageName()); + } + + List<ObjectModelAttribute> attributes = (List<ObjectModelAttribute>) clazz.getAttributes(); + + createForDTO(resultClass, clazz, attributes); + + // Set superclass + Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + setSuperClass(resultClass, p.getQualifiedName()); + } + + // Add interfaces from inputModel + for (Iterator<ObjectModelInterface> i = clazz.getInterfaces().iterator(); i.hasNext();) { + ObjectModelClassifier parentInterface = i.next(); + addInterface(resultClass, parentInterface.getQualifiedName()); + } + + createListeners(resultClass, clazz); + + boolean hasEntity = false; + boolean hasMultipleAttribute = false; + String toStringAppend = ""; + + // Add attributes with getter/setter + for (ObjectModelAttribute attr : attributes) { + + if (attr.isNavigable() || attr.hasAssociationClass()) { + String attrType = attr.getType(); + String simpleType = GeneratorUtil.getSimpleName(attrType); + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + + // multiple attribute + if (GeneratorUtil.isNMultiplicity(attr)) { + hasMultipleAttribute = true; + + // Add getChild + ObjectModelOperation getChild = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + <%=simpleType%> o = getChild(<%=attrName%>, index); + return o; + }*/ + ); + + // Add getEntity + ObjectModelClass attrEntity = null; + if (getModel().hasClass(attr.getType())) { + attrEntity = getModel().getClass(attr.getType()); + } + boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)); + + if (isEntity) { + hasEntity = true; + ObjectModelOperation getChildEntity = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChildEntity, String.class.getName(), "topiaId"); + setOperationBody(getChildEntity, "" + /*{ + <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); + return o; + }*/ + ); + } + + // Add addChild + ObjectModelOperation addChild = addOperation(resultClass, "add" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(addChild, attrType, attrName); + setOperationBody(addChild, "" + + /*{ + get<%=attrNameCapitalized%>().add(<%=attrName%>); + firePropertyChange("<%=attrName%>", null, <%=attrName%>); + return <%=attrName%>; + }*/ + ); + + // Add removeChild + ObjectModelOperation removeChild = addOperation(resultClass, "remove" + attrNameCapitalized, + "boolean", ObjectModelModifier.PUBLIC); + addParameter(removeChild, attrType, attrName); + setOperationBody(removeChild, "" + + /*{ + boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + if (removed) { + firePropertyChange("<%=attrName%>", <%=attrName%>, null); + } + return removed; + }*/ + ); + + // Change type for Multiple attribute + if (attr.isOrdered()) { + attrType = List.class.getName() + "<" + attrType + ">"; + } else { + attrType = Collection.class.getName() + "<" + attrType + ">"; + } + simpleType = GeneratorUtil.getSimpleName(attrType); + } // end multiple attribute + + if (attr.hasAssociationClass()) { + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + + // Add attribute to the class + String visibility = attr.getVisibility(); + addAttribute(resultClass, attrName, attrType, "", ObjectModelModifier.toValue(visibility)); + + // Add getter operation + ObjectModelOperation getter = addOperation(resultClass, "get" + attrNameCapitalized, attrType, + ObjectModelModifier.PUBLIC); + setOperationBody(getter, "" + /*{ + return this.<%=attrName%>; + }*/ + ); + + // Add setter operation + ObjectModelOperation setter = addOperation(resultClass, "set" + attrNameCapitalized, "void", + ObjectModelModifier.PUBLIC); + addParameter(setter, attrType, "newValue"); + setOperationBody(setter, "" + /*{ + <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%> = newValue; + firePropertyChange("<%=attrName%>", oldValue, newValue); + }*/ + ); + + // toString append for toString method + toStringAppend += "\n\t\t.append(\"" + attrName + "\", this." + attrName + ")"; + + } + } + + // Add helper operations + if (hasMultipleAttribute) { + ObjectModelOperation getChild = addOperation(resultClass, "getChild", "<T> T", + ObjectModelModifier.PROTECTED); + addParameter(getChild, "java.util.Collection<T>", "childs"); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + if (childs != null) { + int i = 0; + for (T o : childs) { + if (index == i) { + return o; + } + i++; + } + } + return null; + }*/ + ); + } + + if (hasEntity) { + ObjectModelOperation getEntity = addOperation(resultClass, "getEntity", + "<T extends org.nuiton.topia.persistence.TopiaEntity> T", ObjectModelModifier.PROTECTED); + addParameter(getEntity, "java.util.Collection<T>", "childs"); + addParameter(getEntity, "java.lang.String", "topiaId"); + setOperationBody(getEntity, "" + /*{ + if (childs != null) { + for (T o : childs) { + if (topiaId.equals(o.getTopiaId())) { + return o; + } + } + } + return null; + }*/ + ); + } + + // Add operations + for (ObjectModelOperation op : clazz.getOperations()) { + String visibility = op.getVisibility(); + ObjectModelOperation resultOperation = addOperation(resultClass, op.getName(), op.getReturnType(), + ObjectModelModifier.toValue(visibility), ObjectModelModifier.ABSTRACT); + + for (ObjectModelParameter param : op.getParameters()) { + addParameter(resultOperation, param.getType(), param.getName()); + } + + for (String exception : op.getExceptions()) { + addException(resultOperation, exception); + } + } + + // Add toString operation + ObjectModelOperation toString = addOperation(resultClass, "toString", "java.lang.String", + ObjectModelModifier.PUBLIC); // FIXME manque Override + addImport(resultClass, "org.apache.commons.lang.builder.ToStringBuilder"); + setOperationBody(toString, "" + /*{ + String result = new ToStringBuilder(this)<%=toStringAppend%>. + toString(); + return result; + }*/ + ); + + } + + private void createForDTO(ObjectModelClass resultClass, ObjectModelClass inputClass, List<ObjectModelAttribute> attributes) { + + // Add Serializable implements for DTO generation + if (!inputClass.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { + return; + + } + + addInterface(resultClass, "java.io.Serializable"); + String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", inputClass, getModel()); + if (svUID != null) { + addConstant(resultClass, "serialVersionUID", "long", svUID, ObjectModelModifier.PUBLIC); + } + + for (ObjectModelDependency dependency : inputClass.getDependencies()) { + ObjectModelClass supplier = (ObjectModelClass)dependency.getSupplier(); + + // ENTITY dependency + // Copy all primitives attributes from the Entity (supplier) to the DTO + // Prepare a list to future generation of all object generated attributes + if (supplier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + if (log.isInfoEnabled()) { + log.info("Create primitive and date fields in DTO from Entity : " + + supplier.getQualifiedName()); + } + for (ObjectModelAttribute attr : supplier.getAttributes()) { + if (TopiaGeneratorUtil.isPrimitiveType(attr) || TopiaGeneratorUtil.isDateType(attr)) { + attributes.add(attr); + } + } + } + } + } + + protected void createListeners(ObjectModelClass resultClass, ObjectModelClass inputClass) { + + addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", + ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); + + // Default constructor + ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); + setOperationBody(constructor, "" + /*{ + pcs = new PropertyChangeSupport(this); + }*/ + ); + + // Add PropertyListener + String propType = "java.beans.PropertyChangeListener"; + String strType = String.class.getName(); + String objectType = Object.class.getName(); + + ObjectModelOperation addPropertyChangeListener = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListener, propType, "listener"); + setOperationBody(addPropertyChangeListener, "" + /*{ + pcs.addPropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation addPropertyChangeListenerPlus = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListenerPlus, strType, "propertyName"); + addParameter(addPropertyChangeListenerPlus, propType, "listener"); + setOperationBody(addPropertyChangeListenerPlus, "" + /*{ + pcs.addPropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListener = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListener, propType, "listener"); + setOperationBody(removePropertyChangeListener, "" + /*{ + pcs.removePropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListenerPlus = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListenerPlus, strType, "propertyName"); + addParameter(removePropertyChangeListenerPlus, propType, "listener"); + setOperationBody(removePropertyChangeListenerPlus, "" + /*{ + pcs.removePropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation firePropertyChange = addOperation(resultClass, + "firePropertyChange", "void", ObjectModelModifier.PROTECTED); + addParameter(firePropertyChange, strType, "propertyName"); + addParameter(firePropertyChange, objectType, "oldValue"); + addParameter(firePropertyChange, objectType, "newValue"); + setOperationBody(firePropertyChange, "" + /*{ + pcs.firePropertyChange(propertyName, oldValue, newValue); + }*/ + ); + } + + +} Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityPOJOGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /******************************************************************************* * DAOHelperGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityPOJOGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityAbstractGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityAbstractGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityAbstractGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityHibernateMappingGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityPOJOGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityGenerator.java * Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 17:19:52 UTC (rev 1664) @@ -15,6 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ +/*{generator option: parentheses = true}*/ +/*{generator option: writeString = output.write}*/ + /* * * EntityGenerator.java *

1 0

r1663 - in branches/from2.2.2-eugene2-beta: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia/generator topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa topia-soa/src/main/java/org/nuiton/topia/generator topia-ui
by fdesbois＠users.nuiton.org Nov. 6, 2009

Nov. 6, 2009

Author: fdesbois Date: 2009-11-06 12:49:14 +0100 (Fri, 06 Nov 2009) New Revision: 1663 Modified: branches/from2.2.2-eugene2-beta/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java branches/from2.2.2-eugene2-beta/topia-ui/pom.xml Log: Evol #122 : EUGene 2 migration Modified: branches/from2.2.2-eugene2-beta/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -14,7 +14,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -194,7 +194,7 @@ <projectId>topia</projectId>  - <eugene.version>1.0.1-SNAPSHOT</eugene.version> + <eugene.version>2.0.0-beta-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> <processor.version>1.0.1</processor.version> <i18n.version>1.0.2-SNAPSHOT</i18n.version> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -139,6 +139,7 @@ <phase>generate-test-sources</phase> <configuration> <testPhase>true</testPhase> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceGenerator,org.nuiton.topia.generator.BeanGenerator</templates> <fullPackagePath>org.nuiton.topia</fullPackagePath> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -61,14 +61,6 @@ */ public class DAOAbstractGenerator extends ObjectModelGenerator { - public DAOAbstractGenerator() { - super(); - } - - public DAOAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAOAbstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -39,14 +39,7 @@ public class DAOGenerator extends ObjectModelGenerator { - public DAOGenerator() { - super(); - } - public DAOGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAO.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -56,14 +56,6 @@ private Log log = LogFactory.getLog(DAOHelperGenerator.class); - public DAOHelperGenerator() { - super(); - } - - public DAOHelperGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForModel(ObjectModel model) { Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -40,14 +40,6 @@ public class DAOImplGenerator extends ObjectModelGenerator { - public DAOImplGenerator() { - super(); - } - - public DAOImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAOImpl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -69,14 +69,6 @@ return true; } - public EntityAbstractGenerator() { - super(); - } - - public EntityAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Abstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -67,14 +67,6 @@ private Map<String, String[]> columnNamesMap = new HashMap<String, String[]>(); - public EntityHibernateMappingGenerator() { - super(); - } - - public EntityHibernateMappingGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { String DOName = TopiaGeneratorUtil.getDOType(clazz, model); Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -45,14 +45,6 @@ private static final Log log = LogFactory.getLog(EntityImplGenerator.class); - public EntityImplGenerator() { - super(); - } - - public EntityImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Impl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -63,14 +63,6 @@ private static final Log log = LogFactory .getLog(EntityInterfaceGenerator.class); - public EntityInterfaceGenerator() { - super(); - } - - public EntityInterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -50,14 +50,6 @@ /** Logger for this class */ private static final Log log = LogFactory.getLog(InterfaceGenerator.class); - public InterfaceGenerator() { - super(); - } - - public InterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -95,13 +95,14 @@ <phase>generate-sources</phase> <id>generate-sources</id> <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>org.nuiton.topia</defaultPackage> <fullPackagePath>org.nuiton.topia</fullPackagePath> <copyVersionDir>${maven.src.dir}/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> + <overwrite>true</overwrite> </configuration> <goals> <goal>zargo2xmi</goal> Modified: branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -101,7 +101,8 @@ <execution> <id>Migration service generator</id> <phase>generate-sources</phase> - <configuration> + <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <fullPackagePath>org.nuiton.topia.migration</fullPackagePath> Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -90,7 +90,8 @@ <execution> <id>generate-sources</id> <phase>generate-sources</phase> - <configuration> + <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>org.nuiton.topia</defaultPackage> Modified: branches/from2.2.2-eugene2-beta/topia-soa/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -112,6 +112,7 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <testPhase>true</testPhase> <fullPackagePath>org.codelutin.soatest</fullPackagePath> <extractedPackages>org.codelutin.soatest</extractedPackages> Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -64,14 +64,6 @@ private static final Log log = LogFactory .getLog(ServiceAbstractGenerator.class); - public ServiceAbstractGenerator() { - super(); - } - - public ServiceAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Abstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -60,14 +60,6 @@ private static final Log log = LogFactory .getLog(ServiceImplGenerator.class); - public ServiceImplGenerator() { - super(); - } - - public ServiceImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar) + "Impl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -81,14 +81,6 @@ // methodes du service <signature methode> private List<String> methods = null; - public ServiceInterfaceGenerator() { - super(); - } - - public ServiceInterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -56,21 +56,24 @@ if(log.isDebugEnabled()) { log.debug("Generating Service Interface"); } - gen = new ServiceInterfaceGenerator(this); + gen = new ServiceInterfaceGenerator(); + gen.setParent(this); gen.generate(model, destDir); // Genere les abstract des services if(log.isDebugEnabled()) { log.debug("Generating Service Abstract"); } - gen = new ServiceAbstractGenerator(this); + gen = new ServiceAbstractGenerator(); + gen.setParent(this); gen.generate(model, destDir); // Genere les impl des services if(log.isDebugEnabled()) { log.debug("Generating Service Impl"); } - gen = new ServiceImplGenerator(this); + gen = new ServiceImplGenerator(); + gen.setParent(this); gen.generate(model, destDir); } Modified: branches/from2.2.2-eugene2-beta/topia-ui/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -83,6 +83,7 @@ <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> + <reader>org.nuiton.eugene.StateModelReader</reader> <testPhase>true</testPhase> <fullPackagePath>org.nuiton.topiauitest</fullPackagePath> <extractedPackages>org.nuiton.topiauitest</extractedPackages>

1 0

r1662 - in branches: . from2.2.2-eugene2-beta
by fdesbois＠users.nuiton.org Nov. 6, 2009

Nov. 6, 2009

Author: fdesbois Date: 2009-11-06 11:55:56 +0100 (Fri, 06 Nov 2009) New Revision: 1662 Added: branches/from2.2.2-eugene2-beta/ Log: Create branche to test EUGene 2 on ToPIA Property changes on: branches/from2.2.2-eugene2-beta ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo +

1 0

r1661 - in trunk: . topia-persistence
by echatellier＠users.nuiton.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 18:53:19 +0100 (Thu, 05 Nov 2009) New Revision: 1661 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml Log: Bad idea slf4j still needed Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-05 17:50:56 UTC (rev 1660) +++ trunk/pom.xml 2009-11-05 17:53:19 UTC (rev 1661) @@ -133,13 +133,13 @@ <scope>runtime</scope> </dependency> -  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.5.8</version> <scope>runtime</scope> - </dependency>--> + </dependency>  <dependency> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2009-11-05 17:50:56 UTC (rev 1660) +++ trunk/topia-persistence/pom.xml 2009-11-05 17:53:19 UTC (rev 1661) @@ -47,10 +47,10 @@ <artifactId>javassist</artifactId> </dependency> -  + </dependency>  <dependency>

1 0

r1660 - trunk
by echatellier＠users.nuiton.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 18:50:56 +0100 (Thu, 05 Nov 2009) New Revision: 1660 Modified: trunk/pom.xml Log: Version 3.9 don't exists Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-05 17:48:39 UTC (rev 1659) +++ trunk/pom.xml 2009-11-05 17:50:56 UTC (rev 1660) @@ -129,7 +129,7 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.9.0.GA</version> + <version>3.8.0.GA</version> <scope>runtime</scope> </dependency>

1 0

r1659 - trunk/topia-persistence
by echatellier＠users.nuiton.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 18:48:39 +0100 (Thu, 05 Nov 2009) New Revision: 1659 Modified: trunk/topia-persistence/pom.xml Log: Comment slf4j Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2009-11-05 17:46:12 UTC (rev 1658) +++ trunk/topia-persistence/pom.xml 2009-11-05 17:48:39 UTC (rev 1659) @@ -47,10 +47,10 @@ <artifactId>javassist</artifactId> </dependency> - <dependency> +   <dependency>

1 0

r1658 - trunk
by echatellier＠users.nuiton.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 18:46:12 +0100 (Thu, 05 Nov 2009) New Revision: 1658 Modified: trunk/pom.xml Log: Use same version a javassist as hibernate Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-05 17:40:13 UTC (rev 1657) +++ trunk/pom.xml 2009-11-05 17:46:12 UTC (rev 1658) @@ -129,23 +129,23 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> + <version>3.9.0.GA</version> <scope>runtime</scope> </dependency> -  +   <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.117</version> + <version>1.1.119</version> <scope>test</scope> </dependency>

1 0

r1657 - trunk
by echatellier＠users.nuiton.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 18:40:13 +0100 (Thu, 05 Nov 2009) New Revision: 1657 Modified: trunk/pom.xml Log: Fix slf4j-log4j12 version (same as api) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:46:15 UTC (rev 1656) +++ trunk/pom.xml 2009-11-05 17:40:13 UTC (rev 1657) @@ -137,7 +137,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> + <version>1.5.8</version> <scope>runtime</scope> </dependency>

1 0

r1656 - trunk
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:46:15 +0100 (Mon, 02 Nov 2009) New Revision: 1656 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:35:16 UTC (rev 1655) +++ trunk/pom.xml 2009-11-02 03:46:15 UTC (rev 1656) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> @@ -9,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>topia</artifactId> @@ -242,7 +243,7 @@ <version>${i18n.version}</version> </plugin> - <plugin> + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency>

1 0

r1655 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa topia-ui
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:35:16 +0100 (Mon, 02 Nov 2009) New Revision: 1655 Modified: trunk/ trunk/topia-persistence/ trunk/topia-service-history/ trunk/topia-service-index/ trunk/topia-service-migration/ trunk/topia-service-replication/ trunk/topia-service-security/ trunk/topia-soa/ trunk/topia-ui/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - topia2.ipr .classpath *.iml .project target topia.ipr topia.iws THIRD-PARTY.txt .settings + *.ipr *.iws .classpath *.iml .project target .settings Property changes on: trunk/topia-persistence ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project + target .settings .classpath .project *.iml *.ipr *.iws Property changes on: trunk/topia-service-history ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws Property changes on: trunk/topia-service-index ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.iml *.ipr *.iws Property changes on: trunk/topia-service-migration ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.iml *.ipr *.iws Property changes on: trunk/topia-service-replication ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.iml *.ipr *.iws Property changes on: trunk/topia-service-security ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws Property changes on: trunk/topia-soa ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.iml *.ipr *.iws Property changes on: trunk/topia-ui ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.iml *.ipr *.iws

1 0