October 2008 - Topia-commits - mailman.cloud.codelutin.com

r1202 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 30, 2008

Oct. 30, 2008

Author: chatellier Date: 2008-10-30 14:41:05 +0000 (Thu, 30 Oct 2008) New Revision: 1202 Modified: topia/trunk/pom.xml Log: Force javassist optionnal dep for hibernate. (pb with javassist in tapestry ?) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-29 11:27:30 UTC (rev 1201) +++ topia/trunk/pom.xml 2008-10-30 14:41:05 UTC (rev 1202) @@ -44,6 +44,11 @@ <version>3.3.1.GA</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency>  <dependency>

1 0

r1201 - topia/trunk/src/main/java/org/codelutin/topia/service/servers
by chatellier＠users.labs.libre-entreprise.org Oct. 29, 2008

Oct. 29, 2008

Author: chatellier Date: 2008-10-29 11:27:30 +0000 (Wed, 29 Oct 2008) New Revision: 1201 Modified: topia/trunk/src/main/java/org/codelutin/topia/service/servers/XMLRPCServer.java Log: Correct javadoc Modified: topia/trunk/src/main/java/org/codelutin/topia/service/servers/XMLRPCServer.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/service/servers/XMLRPCServer.java 2008-10-29 11:02:20 UTC (rev 1200) +++ topia/trunk/src/main/java/org/codelutin/topia/service/servers/XMLRPCServer.java 2008-10-29 11:27:30 UTC (rev 1201) @@ -41,7 +41,7 @@ import org.codelutin.topia.service.TopiaServiceServerAbstract; /** - * XMLRPCServer.java + * XMLRPCServer. * * @author chatellier * @version $Revision$ @@ -67,6 +67,8 @@ * Constructeur. * * Initialise le serveur. + * + * @param port port de lancement du serveur */ public XMLRPCServer(int port) { webServer = new WebServer(port); @@ -153,7 +155,7 @@ } // construit et retourne des maps pour les objets complexes qui ne sont - // pas support�s par XML-RPC + // pas supportés par XML-RPC if (result instanceof List) { result = listToMap((List) result); } else if (result instanceof TopiaEntity) { @@ -166,23 +168,23 @@ } /** - * Construit et retourne une map de "maps entit�", cl� : TopiaId de - * l'entit�, valeur : Map de l'entit� + * Construit et retourne une map de "maps entité", clé : TopiaId de + * l'entité, valeur : Map de l'entité * - * @see entityToMap(E entity) + * @see #entityToMap(E entity) * @param <E> - * la classe �tendant TopiaEntity + * la classe étendant TopiaEntity * @param list * la liste de TopiaEntity - * @return une map contenant les maps cl� : TopiaId de l'entit�, valeur : - * Map des champs de l'entit� + * @return une map contenant les maps clé : TopiaId de l'entité, valeur : + * Map des champs de l'entité */ private <E extends TopiaEntity> Map listToMap(List<E> list) { - // construire la map contenant les entit�s - // cl� TopiaId, valeur :Map des attributs de l'entit� + // construire la map contenant les entités + // cl� TopiaId, valeur :Map des attributs de l'entité Map<String, Map<String, Object>> resultMap = new HashMap<String, Map<String, Object>>(); for (E entity : list) { - // ajouter la map de l'entit� + // ajouter la map de l'entité Map<String, Object> entityMap = entityToMap(entity); resultMap.put(entity.getTopiaId(), entityMap); } @@ -190,14 +192,14 @@ } /** - * Construit et retourne une map pour l'entit�, cl� : nom du champ, valeur : - * contenu du champ (si c'est une entit�, on met le TopiaId de celle ci, si - * c'est une liste d'entit�s, on met un tableau de TopiaId) + * Construit et retourne une map pour l'entité, clé : nom du champ, valeur : + * contenu du champ (si c'est une entité, on met le TopiaId de celle ci, si + * c'est une liste d'entités, on met un tableau de TopiaId) * * @param <E> - * la classe �tendant TopiaEntity + * la classe étendant TopiaEntity * @param entity - * l'entit� + * l'entité * @return une map */ private <E extends TopiaEntity> Map entityToMap(E entity) {

1 0

r1200 - in topia/trunk: . src/main/java/org/codelutin/topia/persistence
by tchemit＠users.labs.libre-entreprise.org Oct. 29, 2008

Oct. 29, 2008

Author: tchemit Date: 2008-10-29 11:02:20 +0000 (Wed, 29 Oct 2008) New Revision: 1200 Modified: topia/trunk/changelog topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaDAODelegator.java Log: fix infinitive recursion on method findByPrimaryKey and findByProperty in TopiaDAODeleagtor class Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-10-28 18:14:57 UTC (rev 1199) +++ topia/trunk/changelog 2008-10-29 11:02:20 UTC (rev 1200) @@ -1,4 +1,5 @@ ver-2-0-28 ?? 2008?? + * 20081029 [chemit] fix infinitive recursion on method findByPrimaryKey and findByProperty in TopiaDAODeleagtor class * 20081026 [chemit] add dbName of table if explicit in javadoc * 20081024 [chemit] fix bug when no entity defined in model Modified: topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaDAODelegator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaDAODelegator.java 2008-10-28 18:14:57 UTC (rev 1199) +++ topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaDAODelegator.java 2008-10-29 11:02:20 UTC (rev 1200) @@ -161,7 +161,7 @@ * @see org.codelutin.topia.TopiaDAO#findByPrimaryKey(java.lang.Object...) */ public Entity findByPrimaryKey(Object... k) throws TopiaException { - return findByPrimaryKey(k); + return getParentDAO().findByPrimaryKey(k); } /* (non-Javadoc) @@ -169,7 +169,7 @@ */ public Entity findByProperty(String propertyName, Object value) throws TopiaException { - return findByProperty(propertyName, value); + return getParentDAO().findByProperty(propertyName, value); } /* (non-Javadoc)

1 0

r1199 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Oct. 28, 2008

Oct. 28, 2008

Author: tchemit Date: 2008-10-28 18:14:57 +0000 (Tue, 28 Oct 2008) New Revision: 1199 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: improve EntityProviderGenerator (now getCache is public on a unmodifiable Map. Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-28 14:32:44 UTC (rev 1198) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-28 18:14:57 UTC (rev 1199) @@ -98,7 +98,7 @@ return (Class<E>) getCache().get(klazz); } - protected static java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> getCache() { + public static java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> getCache() { if (cache == null) { initCache(); } @@ -106,7 +106,7 @@ } private static void initCache() { - cache = new java.util.HashMap<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>>(); + java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache = new java.util.HashMap<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>>(); for (Class<? extends TopiaEntity> entitiesClas : entitiesClass) { String implFQN = entitiesClas.getName() + "Impl"; try { @@ -115,8 +115,8 @@ } catch (ClassNotFoundException e) { throw new RuntimeException("could not find entity implementation class " + implFQN); } - } + <%=model.getName()%>EntityProvider.cache = java.util.Collections.unmodifiableMap(cache); } /**

1 0

r1198 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 28, 2008

Oct. 28, 2008

Author: chatellier Date: 2008-10-28 14:32:44 +0000 (Tue, 28 Oct 2008) New Revision: 1198 Modified: topia/trunk/pom.xml Log: Hibernate is on central repo now Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-25 23:17:56 UTC (rev 1197) +++ topia/trunk/pom.xml 2008-10-28 14:32:44 UTC (rev 1198) @@ -186,18 +186,6 @@    - - <repositories> -  - <repository> - <id>jboss-repository</id> - <url>http://repository.jboss.com/maven2</url> - </repository> - </repositories> - -  -  -  <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection>

1 0

r1197 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 25, 2008

Oct. 25, 2008

Author: tchemit Date: 2008-10-25 23:17:56 +0000 (Sat, 25 Oct 2008) New Revision: 1197 Modified: topia/trunk/changelog Log: add dbName of table if explicit in javadoc Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-10-25 23:15:44 UTC (rev 1196) +++ topia/trunk/changelog 2008-10-25 23:17:56 UTC (rev 1197) @@ -1,4 +1,8 @@ -ver-2-0-27 ?? 2008?? +ver-2-0-28 ?? 2008?? + * 20081026 [chemit] add dbName of table if explicit in javadoc + * 20081024 [chemit] fix bug when no entity defined in model + +ver-2-0-27 chemit 20081021 * 20081021 [chemit] clean pom, use lutingenerator 0.60 * 20080922 [thimel] Switched to lutinproject 3.0 * 20080922 [thimel] Sources are correctly maven2 structuted (src/main/xxx)

1 0

r1196 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Oct. 25, 2008

Oct. 25, 2008

Author: tchemit Date: 2008-10-25 23:15:44 +0000 (Sat, 25 Oct 2008) New Revision: 1196 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: add dbName of table if explicit in javadoc Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-10-24 12:22:35 UTC (rev 1195) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-10-25 23:15:44 UTC (rev 1196) @@ -96,7 +96,16 @@ /** * Implantation POJO pour l'entité <%=Util.capitalize(clazz.getName())%>. - *) +}*/ + { +String dbName = clazz.getTagValue(GeneratorUtil.TAG_DB_NAME); + if (dbName!=null) { +/*{ * + * <p>Nom de l'entité en BD : <%=dbName%>.</p> +}*/ + } + } +/*{ *) public abstract class <%=clazz.getName()%>Abstract extends }*/ String extendClass = ""; for (Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) { @@ -153,7 +162,7 @@ }*/ } if (dbName != null) { -/*{ * Nom de l'attribut en BD : <%=attr.getTagValue(GeneratorUtil.TAG_DB_NAME)%>. +/*{ * Nom de l'attribut en BD : <%=dbName%>. }*/ } /*{ *)

1 0

r1195 - topia/trunk/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org Oct. 24, 2008

Oct. 24, 2008

Author: chatellier Date: 2008-10-24 12:22:35 +0000 (Fri, 24 Oct 2008) New Revision: 1195 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Remove comment Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-23 22:00:44 UTC (rev 1194) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-24 12:22:35 UTC (rev 1195) @@ -25,6 +25,8 @@ * * Mise a jour: $Date$ * par : $Author$ +* Mise a jour: $Date$ +* par : $Author$ */ package org.codelutin.topia.generator; @@ -323,12 +325,7 @@ String cascade = ""; if (attr.isComposite() || attr.hasAssociationClass()) { cascade += "cascade=\"all,delete-orphan\""; - - // 20071123 : dans le cas d'une relation composite, jamais d'inverse - // 20080407 : probleme lors du save d'entité abstraite - //isInverse = false; } - //cascade += ""; String lazy = "lazy=\""; if (attr.getTagValue("lazy") != null){

1 0

r1194 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Oct. 23, 2008

Oct. 23, 2008

Author: tchemit Date: 2008-10-23 22:00:44 +0000 (Thu, 23 Oct 2008) New Revision: 1194 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java Log: fix bug when no entity defined in model + improve and clean code Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:44 UTC (rev 1194) @@ -85,7 +85,6 @@ if (model.getClasses().isEmpty()) { /*{ public static final String entitiesList = ""; - public static final Class [] entitiesClasses = new Class []{}; }*/ } else { /*{

1 0

r1193 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Oct. 23, 2008

Oct. 23, 2008

Author: tchemit Date: 2008-10-23 22:00:21 +0000 (Thu, 23 Oct 2008) New Revision: 1193 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: fix bug when no entity defined in model + improve and clean code Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -80,38 +80,38 @@ public class <%=model.getName()%>DAOHelper { +}*/ + String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + public static final String entitiesList = ""; + public static final Class [] entitiesClasses = new Class []{}; +}*/ + } else { +/*{ public static final String entitiesList = "" + }*/ - String entitiesList = ""; - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); + + for (Iterator i=model.getClasses().iterator(); i.hasNext();) { + ObjectModelClass clazz = (ObjectModelClass)i.next(); + if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ "<%=GeneratorUtil.getDOType(clazz, model)%><%=(i.hasNext()?",\" +":"\";")%> }*/ + } } } -// log.info("Full entities list : " + entitiesList); -/* - public static final Class [] entitiesClasses = new Class []{ - */ - //for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - // ObjectModelClass clazz = (ObjectModelClass)i.next(); - // if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ -/* <%=GeneratorUtil.getDOType(clazz, model)%>.class, -*/ - // } - //} -// }; - + if (log.isDebugEnabled()) { + log.debug("Full entities list : " + entitiesList); + } /*{ /** *) protected <%=model.getName()%>DAOHelper() { } }*/ - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + for (ObjectModelClass objectModelClass : model.getClasses()) { + ObjectModelClass clazz = objectModelClass; + if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)) { /*{ static public <%=clazz.getQualifiedName()%>DAO get<%=clazz.getName()%>DAO(TopiaContext context) throws TopiaException { TopiaContextImplementor ci = (TopiaContextImplementor)context; @@ -126,4 +126,4 @@ }*/ } -} // DAOGenerator +} // DAOHelperGenerator Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -37,10 +37,12 @@ import org.codelutin.generator.models.object.ObjectModelClass; /** - * Ce generateur permet d'avoir une classe permettant de recuperer les DAO - * sans cast. - * @author poussin + * Ce generateur permet d'avoir les implantations des entites concretes a partir des + * interfaces des entites de maniere dynamique (i.e qu'on n'aura pas dans cette classe + * les classes desces implantations) : ceci permet la modularite. * + * @author chemit + * */ public class EntityProviderGenerator extends ObjectModelGenerator { @@ -68,20 +70,25 @@ /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; -import java.util.Map; @SuppressWarnings({"unchecked"}) public class <%=model.getName()%>EntityProvider { protected static java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache; - protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ }*/ - String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{}; +}*/ + } else { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ +}*/ + } for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ <%=clazz.getQualifiedName()%>.class<%=(i.hasNext()?", ":"\n};")%> }*/ } @@ -111,6 +118,7 @@ } } + /** * should have no instance *) @@ -120,4 +128,4 @@ }*/ } -} // DAOGenerator +} // EntityPoviderGenerator

1 0