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

r1283 - topia/trunk/topia-persistence/src/site/rst
by ruchaud＠users.labs.libre-entreprise.org Dec. 19, 2008

Dec. 19, 2008

Author: ruchaud Date: 2008-12-19 13:23:10 +0000 (Fri, 19 Dec 2008) New Revision: 1283 Added: topia/trunk/topia-persistence/src/site/rst/howto.rst Log: Document pour la prise en main de Topia Added: topia/trunk/topia-persistence/src/site/rst/howto.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/howto.rst (rev 0) +++ topia/trunk/topia-persistence/src/site/rst/howto.rst 2008-12-19 13:23:10 UTC (rev 1283) @@ -0,0 +1,244 @@ +How to +====== + +Ce document a pour objectif de prendre en main le framework Topia. Le document +est constitué de 4 parties, la modèlisation, la génération, la configuration et +l'utilisation. + +Modélisation +------------ + +La première étape constiste à réaliser le modèle UML soit avec Argouml +(http://argouml.tigris.org) soit avec Poséidon (http://www.gentleware.com) + +Le stérotype «entity» sur les classes permet de préciser que la classe est +persister par Topia. D'autre stérotypes (extern, service, ...) sont disponiples +mais ne sont pas présenté. + +Le fichier de modélisation peut être compléter par un fichier de configuration +nommé <nom fichier modélisation>.properties. Il contient des informations +techniques propres au librairie utilisé par Topia. + +Exemple : + +# Précise comment est mappé un type +# model.tagvalue.<type java>=<type base de donnée> +model.tagvalue.java.lang.String=text + +# Précise le schema de la base de données par défaut +# model.tagvalue.dbSchema=<nom schéma> +model.tagvalue.dbSchema=test + +# Précise l'entête de l'ensemble des fichiers générés +# model.tagvalue.copyright=<valeur> +model.tagvalue.copyright=/* *##%\n Copyright (C) 2007 Code Lutin\n *##% */ + +# Force le chargement d'un attribut +# <nom paquetage>.<nom entité>.attribute.<nom attribut>.tagvalue.lazy=false +org.codelutin.Person.attribute.association.tagvalue.lazy=false + +Génération +---------- + +La génération des fichiers Topia se font par l'utilisation d'un plugin maven. +Le plugin est disponnible sur le repository maven de Code Lutin à l'adresse +suivante http://lutinbuilder.labs.libre-entreprise.org/maven2. + +Configuration du plugin maven : + +<plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>0.63</version> + <executions> + <execution> + <phase>process-sources</phase> +  + <configuration> + <addCompileDirectory>true</addCompileDirectory> + <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>org.codelutin</defaultPackage> + <extractedPackages>org.codelutin</extractedPackages> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>2.1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</plugin> + +Le plugin utilise lutin generator avec les templates de génération de Topia, le +fichier argouml ou poséidon doit se trouver dans le répertoire +${maven.src.dir}/main/xmi. Les fichiers sont générés dans le répertoire +${maven.gen.dir}/java. Il faut préciser au plugin les paquetages à traiter avec +le defaultPackage et extractedPackages. + +Ajout dans des dépendances de Topia pour la compilation des fichiers générés : + +<dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>2.1.1</version> + <scope>compile</scope> +</dependency> + +Pour une classe modélisé, nous retrouvons 6 fichiers : + * Une interface + * Une classe abstraite + * Une implantation + * Une configuration hibernate + * Un DAO abstrait + * Une implantation du DAO + +Une classe Helper est aussi générée, permettant l'accès à l'ensemble des DAO. + +Configuration +------------- + +Un fichier contenant les informations de connexion à la base de données et de +configuration de Topia doit être créé au niveau des ressources du projet. + +Exemple : + +# Permet la création, la modification, ou pas automatique de la base de données +# [create | update | none] +hibernate.hbm2ddl.auto=update + +# Affichage des requêtes dans la console +# [true | false] +hibernate.show_sql=false + +# Permet de préciser les classes à persister +topia.persistence.classes=org.codelutin.Person, org.codelutin.Pet + +# Informations de connection : + +# Dialect à utiliser +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect + +# Driver JDBC +hibernate.connection.driver_class=org.postgresql.Driver + +# URL de connection +hibernate.connection.url=jdbc:postgresql://localhost/mydb + +# Login de l'utilisateur qui se connecte +hibernate.connection.username=user + +# Mot de passe de l'utilisateur +hibernate.connection.password=xxxx + +Utilisation +----------- + +Implantation des méthodes +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Si des méthodes ont été définis dans le modèle de données il faut créer +l'implantation correspondante. Le paquetage doit porter le même nom que celui de +la génération. + +Gestion des transactions +~~~~~~~~~~~~~~~~~~~~~~~~ + +>>> Properties conf = Resource.getConfigProperties("/TopiaContext.properties"); + +Permet de charger un fichier contenant les informations de connexion à la base +et de configuration de Topia. + +>>> TopiaContext rootContext = TopiaContextFactory.getContext(conf); + +Récupère le context de départ pour la création de sous context pour la gestion +des entités. + +>>> TopiaContext transaction = rootContext.beginTransaction(); + +Création d'un sous context pour la gestion des entités. + +>>> transaction.commitTransaction(); + +Validation de l'état du context, les modifications des entités sont reportées +dans la base de données. + +>>> transaction.rollBackTransaction(); + +Invalidation de l'état du context, les modifications des entités ne sont pas +reportées dans la base de données. + +>>> transaction.closeContext(); + +Relâche la connexion JDBC d'un sous context et de ses sous contexts sans +validation de l'état des contexts. + +>>> rootContext.closeContext(); + +Relâche l'ensemble des ressources (cache, pools, ...) et relâche la connexion +JDBC des sous contexts avec validation de l'état des contexts. + +Manipulation des entités +~~~~~~~~~~~~~~~~~~~~~~~~ + +>>> PersonDAO personDAO = <nom modele>Helper.getPersonDAO(transaction); + +Récupération d'un DAO pour accéder à une entité. + +>>> Person person = personDAO.findByTopiaId(id); + +Les méthodes find permettent de récupérer une ou plusieurs selon différents +critères. + +>>> person.setName("tutu"); + +Manipulation de l'entité par les getters et setters. + +>>> Person person = personDAO.create(); + +Création d'une entité. Si vous utilisez l'instanciation classique java avec le +new, l'entité n'est pas persistée. + +>>> personDAO.update(person); + +Modification d'un entité. + +>>> personDAO.delete(person); + +Suppression d'une entité. + +Exemple +~~~~~~~ + +Properties conf = Resource.getConfigProperties("/TopiaContext.properties"); +TopiaContext rootContext = TopiaContextFactory.getContext(conf); + +TopiaContext transaction = rootContext.beginTransaction(); +PersonDAO personDAO = ModelHelper.getPersonDAO(transaction); + +Person person = personDAO.create(); +person.set...(...); +person.set...(...); +personDAO.update(person); + +person.get...(...); +person.get...(...); + +personDAO.delete(person); + +transaction.commitTransaction(); +transaction.closeContext(); + +rootContext.closeContext();

1 0

r1282 - in topia/trunk/topia-persistence/src/main/java/org/codelutin/topia: event framework persistence persistence/hibernate
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2008

Dec. 17, 2008

Author: chatellier Date: 2008-12-17 13:08:56 +0000 (Wed, 17 Dec 2008) New Revision: 1282 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesVetoable.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImplementor.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAO.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaId.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java Log: Fix javadoc Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesVetoable.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesVetoable.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesVetoable.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -30,6 +30,6 @@ */ public interface TopiaEntitiesVetoable extends EventListener { - public <E extends TopiaEntity> List<E> load(TopiaEntitiesEvent event); + public <E extends TopiaEntity> List<E> load(TopiaEntitiesEvent<E> event); } Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImplementor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImplementor.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImplementor.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -93,7 +93,7 @@ * * @param <E> * @param entityClass - * @return + * @return a doa * @throws TopiaException */ public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAO.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAO.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAO.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -37,8 +37,6 @@ import org.codelutin.topia.TopiaException; import org.codelutin.topia.event.TopiaEntityListener; import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.event.TopiaTransactionVetoable; import org.codelutin.topia.framework.TopiaContextImplementor; /** @@ -50,16 +48,18 @@ /** * When TopiaContextImpl create the TopiaDAOHibernate, it must call this method just - * after + * after. * - * @param entityClass + * @param context context + * @param entityClass entity class + * @throws TopiaException */ public void init(TopiaContextImplementor context, Class<Entity> entityClass) throws TopiaException; /** * Return class of entity managed by this DAO - * @return + * @return entity managed by this DAO */ public abstract Class<Entity> getEntityClass(); @@ -69,14 +69,21 @@ public abstract TopiaContextImplementor getContext(); /** - * appelé lorsque le context a eu un commit de fait + * Appelé lorsque le context a eu un commit de fait. + * * TODO il faudrait peut-etre plutot faire un commit a deux phase * car plusieurs type de persistence peuvent etre melangé, et il * serait bien que si l'une echoué les autres echoue aussi. + * + * @throws TopiaException */ public void commitTransaction() throws TopiaException; - /** appelé lorsque le context a eu un commit de fait */ + /** + * Appelé lorsque le context a eu un rollback de fait. + * + * @throws TopiaException + */ public void rollbackTransaction() throws TopiaException; /** @@ -122,7 +129,7 @@ /** * TODO modifier l'implantation pour faire un simple count sur la base * - * @return + * @return la taille de ? * @throws TopiaException */ public abstract int size() throws TopiaException; @@ -132,7 +139,7 @@ * cle naturelle est une entre de la map passe en argument. * * @param keys la liste des champs de la cle naturelle avec leur valeur - * @return + * @return l'entite trouvé * @throws TopiaException */ public abstract Entity findByPrimaryKey(Map<String, Object> keys) @@ -144,7 +151,7 @@ * dans l'ordre de declaration dans le fichier de mapping * * @param k l'objet cle naturelle de la classe - * @return + * @return l'entité trouvé * @throws TopiaException */ public abstract Entity findByPrimaryKey(Object... k) throws TopiaException; @@ -158,7 +165,7 @@ * @param value * @param others les autres proprietes doivent aller par 2 propertyName, * value - * @return + * @return l'entité trouvé * @throws TopiaException */ public abstract Entity findByProperties(String propertyName, Object value, @@ -176,7 +183,7 @@ * @param value * @param others les autres proprietes doivent aller par 2 propertyName, * value - * @return + * @return l'entité trouvé * @throws TopiaException */ public abstract List<Entity> findAllByProperties(String propertyName, @@ -191,6 +198,10 @@ /** * Cherche et renvoie la première entité trouvée dont les propriétés en clé * de Map contiennent toutes les valeurs de la Collection. + * + * @param properties + * @return l'entité trouvé + * @throws TopiaException */ public abstract Entity findContainsProperties( Map<String, Collection> properties) throws TopiaException; @@ -198,6 +209,12 @@ /** * Cherche et renvoie la première entité trouvée dont la propriété * propertyName contient values, ainsi de suite avec others. + * + * @param propertyName + * @param values + * @param others + * @return l'entité trouvé + * @throws TopiaException */ public abstract Entity findContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException; @@ -205,6 +222,10 @@ /** * Cherche et renvoie la première entité trouvée dont les propriétés en clé * de Map contiennent toutes les valeurs de la Collection. + * + * @param properties + * @return l'entité trouvé + * @throws TopiaException */ public abstract List<Entity> findAllContainsProperties( Map<String, Collection> properties) throws TopiaException; @@ -212,14 +233,23 @@ /** * Cherche et renvoie toutes les entités trouvées dont la propriété * propertyName contient values, ainsi de suite avec others. + * + * @param propertyName + * @param values + * @param others + * @return l'entité trouvé + * @throws TopiaException */ public abstract List<Entity> findAllContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException; /** - * Retourne les permissions a verifier pour l'acces a l'entite pour le service Taas + * Retourne les permissions a verifier pour l'acces a l'entite pour le service Taas. + * * @param topiaId topiaId d'une entite + * @param actions * @return la liste des permissions + * @throws TopiaException */ public List<Permission> getRequestPermission(String topiaId, int actions) throws TopiaException; Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -60,7 +60,7 @@ public Date getTopiaCreateDate(); /** - * @param topiaCreateTime The topiaCreateTime to set. + * @param topiaCreatedate the topiaCreateTime to set. */ public void setTopiaCreateDate(Date topiaCreatedate); Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaId.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaId.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaId.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -73,6 +73,9 @@ /** * Cree un topiaId pour une certaine classe + * + * @param clazz + * @return a generated topiaId */ public static String create(Class clazz) { if (!clazz.isInterface()) { @@ -88,9 +91,12 @@ } /** - * Extrait la classe du topiaId - * @throws ClassNotFoundException - */ + * Extrait la classe du topiaId. + * + * @param topiaId + * @return class + * @throws TopiaNotFoundException + */ public static Class getClassName(String topiaId) throws TopiaNotFoundException { String classname = getClassNameAsString(topiaId); @@ -105,10 +111,10 @@ /** * Return class name id topiaId is id, and empty string if topiaId is - * not an id + * not an id. * * @param topiaId - * @return + * @return class name */ public static String getClassNameAsString(String topiaId) { String result = ""; @@ -122,7 +128,10 @@ /** * Verifie si l'id passé en paramètre est bien un Id topia, c-a-d si la * forme est bien classname#timemillis#random et si le classname est - * celui d'une classe valide, c-a-d que le systeme arrive a trouver + * celui d'une classe valide, c-a-d que le systeme arrive a trouver. + * + * @param topiaId + * @return is valid topiaId */ public static boolean isValidId(String topiaId) { try { Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-12-17 11:20:34 UTC (rev 1281) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-12-17 13:08:56 UTC (rev 1282) @@ -506,7 +506,6 @@ } /** - * @see EntityPersister#getCache() */ public CacheConcurrencyStrategy getCache() { return null;

1 0

r1281 - topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2008

Dec. 17, 2008

Author: chatellier Date: 2008-12-17 11:20:34 +0000 (Wed, 17 Dec 2008) New Revision: 1281 Modified: topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java Log: Correction de la javadoc Modified: topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java =================================================================== --- topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2008-12-17 11:17:45 UTC (rev 1280) +++ topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2008-12-17 11:20:34 UTC (rev 1281) @@ -367,7 +367,7 @@ * ContactListPage -> clp * * @param name - * @return + * @return hashed state name */ protected String getHashStateName(String name) {

1 0

r1280 - in topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service: . servers
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2008

Dec. 17, 2008

Author: chatellier Date: 2008-12-17 11:17:45 +0000 (Wed, 17 Dec 2008) New Revision: 1280 Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationService.java topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceAbstract.java topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServerAbstract.java topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RemoteClassLoader.java Log: Correction de la javadoc Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationService.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationService.java 2008-12-17 11:01:34 UTC (rev 1279) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationService.java 2008-12-17 11:17:45 UTC (rev 1280) @@ -44,7 +44,6 @@ /** * Detruit le service - * @param context */ public void destroy(); } Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceAbstract.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceAbstract.java 2008-12-17 11:01:34 UTC (rev 1279) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceAbstract.java 2008-12-17 11:17:45 UTC (rev 1280) @@ -45,8 +45,6 @@ /** * Detruit le service - * - * @param context */ public void destroy() { } Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServerAbstract.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServerAbstract.java 2008-12-17 11:01:34 UTC (rev 1279) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServerAbstract.java 2008-12-17 11:17:45 UTC (rev 1280) @@ -47,12 +47,8 @@ /** * Disptach * - * @param className - * la classe - * @param methodName - * le nom de la methode - * @param args - * les arguments + * @param method la methode + * @param args les arguments * @return le resultat de l'appel */ protected Object invoke(Method method, Object[] args) { Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RemoteClassLoader.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RemoteClassLoader.java 2008-12-17 11:01:34 UTC (rev 1279) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RemoteClassLoader.java 2008-12-17 11:17:45 UTC (rev 1280) @@ -74,9 +74,6 @@ /** * Constructeur - * - * @param clazz - * la classes a convertir */ protected RemoteClassLoader() { }

1 0

r1279 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework
by chatellier＠users.labs.libre-entreprise.org Dec. 17, 2008

Dec. 17, 2008

Author: chatellier Date: 2008-12-17 11:01:34 +0000 (Wed, 17 Dec 2008) New Revision: 1279 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: Add child context into child after hibernate initilialisation. Replace hibernate deprecated code. Replace some warningazed code. Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-12-15 09:46:19 UTC (rev 1278) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-12-17 11:01:34 UTC (rev 1279) @@ -41,7 +41,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.Enumeration; @@ -259,12 +258,14 @@ public Map<String, TopiaService> getServices() { TopiaContextImplementor parent = getParentContext(); + + Map<String, TopiaService> result = null; if (parent != null) { - return parent.getServices(); + result = parent.getServices(); } else { - return services; + result = services; } - + return result; } protected boolean serviceEnabled(String name) { @@ -533,12 +534,12 @@ TOPIA_PERSISTENCE_CLASSES, ""); for (TopiaService service : getAllServices()) { - Class[] persistenceClasses = service + Class<?>[] persistenceClasses = service .getPersistenceClasses(); // certains service n'ont pas de classe persistantes if (persistenceClasses != null) { - for (Class clazz : persistenceClasses) { + for (Class<?> clazz : persistenceClasses) { hibernateConfiguration.addClass(clazz); } } @@ -548,7 +549,7 @@ for (String classname : classes) { classname = classname.trim(); if (!"".equals(classname)) { - Class clazz; + Class<?> clazz; try { clazz = Class.forName(classname); } catch (ClassNotFoundException eee) { @@ -602,7 +603,7 @@ + " doute oublié d'ajouter son mapping"); } - TopiaDAO<E> result = (TopiaDAO<E>) daoCache.get(entityClass); + TopiaDAO<E> result = daoCache.get(entityClass); if (result == null) { // recherche du type de DAO a instancier pour cette entity String defaultDAOClassname = getConfig().getProperty( @@ -659,13 +660,12 @@ checkClosed("Ce contexte a ete ferme, impossible de commencer une transaction"); TopiaContextImpl result = new TopiaContextImpl(this); - addChildContext(result); SessionFactory factory = getHibernateFactory(); result.hibernate = factory.openSession(); // new TopiaInterceptor(result)); // on ne synchronise jamais les données avec la base tant que // l'utilisateur n'a pas fait de commit du context - result.hibernate.setFlushMode(FlushMode.NEVER); + result.hibernate.setFlushMode(FlushMode.MANUAL); // 20060926 poussin ajouter pour voir si ca regle les problemes de deadlock h2 // Conclusion, il faut bien ouvrir une transaction maintenant, sinon @@ -674,7 +674,12 @@ // de lock sur les tables. result.hibernate.beginTransaction(); + // 20081217 : add child AFTER hibernate session is opened + addChildContext(result); + + // fire event getFiresSupport().fireOnBeginTransaction(result); + return result; } @@ -739,7 +744,7 @@ // it's very important to change the session after rollback // otherwize there are many error during next Entity's modification hibernate = getHibernateFactory().openSession(); - hibernate.setFlushMode(FlushMode.NEVER); + hibernate.setFlushMode(FlushMode.MANUAL); hibernate.beginTransaction();

1 0

r1278 - topia/trunk/topia-persistence
by chatellier＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: chatellier Date: 2008-12-15 09:46:19 +0000 (Mon, 15 Dec 2008) New Revision: 1278 Modified: topia/trunk/topia-persistence/pom.xml Log: Add ehcache (performance api) Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) +++ topia/trunk/topia-persistence/pom.xml 2008-12-15 09:46:19 UTC (rev 1278) @@ -42,6 +42,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>3.3.1.GA</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.4.GA</version>

1 0

r1277 - topia/trunk topia/trunk/topia-persistence topia/trunk/topia-soa topia/trunk/topia-ui topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 03:17:13 +0000 (Mon, 15 Dec 2008) New Revision: 1277 Modified: topia-service/trunk/pom.xml topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: push back scm generic values Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) +++ topia/trunk/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) @@ -119,9 +119,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/?ro…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) +++ topia/trunk/topia-persistence/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) @@ -93,9 +93,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) +++ topia/trunk/topia-soa/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) @@ -115,9 +115,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) +++ topia/trunk/topia-ui/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) @@ -66,9 +66,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project> Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) +++ topia-service/trunk/pom.xml 2008-12-15 03:17:13 UTC (rev 1277) @@ -167,9 +167,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0

r1276 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 03:05:07 +0000 (Mon, 15 Dec 2008) New Revision: 1276 Modified: topia-service/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-15 03:05:03 UTC (rev 1275) +++ topia-service/trunk/pom.xml 2008-12-15 03:05:07 UTC (rev 1276) @@ -13,7 +13,7 @@ </parent> <artifactId>topia-service</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <dependencies> @@ -167,9 +167,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> </scm> </project>

1 0

r1275 - in topia-service/tags: . 1.0.1
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 03:05:03 +0000 (Mon, 15 Dec 2008) New Revision: 1275 Added: topia-service/tags/1.0.1/ topia-service/tags/1.0.1/changelog.txt topia-service/tags/1.0.1/pom.xml Removed: topia-service/tags/1.0.1/changelog.txt topia-service/tags/1.0.1/pom.xml Log: [maven-release-plugin] copy for tag 1.0.1 Copied: topia-service/tags/1.0.1 (from rev 1268, topia-service/trunk) Deleted: topia-service/tags/1.0.1/changelog.txt =================================================================== --- topia-service/trunk/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia-service/tags/1.0.1/changelog.txt 2008-12-15 03:05:03 UTC (rev 1275) @@ -1,34 +0,0 @@ -1.0 chemit 20081210 - * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 - -0.9.1 - * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) - -0.9 - * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 - * <poussin> modif dans service de migration pour permettre a l'app de - faire la migration via le callback - -0.8 - - * 20071120 [chatellier] update topia-service site - * 20071115 [chatellier] apply hibernate code style to open/close session and - transaction - * 20071115 [chatellier] refractoring separate specifique topia service - and real migration code - * 20071115 [chatellier] add schema existance detection support - and dont migrate if there is no table - * 20071111 [chatellier] add support for callback handler - * 20071111 [chatellier] use cascade to calculate dependencies order - * 20071109 [chatellier] change schema creation process to - correct duplicate foreign key creation - * 20071109 [chatellier] add inherit support to calculate dependancies - -0.6 ??? ??? - - * 20070426 [chatellier] use lutinutil.Resources.getUrls() to get mappings - * 20070426 [chatellier] change finder migration to use Class.forName() - * 20070420 [chatellier] remove the 'V' letter in old mapping directories name - * 20070420 [chatellier] add support to look for hibernate mapping in a tree - structure of directories - * 20070418 [chatellier] add migration service \ No newline at end of file Copied: topia-service/tags/1.0.1/changelog.txt (from rev 1273, topia-service/trunk/changelog.txt) =================================================================== --- topia-service/tags/1.0.1/changelog.txt (rev 0) +++ topia-service/tags/1.0.1/changelog.txt 2008-12-15 03:05:03 UTC (rev 1275) @@ -0,0 +1,37 @@ +1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) follow release of topia + +1.0 chemit 20081210 + * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 + +0.9.1 + * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) + +0.9 + * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 + * <poussin> modif dans service de migration pour permettre a l'app de + faire la migration via le callback + +0.8 + + * 20071120 [chatellier] update topia-service site + * 20071115 [chatellier] apply hibernate code style to open/close session and + transaction + * 20071115 [chatellier] refractoring separate specifique topia service + and real migration code + * 20071115 [chatellier] add schema existance detection support + and dont migrate if there is no table + * 20071111 [chatellier] add support for callback handler + * 20071111 [chatellier] use cascade to calculate dependencies order + * 20071109 [chatellier] change schema creation process to + correct duplicate foreign key creation + * 20071109 [chatellier] add inherit support to calculate dependancies + +0.6 ??? ??? + + * 20070426 [chatellier] use lutinutil.Resources.getUrls() to get mappings + * 20070426 [chatellier] change finder migration to use Class.forName() + * 20070420 [chatellier] remove the 'V' letter in old mapping directories name + * 20070420 [chatellier] add support to look for hibernate mapping in a tree + structure of directories + * 20070418 [chatellier] add migration service \ No newline at end of file Deleted: topia-service/tags/1.0.1/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia-service/tags/1.0.1/pom.xml 2008-12-15 03:05:03 UTC (rev 1275) @@ -1,175 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>topia-service</artifactId> - <version>1.0.1-SNAPSHOT</version> - - <dependencies> - -  - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>2.3.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.103</version> - <scope>test</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA Service</name> - <description> - ToPIA Service est une librairie de ToPIA pour la gestion de services. - </description> - <inceptionYear>2006</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - -  - <topia.version>2.1.0</topia.version> - -  - <generator.version>0.62</generator.version> - -  - <lutinutil.version>1.0</lutinutil.version> - - </properties> - - <build> - - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> -  - <configuration> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <defaultPackage>org.codelutin.topia</defaultPackage> - <extractedPackages>org.codelutin.topia.tass</extractedPackages> - <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${maven.gen.dir}/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: topia-service/tags/1.0.1/pom.xml (from rev 1274, topia-service/trunk/pom.xml) =================================================================== --- topia-service/tags/1.0.1/pom.xml (rev 0) +++ topia-service/tags/1.0.1/pom.xml 2008-12-15 03:05:03 UTC (rev 1275) @@ -0,0 +1,175 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>topia-service</artifactId> + <version>1.0.1</version> + + <dependencies> + +  + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.3.2</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.103</version> + <scope>test</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA Service</name> + <description> + ToPIA Service est une librairie de ToPIA pour la gestion de services. + </description> + <inceptionYear>2006</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + +  + <topia.version>2.1.1</topia.version> + +  + <generator.version>0.63</generator.version> + +  + <lutinutil.version>1.0</lutinutil.version> + + </properties> + + <build> + + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> +  + <configuration> + <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>org.codelutin.topia</defaultPackage> + <extractedPackages>org.codelutin.topia.tass</extractedPackages> + <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <copyOverwrite>true</copyOverwrite> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${maven.gen.dir}/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + </scm> + +</project>

1 0

r1274 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 03:04:58 +0000 (Mon, 15 Dec 2008) New Revision: 1274 Modified: topia-service/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.0.1 Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-15 02:55:20 UTC (rev 1273) +++ topia-service/trunk/pom.xml 2008-12-15 03:04:58 UTC (rev 1274) @@ -13,7 +13,7 @@ </parent> <artifactId>topia-service</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <dependencies> @@ -167,9 +167,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> </scm> </project>

1 0

r1273 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 02:55:20 +0000 (Mon, 15 Dec 2008) New Revision: 1273 Modified: topia-service/trunk/changelog.txt topia-service/trunk/pom.xml Log: prepare next release Modified: topia-service/trunk/changelog.txt =================================================================== --- topia-service/trunk/changelog.txt 2008-12-15 02:48:41 UTC (rev 1272) +++ topia-service/trunk/changelog.txt 2008-12-15 02:55:20 UTC (rev 1273) @@ -1,3 +1,6 @@ +1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) follow release of topia + 1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-15 02:48:41 UTC (rev 1272) +++ topia-service/trunk/pom.xml 2008-12-15 02:55:20 UTC (rev 1273) @@ -83,10 +83,10 @@ <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>  - <topia.version>2.1.0</topia.version> + <topia.version>2.1.1</topia.version>  - <generator.version>0.62</generator.version> + <generator.version>0.63</generator.version>  <lutinutil.version>1.0</lutinutil.version>

1 0

r1272 - in topia/trunk: . topia-persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 02:48:41 +0000 (Mon, 15 Dec 2008) New Revision: 1272 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) +++ topia/trunk/pom.xml 2008-12-15 02:48:41 UTC (rev 1272) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -119,9 +119,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/?ro…</url> </scm> </project> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) +++ topia/trunk/topia-persistence/pom.xml 2008-12-15 02:48:41 UTC (rev 1272) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -93,9 +93,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) +++ topia/trunk/topia-soa/pom.xml 2008-12-15 02:48:41 UTC (rev 1272) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -115,9 +115,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) +++ topia/trunk/topia-ui/pom.xml 2008-12-15 02:48:41 UTC (rev 1272) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -66,9 +66,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> </scm> </project>

1 0

r1271 - in topia/tags: . 2.1.1 2.1.1/topia-persistence 2.1.1/topia-soa 2.1.1/topia-ui
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 02:48:37 +0000 (Mon, 15 Dec 2008) New Revision: 1271 Added: topia/tags/2.1.1/ topia/tags/2.1.1/changelog.txt topia/tags/2.1.1/pom.xml topia/tags/2.1.1/topia-persistence/changelog.txt topia/tags/2.1.1/topia-persistence/pom.xml topia/tags/2.1.1/topia-soa/changelog.txt topia/tags/2.1.1/topia-soa/pom.xml topia/tags/2.1.1/topia-ui/changelog.txt topia/tags/2.1.1/topia-ui/pom.xml Removed: topia/tags/2.1.1/changelog.txt topia/tags/2.1.1/pom.xml topia/tags/2.1.1/topia-persistence/changelog.txt topia/tags/2.1.1/topia-persistence/pom.xml topia/tags/2.1.1/topia-soa/changelog.txt topia/tags/2.1.1/topia-soa/pom.xml topia/tags/2.1.1/topia-ui/changelog.txt topia/tags/2.1.1/topia-ui/pom.xml Log: [maven-release-plugin] copy for tag 2.1.1 Copied: topia/tags/2.1.1 (from rev 1268, topia/trunk) Deleted: topia/tags/2.1.1/changelog.txt =================================================================== --- topia/trunk/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,156 +0,0 @@ -2.1.0 chemit 20081210 - * 20081205 [chemit] - improve poms, use lutinproject 3.2 - - use JUnit4 for test, fix some tests (but not all). - - add some usefull method to build regex on topiaIds - * 20081118 Switch to multi module project - -ver-2-0-29 chatellier 20081117 - * 20081117 [chemit] improve EntityEnum - * 20081117 [chemit] add method findAllWithOrder in DAO to make have sorted lists - -ver-2-0-28 chatellier 20081114 - * 20081113 [chorlet] add support for lazy loading on attribute with 0..* multiplicity - * 20081113 [chorlet] fix bug on bidirectional association by adding inverse attribute in the one side of two hibernate mapping files - * 20081107 [chatellier] fix "result" named attribute generation in model - * 20081107 [chatellier] fix ant:ant, org.apache.ant:ant conflict - * 20081107 [chatellier] set lutingenerator provided scope - * 20081101 [chemit] bump lutingenerator to 0.61 - * 20081101 [chemit] add a EntityEnum to have a generic way to access Entities. - * 20081101 [chemit] improve generators : - - can exclude some generators on TopiaMetaGenerator - - refactor TopiaMetaGenerator to use a simple List of Generator to launch - - refactor Generators to have a default public constructor - - * 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 - -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) - * 20080922 [thimel] Fixed maven-processor-plugin usage - * 20080922 [thimel] License switched to LGPL - -ver-2-0-26 thimel 20080922 - * 20080922 [thimel] Last version with lutinproject 2.2 - * 20082608 [chemit] permettre de recuperer uniquement une fenetre de resultat en hql (TopiaContext#find(String hql,int startIndex,int endIndex, Object ... args) - * 20082907 [chemit] Suppression des dependances en dur sur les implantations d'entites - * 20072012 [thimel] Support des index sur les attibuts - * 20072012 [ruchaud] Récupération des classes persistées - * 20072012 [ruchaud] Création d'un vetoable sur les finds - -ver-2-0-25 poussin 20071214 - - * 20071120 [chatellier] modify service init methods, return boolean to stay - activated - * 20071116 [chatellier] add support for topia context listeners - * 20071114 [chatellier] add support for service without persitent classes - * 20071109 [chatellier] add type="string" on topiaId in templates - - update hibernate version to 3.2.5.ga (event patch) - - jetty version 5.1.10 (better pom.xml) - * 20071001 [chatellier] move tapestry version to 5.0.5 - * 20070528 [chatellier] add stateModel generation support - - tapestry generation templates - - tapestry 5.0.4 dependency - - * 20071106 [poussin] add removeContext on TopiaContextFactory and call it - in TopiaContextImpl.closeContext(). - - * 20071107 [thimel] add db schema support - * 20071107 [thimel] several .hbm.xml refactoring - * 20071108 [thimel] add DTO generator - * 20071108 [thimel] add copyright support in generators - * 20071108 [thimel] add serialVersionUID support in EntityAbstractGenerator - -ver-2-0-24 poussin 20070425 - - * 20070420 [chatellier] add services interfaces generation (stereotype=service) - * 20070420 [chatellier] add topia services support - * 20070330 [poussin] TopiaContextFactory return new TopiaContext if context is closed - * 20070331 [poussin] change many string argument to class argument - * 20070331 [poussin] add getService(Class) method on TopiaContext - * 20070331 [poussin] remove helper in service that only return service instant - * 20070331 [poussin] add Devel.rst documentation - * 20070402 [poussin] replace init to preInit and postInit in TopiaService - -ver-2-0-22 ruchaud 20061023 - - * 20061023 [ruchaud][improve] manage events - * 20061023 [ruchaud][bug fix] in generator of DAO Abstract on delete - -ver-2-0-21 poussin 20061019 - - * add support for auto-import entities for hql - * add getComposite and getAggregate on TopiaEntity - * bug fix for association hibernate mapping wit have attributeh - cascade="delete" for not navigable link to prevent constraint exception - * bug fix in delete, remove link before do delete - -ver-2-0-20 poussin 20061017 - - * add support for TopiaService mechanisme - -ver-2-0-16 poussin 20060907 - - * Implantation des mÃ©thodes update et delete sur les TopiaUserImpl et TopiaEntityPermissionImpl - * add backup/restore method on TopiaContext (backup only works for h2) - * TopiaContext is set in Entity during preload - * add updateSchema in TopiaContext interface - * add methods update et delete on TopiaUserImpl and TopiaEntityPermissionImpl - -ver-2-0-13 thimel 20060822 - - * [Secu] ajout d'un champ notes sur les TopiaUser - * [Secu] ajout d'un champ linkApplication sur les TopiaUser (permettant de faire le lien avec une application externe) - * [Secu] ajout de commits et rollbacks sur les Manager - * [Secu] ajout d'un setPassword (sans verification ancien mdp) sur les TopiaUser - -ver-2-0-12 thimel 20060721 - - * ajout des projections sur les DAO - * positionnement unique des userManager et permissionManager au niveau du contexte racine - * ajout de la possibilite de tester des permissions sur le permissionManager - -ver-2-0-11 thimel 20060703 - - * support de la fermeture d'un contexte - * support de la recherche sur tous les attributs d'une entite / annotation sur les interfaces - -ver-2-0-8 thimel 20060606 - - * amelioration detection des classes abstraites - * correction du polymorphisme avec les proxies d'Hibernate - * Hibernate 3.2 - -ver-2-0-7 thimel 20060523 - - * import/export XML "experimental" - * one-to-one transformes en many-to-one + unique="true" - * bug au niveau de la detection des parents abstract - -ver-2-0-6 thimel 20060504 - - * support des annotations sur les attributs des XXXAbstract - * re-correction du support des relations unidirectionnelles 1-n avec classes d'heritage du cote n - * ajout de la validation pour les attributs sans inverses (pour les objectmodel faits a la main) - -ver-2-0-5 thimel 20060427 - - * isIndexed remplace isOrdered dans le mapping hibernate - * add postCreate and postLoad on AbstractTopiaEntity - * findContains sur les DAO (implante hors Hibernate pour l'instant) - * support plus coherent des classes abstraites - * projet compatible maven2 - * correction du support des relations unidirectionnelles 1-n avec classes d'heritage du cote n - -ver-2-0-4 thimel 20060303 - - * Correction du support des interfaces et classes abstraites (conjointement a LutinGenerator 0.30) - * Ajout des exceptions sur le operations (conjointement a LutinGenerator 0.30) - -ver-2-0-3 thimel 20060228 - - * Correction du support des classes d'associations (mauvais mapping Hibernate) - * Support de super classes pour les classes d'association (LutinGenerator 0.29) - Copied: topia/tags/2.1.1/changelog.txt (from rev 1269, topia/trunk/changelog.txt) =================================================================== --- topia/tags/2.1.1/changelog.txt (rev 0) +++ topia/tags/2.1.1/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,159 @@ +2.1.1 chemit 20081215 + * 20081215 [chemit] - new release for isis-fish :) + +2.1.0 chemit 20081210 + * 20081205 [chemit] - improve poms, use lutinproject 3.2 + - use JUnit4 for test, fix some tests (but not all). + - add some usefull method to build regex on topiaIds + * 20081118 Switch to multi module project + +ver-2-0-29 chatellier 20081117 + * 20081117 [chemit] improve EntityEnum + * 20081117 [chemit] add method findAllWithOrder in DAO to make have sorted lists + +ver-2-0-28 chatellier 20081114 + * 20081113 [chorlet] add support for lazy loading on attribute with 0..* multiplicity + * 20081113 [chorlet] fix bug on bidirectional association by adding inverse attribute in the one side of two hibernate mapping files + * 20081107 [chatellier] fix "result" named attribute generation in model + * 20081107 [chatellier] fix ant:ant, org.apache.ant:ant conflict + * 20081107 [chatellier] set lutingenerator provided scope + * 20081101 [chemit] bump lutingenerator to 0.61 + * 20081101 [chemit] add a EntityEnum to have a generic way to access Entities. + * 20081101 [chemit] improve generators : + - can exclude some generators on TopiaMetaGenerator + - refactor TopiaMetaGenerator to use a simple List of Generator to launch + - refactor Generators to have a default public constructor + + * 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 + +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) + * 20080922 [thimel] Fixed maven-processor-plugin usage + * 20080922 [thimel] License switched to LGPL + +ver-2-0-26 thimel 20080922 + * 20080922 [thimel] Last version with lutinproject 2.2 + * 20082608 [chemit] permettre de recuperer uniquement une fenetre de resultat en hql (TopiaContext#find(String hql,int startIndex,int endIndex, Object ... args) + * 20082907 [chemit] Suppression des dependances en dur sur les implantations d'entites + * 20072012 [thimel] Support des index sur les attibuts + * 20072012 [ruchaud] Récupération des classes persistées + * 20072012 [ruchaud] Création d'un vetoable sur les finds + +ver-2-0-25 poussin 20071214 + + * 20071120 [chatellier] modify service init methods, return boolean to stay + activated + * 20071116 [chatellier] add support for topia context listeners + * 20071114 [chatellier] add support for service without persitent classes + * 20071109 [chatellier] add type="string" on topiaId in templates + - update hibernate version to 3.2.5.ga (event patch) + - jetty version 5.1.10 (better pom.xml) + * 20071001 [chatellier] move tapestry version to 5.0.5 + * 20070528 [chatellier] add stateModel generation support + - tapestry generation templates + - tapestry 5.0.4 dependency + + * 20071106 [poussin] add removeContext on TopiaContextFactory and call it + in TopiaContextImpl.closeContext(). + + * 20071107 [thimel] add db schema support + * 20071107 [thimel] several .hbm.xml refactoring + * 20071108 [thimel] add DTO generator + * 20071108 [thimel] add copyright support in generators + * 20071108 [thimel] add serialVersionUID support in EntityAbstractGenerator + +ver-2-0-24 poussin 20070425 + + * 20070420 [chatellier] add services interfaces generation (stereotype=service) + * 20070420 [chatellier] add topia services support + * 20070330 [poussin] TopiaContextFactory return new TopiaContext if context is closed + * 20070331 [poussin] change many string argument to class argument + * 20070331 [poussin] add getService(Class) method on TopiaContext + * 20070331 [poussin] remove helper in service that only return service instant + * 20070331 [poussin] add Devel.rst documentation + * 20070402 [poussin] replace init to preInit and postInit in TopiaService + +ver-2-0-22 ruchaud 20061023 + + * 20061023 [ruchaud][improve] manage events + * 20061023 [ruchaud][bug fix] in generator of DAO Abstract on delete + +ver-2-0-21 poussin 20061019 + + * add support for auto-import entities for hql + * add getComposite and getAggregate on TopiaEntity + * bug fix for association hibernate mapping wit have attributeh + cascade="delete" for not navigable link to prevent constraint exception + * bug fix in delete, remove link before do delete + +ver-2-0-20 poussin 20061017 + + * add support for TopiaService mechanisme + +ver-2-0-16 poussin 20060907 + + * Implantation des mÃ©thodes update et delete sur les TopiaUserImpl et TopiaEntityPermissionImpl + * add backup/restore method on TopiaContext (backup only works for h2) + * TopiaContext is set in Entity during preload + * add updateSchema in TopiaContext interface + * add methods update et delete on TopiaUserImpl and TopiaEntityPermissionImpl + +ver-2-0-13 thimel 20060822 + + * [Secu] ajout d'un champ notes sur les TopiaUser + * [Secu] ajout d'un champ linkApplication sur les TopiaUser (permettant de faire le lien avec une application externe) + * [Secu] ajout de commits et rollbacks sur les Manager + * [Secu] ajout d'un setPassword (sans verification ancien mdp) sur les TopiaUser + +ver-2-0-12 thimel 20060721 + + * ajout des projections sur les DAO + * positionnement unique des userManager et permissionManager au niveau du contexte racine + * ajout de la possibilite de tester des permissions sur le permissionManager + +ver-2-0-11 thimel 20060703 + + * support de la fermeture d'un contexte + * support de la recherche sur tous les attributs d'une entite / annotation sur les interfaces + +ver-2-0-8 thimel 20060606 + + * amelioration detection des classes abstraites + * correction du polymorphisme avec les proxies d'Hibernate + * Hibernate 3.2 + +ver-2-0-7 thimel 20060523 + + * import/export XML "experimental" + * one-to-one transformes en many-to-one + unique="true" + * bug au niveau de la detection des parents abstract + +ver-2-0-6 thimel 20060504 + + * support des annotations sur les attributs des XXXAbstract + * re-correction du support des relations unidirectionnelles 1-n avec classes d'heritage du cote n + * ajout de la validation pour les attributs sans inverses (pour les objectmodel faits a la main) + +ver-2-0-5 thimel 20060427 + + * isIndexed remplace isOrdered dans le mapping hibernate + * add postCreate and postLoad on AbstractTopiaEntity + * findContains sur les DAO (implante hors Hibernate pour l'instant) + * support plus coherent des classes abstraites + * projet compatible maven2 + * correction du support des relations unidirectionnelles 1-n avec classes d'heritage du cote n + +ver-2-0-4 thimel 20060303 + + * Correction du support des interfaces et classes abstraites (conjointement a LutinGenerator 0.30) + * Ajout des exceptions sur le operations (conjointement a LutinGenerator 0.30) + +ver-2-0-3 thimel 20060228 + + * Correction du support des classes d'associations (mauvais mapping Hibernate) + * Support de super classes pour les classes d'association (LutinGenerator 0.29) + Deleted: topia/tags/2.1.1/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,127 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> - - <modules> - <module>topia-persistence</module> - <module>topia-soa</module> - <module>topia-ui</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - <version>${generator.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </dependencyManagement> - -  -  -  - <name>ToPIA - Tools for Portable and Independent Architecture</name> - <description>Framework de persistance et de distribution d'application.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - - <packaging>pom</packaging> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - -  - <generator.version>0.63-SNAPSHOT</generator.version> - -  - <processor.version>0.16</processor.version> - -  - <lutinutil.version>1.0</lutinutil.version> - - </properties> - - <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>${processor.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> -  -  - <addCompileDirectory>true</addCompileDirectory> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: topia/tags/2.1.1/pom.xml (from rev 1270, topia/trunk/pom.xml) =================================================================== --- topia/tags/2.1.1/pom.xml (rev 0) +++ topia/tags/2.1.1/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,127 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>topia</artifactId> + <version>2.1.1</version> + + <modules> + <module>topia-persistence</module> + <module>topia-soa</module> + <module>topia-ui</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + <version>${generator.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </dependencyManagement> + +  +  +  + <name>ToPIA - Tools for Portable and Independent Architecture</name> + <description>Framework de persistance et de distribution d'application.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + +  + <generator.version>0.63</generator.version> + +  + <processor.version>0.16</processor.version> + +  + <lutinutil.version>1.0</lutinutil.version> + + </properties> + + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>${processor.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> +  +  + <addCompileDirectory>true</addCompileDirectory> + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + </scm> + +</project> Deleted: topia/tags/2.1.1/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-persistence/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,6 +0,0 @@ -2.1.1 ?? 200812?? -* 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. - -2.1.0 chemit 20081210 -* 20081205 [chemit] - improve poms, use lutinproject 3.2 - - add some usefull methods in TopiaUtil to help with regex on topiaId expression \ No newline at end of file Copied: topia/tags/2.1.1/topia-persistence/changelog.txt (from rev 1269, topia/trunk/topia-persistence/changelog.txt) =================================================================== --- topia/tags/2.1.1/topia-persistence/changelog.txt (rev 0) +++ topia/tags/2.1.1/topia-persistence/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,7 @@ +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) +* 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. + +2.1.0 chemit 20081210 +* 20081205 [chemit] - improve poms, use lutinproject 3.2 + - add some usefull methods in TopiaUtil to help with regex on topiaId expression \ No newline at end of file Deleted: topia/tags/2.1.1/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-persistence/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,102 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <scope>runtime</scope> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.104</version> - <scope>test</scope> - </dependency> - </dependencies> - -  -  -  - - <name>ToPIA - Persistence</name> - <description>Hibernate based persistence module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - <defaultGoal>install</defaultGoal> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> - </scm> - - -</project> Copied: topia/tags/2.1.1/topia-persistence/pom.xml (from rev 1270, topia/trunk/topia-persistence/pom.xml) =================================================================== --- topia/tags/2.1.1/topia-persistence/pom.xml (rev 0) +++ topia/tags/2.1.1/topia-persistence/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,102 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.1</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.2</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.104</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>ToPIA - Persistence</name> + <description>Hibernate based persistence module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + <defaultGoal>install</defaultGoal> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + </scm> + + +</project> Deleted: topia/tags/2.1.1/topia-soa/changelog.txt =================================================================== --- topia/trunk/topia-soa/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-soa/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,2 +0,0 @@ -2.1.0 chemit 20081210 -* 20081205 [chemit] - improve poms, use lutinproject 3.2, tests in JUnit4 but ignore because must be redone! \ No newline at end of file Copied: topia/tags/2.1.1/topia-soa/changelog.txt (from rev 1269, topia/trunk/topia-soa/changelog.txt) =================================================================== --- topia/tags/2.1.1/topia-soa/changelog.txt (rev 0) +++ topia/tags/2.1.1/topia-soa/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,4 @@ +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) +2.1.0 chemit 20081210 +* 20081205 [chemit] - improve poms, use lutinproject 3.2, tests in JUnit4 but ignore because must be redone! \ No newline at end of file Deleted: topia/tags/2.1.1/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-soa/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,123 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-soa</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - <version>1.2.6</version> - <exclusions> -  - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>jetty</groupId> - <artifactId>jetty</artifactId> - <version>5.1.10</version> - <scope>test</scope> - </dependency> - -  - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>1.5.3</version> - <scope>compile</scope> - </dependency> - </dependencies> - -  -  -  - - <name>ToPIA - SOA</name> - <description>Service Oriented Architecture module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - <defaultGoal>install</defaultGoal> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> - </scm> - -</project> Copied: topia/tags/2.1.1/topia-soa/pom.xml (from rev 1270, topia/trunk/topia-soa/pom.xml) =================================================================== --- topia/tags/2.1.1/topia-soa/pom.xml (rev 0) +++ topia/tags/2.1.1/topia-soa/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,123 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.1</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-soa</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + <version>1.2.6</version> + <exclusions> +  + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>jetty</groupId> + <artifactId>jetty</artifactId> + <version>5.1.10</version> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + </dependencies> + +  +  +  + + <name>ToPIA - SOA</name> + <description>Service Oriented Architecture module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + <defaultGoal>install</defaultGoal> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + </scm> + +</project> Deleted: topia/tags/2.1.1/topia-ui/changelog.txt =================================================================== --- topia/trunk/topia-ui/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-ui/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,2 +0,0 @@ -2.1.0 chemit 20081210 -* 20081205 [chemit] - improve poms, use lutinproject 3.2 Copied: topia/tags/2.1.1/topia-ui/changelog.txt (from rev 1269, topia/trunk/topia-ui/changelog.txt) =================================================================== --- topia/tags/2.1.1/topia-ui/changelog.txt (rev 0) +++ topia/tags/2.1.1/topia-ui/changelog.txt 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,4 @@ +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) +2.1.0 chemit 20081210 +* 20081205 [chemit] - improve poms, use lutinproject 3.2 Deleted: topia/tags/2.1.1/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/tags/2.1.1/topia-ui/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -1,74 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-ui</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>5.0.7</version> - <scope>compile</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA - UI</name> - <description>User interface module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - <defaultGoal>install</defaultGoal> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> - </scm> - -</project> Copied: topia/tags/2.1.1/topia-ui/pom.xml (from rev 1270, topia/trunk/topia-ui/pom.xml) =================================================================== --- topia/tags/2.1.1/topia-ui/pom.xml (rev 0) +++ topia/tags/2.1.1/topia-ui/pom.xml 2008-12-15 02:48:37 UTC (rev 1271) @@ -0,0 +1,74 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.1</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-ui</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>5.0.7</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA - UI</name> + <description>User interface module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + <defaultGoal>install</defaultGoal> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> + </scm> + +</project>

1 0

r1270 - in topia/trunk: . topia-persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 02:48:30 +0000 (Mon, 15 Dec 2008) New Revision: 1270 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare release 2.1.1 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-15 02:47:12 UTC (rev 1269) +++ topia/trunk/pom.xml 2008-12-15 02:48:30 UTC (rev 1270) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> <modules> <module>topia-persistence</module> @@ -119,9 +119,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-12-15 02:47:12 UTC (rev 1269) +++ topia/trunk/topia-persistence/pom.xml 2008-12-15 02:48:30 UTC (rev 1270) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -93,9 +93,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-12-15 02:47:12 UTC (rev 1269) +++ topia/trunk/topia-soa/pom.xml 2008-12-15 02:48:30 UTC (rev 1270) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -115,9 +115,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-12-15 02:47:12 UTC (rev 1269) +++ topia/trunk/topia-ui/pom.xml 2008-12-15 02:48:30 UTC (rev 1270) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -66,9 +66,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.1/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project>

1 0

r1269 - in topia/trunk: . topia-persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 02:47:12 +0000 (Mon, 15 Dec 2008) New Revision: 1269 Modified: topia/trunk/changelog.txt topia/trunk/pom.xml topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-soa/changelog.txt topia/trunk/topia-ui/changelog.txt Log: prepare next release Modified: topia/trunk/changelog.txt =================================================================== --- topia/trunk/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/trunk/changelog.txt 2008-12-15 02:47:12 UTC (rev 1269) @@ -1,3 +1,6 @@ +2.1.1 chemit 20081215 + * 20081215 [chemit] - new release for isis-fish :) + 2.1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2 - use JUnit4 for test, fix some tests (but not all). Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/trunk/pom.xml 2008-12-15 02:47:12 UTC (rev 1269) @@ -62,7 +62,7 @@ <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>  - <generator.version>0.63-SNAPSHOT</generator.version> + <generator.version>0.63</generator.version>  <processor.version>0.16</processor.version> Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/trunk/topia-persistence/changelog.txt 2008-12-15 02:47:12 UTC (rev 1269) @@ -1,4 +1,5 @@ -2.1.1 ?? 200812?? +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) * 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. 2.1.0 chemit 20081210 Modified: topia/trunk/topia-soa/changelog.txt =================================================================== --- topia/trunk/topia-soa/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/trunk/topia-soa/changelog.txt 2008-12-15 02:47:12 UTC (rev 1269) @@ -1,2 +1,4 @@ +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) 2.1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2, tests in JUnit4 but ignore because must be redone! \ No newline at end of file Modified: topia/trunk/topia-ui/changelog.txt =================================================================== --- topia/trunk/topia-ui/changelog.txt 2008-12-14 22:09:16 UTC (rev 1268) +++ topia/trunk/topia-ui/changelog.txt 2008-12-15 02:47:12 UTC (rev 1269) @@ -1,2 +1,4 @@ +2.1.1 chemit 20081215 +* 20081215 [chemit] - new release for isis-fish :) 2.1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2

1 0

r1268 - in topia/trunk: . topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 14, 2008

Dec. 14, 2008

Author: tchemit Date: 2008-12-14 22:09:16 +0000 (Sun, 14 Dec 2008) New Revision: 1268 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java Log: only generate Entity SearchField fields required use generator 0.63-SNAPSHOT Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-12-14 18:14:26 UTC (rev 1267) +++ topia/trunk/pom.xml 2008-12-14 22:09:16 UTC (rev 1268) @@ -62,7 +62,7 @@ <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>  - <generator.version>0.62</generator.version> + <generator.version>0.63-SNAPSHOT</generator.version>  <processor.version>0.16</processor.version> Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java 2008-12-14 18:14:26 UTC (rev 1267) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java 2008-12-14 22:09:16 UTC (rev 1268) @@ -164,7 +164,6 @@ } } if (!dateFields.isEmpty()) { - buffer.append(","); buffer.append("\n dateFields={").append(getStringRepresentation(dateFields)).append("}"); } /*{<%=buffer.toString()%>

1 0

r1267 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 14, 2008

Dec. 14, 2008

Author: tchemit Date: 2008-12-14 18:14:26 +0000 (Sun, 14 Dec 2008) New Revision: 1267 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java Log: only generate Entity SearchField fields required Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java 2008-12-11 21:33:45 UTC (rev 1266) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java 2008-12-14 18:14:26 UTC (rev 1267) @@ -29,6 +29,18 @@ package org.codelutin.topia.generator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.generator.Generator; +import org.codelutin.generator.ObjectModelGenerator; +import org.codelutin.generator.Util; +import org.codelutin.generator.models.object.ObjectModelAssociationClass; +import org.codelutin.generator.models.object.ObjectModelAttribute; +import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.generator.models.object.ObjectModelClassifier; +import org.codelutin.generator.models.object.ObjectModelInterface; +import org.codelutin.generator.models.object.ObjectModelOperation; +import org.codelutin.generator.models.object.ObjectModelParameter; import static org.codelutin.topia.generator.GeneratorUtil.hasUnidirectionalRelationOnAbstractType; import static org.codelutin.topia.generator.GeneratorUtil.isBooleanType; import static org.codelutin.topia.generator.GeneratorUtil.isDateType; @@ -44,24 +56,9 @@ import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.Util; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; - public class EntityInterfaceGenerator extends ObjectModelGenerator { - /** - * Logger for this class - */ + /** Logger for this class */ private static final Log log = LogFactory .getLog(EntityInterfaceGenerator.class); @@ -91,12 +88,11 @@ if (!interfacez.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) { return; } - - // log - if(log.isDebugEnabled()) { + + if (log.isDebugEnabled()) { log.debug("Generating interface for : " + interfacez.getName()); } - + generateInterfaceHeader(output, interfacez); generateInterfaceOperations(output, interfacez); @@ -127,27 +123,55 @@ List<String> boolFields = new ArrayList<String>(); List<String> dateFields = new ArrayList<String>(); List<ObjectModelAttribute> allAttrs = new ArrayList<ObjectModelAttribute>(); - allAttrs.addAll((Collection<ObjectModelAttribute>)clazz.getAttributes()); - allAttrs.addAll((Collection<ObjectModelAttribute>)clazz.getAllOtherAttributes()); + allAttrs.addAll(clazz.getAttributes()); + allAttrs.addAll(clazz.getAllOtherAttributes()); + boolean needAnnotation = false; for (ObjectModelAttribute attr : allAttrs) { String name = Util.toLowerCaseFirstLetter(attr.getName()); if (isTextType(attr)) { txtFields.add(name); + needAnnotation = true; } else if (isNumericType(attr)) { numFields.add(name); + needAnnotation = true; } else if (isBooleanType(attr)) { boolFields.add(name); + needAnnotation = true; } else if (isDateType(attr)) { dateFields.add(name); + needAnnotation = true; } } -/*{@SearchFields ( - txtFields={<%=getStringRepresentation(txtFields)%>}, - numFields={<%=getStringRepresentation(numFields)%>}, - boolFields={<%=getStringRepresentation(boolFields)%>}, - dateFields={<%=getStringRepresentation(dateFields)%>} -) -}*/ +/*{@SearchFields (}*/ + if (needAnnotation) { + StringBuilder buffer = new StringBuilder(); + if (!txtFields.isEmpty()) { + buffer.append("\n txtFields={").append(getStringRepresentation(txtFields)).append("}"); + if (!numFields.isEmpty() || !boolFields.isEmpty() || !dateFields.isEmpty()) { + buffer.append(","); + } + } + if (!numFields.isEmpty()) { + buffer.append("\n numFields={").append(getStringRepresentation(numFields)).append("}"); + if (!boolFields.isEmpty() || !dateFields.isEmpty()) { + buffer.append(","); + } + } + if (!boolFields.isEmpty()) { + buffer.append("\n boolFields={").append(getStringRepresentation(boolFields)).append("}"); + if (!dateFields.isEmpty()) { + buffer.append(","); + } + } + if (!dateFields.isEmpty()) { + buffer.append(","); + buffer.append("\n dateFields={").append(getStringRepresentation(dateFields)).append("}"); + } +/*{<%=buffer.toString()%> +}*/ + } +/*{) +}*/ } private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException { @@ -169,26 +193,24 @@ }*/ } if (classifier instanceof ObjectModelClass) { - generateSearchFields(output, (ObjectModelClass)classifier); + generateSearchFields(output, (ObjectModelClass) classifier); } /*{public interface <%=classifier.getName()%> extends }*/ String extendClass = ""; - for (Iterator i=classifier.getInterfaces().iterator(); i.hasNext();) { - ObjectModelClassifier parent = (ObjectModelClassifier)i.next(); + for (ObjectModelClassifier parent : classifier.getInterfaces()) { extendClass += parent.getQualifiedName(); - extendClass += ", "; + extendClass += ", "; } if (classifier instanceof ObjectModelClass) { - ObjectModelClass clazz = (ObjectModelClass)classifier; - for (Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) { - ObjectModelClassifier parent = (ObjectModelClassifier)i.next(); + ObjectModelClass clazz = (ObjectModelClass) classifier; + for (ObjectModelClassifier parent : clazz.getSuperclasses()) { if (parent.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)) { extendClass += parent.getQualifiedName(); } - extendClass += ", "; + extendClass += ", "; } } - + /*{<%=extendClass%>org.codelutin.topia.persistence.TopiaEntity { }*/ @@ -200,8 +222,7 @@ return; } generateInterfaceHeader(output, clazz); - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { ObjectModelAttribute reverse = attr.getReverseAttribute(); if (!attr.isNavigable() && !hasUnidirectionalRelationOnAbstractType(reverse, model)) { @@ -233,7 +254,9 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ /** * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> La valeur de l'attribut <%=attr.getAssociationClass().getName()%> à positionner. *) @@ -302,7 +325,9 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ /** * @param <%=Util.toLowerCaseFirstLetter(attr.getAssociationClass().getName())%> L'instance de <%=attr.getAssociationClass().getName()%> à ajouter. *) @@ -350,7 +375,9 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ /** * @return La liste des attributs <%=attr.getAssociationClass().getName()%>. *) @@ -373,19 +400,18 @@ //Méthodes d'accès aux attributs d'une classe d'associations if (clazz instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)clazz; - for (Iterator i = assoc.getParticipantsAttributes().iterator(); i.hasNext(); ) { - ObjectModelAttribute attr = (ObjectModelAttribute) i.next(); - if (attr != null) { - String type = attr.getType(); - String name = attr.getName(); - generateAssociationAccessors(output, name, type); - if (attr.getReverseAttribute() == null) { - type = ((ObjectModelClassifier)attr.getDeclaringElement()).getQualifiedName(); - name = attr.getDeclaringElement().getName(); - generateAssociationAccessors(output, name, type); - } - } + ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) clazz; + for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { + if (attr != null) { + String type = attr.getType(); + String name = attr.getName(); + generateAssociationAccessors(output, name, type); + if (attr.getReverseAttribute() == null) { + type = ((ObjectModelClassifier) attr.getDeclaringElement()).getQualifiedName(); + name = attr.getDeclaringElement().getName(); + generateAssociationAccessors(output, name, type); + } + } } } @@ -396,33 +422,38 @@ } private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { - for (Iterator it = classifier.getOperations().iterator(); it.hasNext();) { - ObjectModelOperation op = (ObjectModelOperation)it.next(); + for (ObjectModelOperation op : classifier.getOperations()) { /*{ /** }*/ if (GeneratorUtil.hasDocumentation(op)) { /*{ * <%=op.getName()%> : <%=op.getDocumentation()%> }*/ } - Collection<ObjectModelParameter> params = (Collection<ObjectModelParameter>)op.getParameters(); - for(ObjectModelParameter param : params) { - if(log.isTraceEnabled()) {log.trace("Param" + param);} + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param); + } /*{ * @param <%=param.getName()%> <%=param.getDocumentation()%> - }*/ + }*/ } /*{ *) <%=op.getVisibility()%> <%=op.getReturnType()%> <%=op.getName()%>(}*/ String vir = ""; - for(ObjectModelParameter param : params){ - if(log.isTraceEnabled()) {log.trace("Param" + param + " vir" + vir);} + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param + " vir" + vir); + } /*{<%=vir%><%=param.getType()%> <%=param.getName()%>}*/ vir = ", "; } /*{)}*/ - Set<String> exceptions = (Set<String>)op.getExceptions(); + Set<String> exceptions = op.getExceptions(); vir = " throws "; for (String exception : exceptions) { - if(log.isTraceEnabled()) {log.trace("exception" + exception + " vir" + vir);} + if (log.isTraceEnabled()) { + log.trace("exception" + exception + " vir" + vir); + } /*{<%=vir%><%=exception%>}*/ vir = ", "; }

1 0

r1266 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 11, 2008

Dec. 11, 2008

Author: tchemit Date: 2008-12-11 21:33:45 +0000 (Thu, 11 Dec 2008) New Revision: 1266 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java Log: fix methods to test if a EnittyImpl is abstract (was not ok when you add an Interface to a Entity) Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java 2008-12-11 16:33:58 UTC (rev 1265) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java 2008-12-11 21:33:45 UTC (rev 1266) @@ -33,14 +33,19 @@ import java.io.IOException; import java.io.Writer; import java.util.Iterator; +import java.util.Collection; import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelOperation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class EntityImplGenerator extends ObjectModelGenerator { + private static final Log log = LogFactory.getLog(EntityImplGenerator.class); + public EntityImplGenerator() { super(); } @@ -61,17 +66,17 @@ } //De même, on ne génère pas le impl si il y a des opérations venant des // superclasses non implémentées - for (Iterator otherOps = clazz.getAllOtherOperations(false).iterator(); otherOps.hasNext(); ) { - ObjectModelOperation otherOp = (ObjectModelOperation)otherOps.next(); + for (ObjectModelOperation otherOp : clazz.getAllOtherOperations(false)) { if (otherOp.isAbstract()) { return; } } - boolean isAbstract = clazz.isAbstract(); + boolean isAbstract = isAbstract(clazz); + //boolean isAbstract = clazz.isAbstract(); //Une classe peut être abstraite si elle a des méthodes définies dans // ses superinterface et non implantées dans ses superclasses - if (!isAbstract) { + /*if (!isAbstract) { for (Iterator operations = clazz.getAllInterfaceOperations(true).iterator(); (!isAbstract) && operations.hasNext(); ) { ObjectModelOperation op = (ObjectModelOperation)operations.next(); boolean implementationFound = false; @@ -84,7 +89,7 @@ } isAbstract = !implementationFound; } - } + }*/ String copyright = GeneratorUtil.getCopyright(model); if (GeneratorUtil.notEmpty(copyright)) { /*{<%=copyright%> @@ -107,4 +112,35 @@ }*/ } + + protected boolean isAbstract(ObjectModelClass clazz) { + if (clazz.isAbstract()) { + return true; + } + + //Une classe peut être abstraite si elle a des méthodes définies dans + // ses superinterface et non implantées dans ses superclasses + Collection<ObjectModelOperation> allInterfaceOperations = clazz.getAllInterfaceOperations(true); + allInterfaceOperations.removeAll(clazz.getAllOtherOperations(true)); + for (ObjectModelOperation op : allInterfaceOperations) { + boolean implementationFound = false; + for (ObjectModelClass superClazz : clazz.getSuperclasses()) { + for (ObjectModelOperation matchingOp : superClazz.getOperations(op.getName())) { + implementationFound = (op.equals(matchingOp) && !matchingOp.isAbstract()); + if (implementationFound) { + break; + } + } + if (implementationFound) { + break; + } + } + if (!implementationFound) { + log.info(clazz.getName()+" : abstract operation "+op); + return true; + } + } + return false; + } + } //EntityPOJOGenerator

1 0

r1265 - in topia/trunk/topia-persistence: . src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 11, 2008

Dec. 11, 2008

Author: tchemit Date: 2008-12-11 16:33:58 +0000 (Thu, 11 Dec 2008) New Revision: 1265 Added: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java Modified: topia/trunk/topia-persistence/changelog.txt Log: add a InterfaceGenerator to generate simple with no stereotype interfaces. Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2008-12-10 16:30:17 UTC (rev 1264) +++ topia/trunk/topia-persistence/changelog.txt 2008-12-11 16:33:58 UTC (rev 1265) @@ -1,3 +1,6 @@ +2.1.1 ?? 200812?? +* 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. + 2.1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2 - add some usefull methods in TopiaUtil to help with regex on topiaId expression \ No newline at end of file Copied: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java (from rev 1250, topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java) =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java (rev 0) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java 2008-12-11 16:33:58 UTC (rev 1265) @@ -0,0 +1,186 @@ +/* *##% ToPIA - Tools for Portable and Independent Architecture + * Copyright (C) 2004 - 2008 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>. ##%*/ + +/* * +* EntityGenerator.java +* +* Created: 12 déc. 2005 +* +* @author Arnaud Thimel <thimel(a)codelutin.com> +* @version $Revision$ +* +* Mise a jour: $Date$ +* par : $Author$ +*/ + +package org.codelutin.topia.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.generator.Generator; +import org.codelutin.generator.ObjectModelGenerator; +import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.generator.models.object.ObjectModelClassifier; +import org.codelutin.generator.models.object.ObjectModelInterface; +import org.codelutin.generator.models.object.ObjectModelOperation; +import org.codelutin.generator.models.object.ObjectModelParameter; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +public class InterfaceGenerator extends ObjectModelGenerator { //InterfaceGenerator + + /** 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"; + } + + @Override + public String getFilenameForInterface(ObjectModelInterface interfacez) { + return interfacez.getQualifiedName().replace('.', File.separatorChar) + ".java"; + } + + @Override + public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + if (!interfacez.getStereotypes().isEmpty()) { + // can only generate an interface with there is no other stereotypes + return; + } + + // log + if (log.isDebugEnabled()) { + log.debug("Generating interface for : " + interfacez.getName()); + } + + generateInterfaceHeader(output, interfacez); + + generateInterfaceOperations(output, interfacez); + +/*{} //<%=interfacez.getName()%> +}*/ + } + + private String getStringRepresentation(List<String> strings) { + StringBuffer result = new StringBuffer(); + String doubleQuote = "\""; + String comma = ","; + Iterator<String> it = strings.iterator(); + while (it.hasNext()) { + result.append(doubleQuote); + result.append(it.next()); + result.append(doubleQuote); + if (it.hasNext()) { + result.append(comma); + } + } + return result.toString(); + } + + private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException { + String copyright = GeneratorUtil.getCopyright(model); + if (GeneratorUtil.notEmpty(copyright)) { +/*{<%=copyright%> +}*/ + } +/*{package <%=classifier.getPackageName()%>; + +}*/ + if (GeneratorUtil.hasDocumentation(classifier)) { +/*{ +/** + * <%=classifier.getDocumentation()%> + *) +}*/ + } +/*{public interface <%=classifier.getName()%> }*/ + String extendClass = ""; + if (!classifier.getInterfaces().isEmpty()) { + for (ObjectModelClassifier parent : classifier.getInterfaces()) { + extendClass += parent.getQualifiedName(); + extendClass += ", "; + } + if (log.isTraceEnabled()) { + log.trace("Interface : " + extendClass); + } + +/*{ extends <%=extendClass%> { + +}*/ + } +/*{ { +}*/ + } + + private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { + for (ObjectModelOperation op : classifier.getOperations()) { +/*{ /** +}*/ + if (GeneratorUtil.hasDocumentation(op)) { +/*{ * <%=op.getName()%> : <%=op.getDocumentation()%> +}*/ + } + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param); + } +/*{ * @param <%=param.getName()%> <%=param.getDocumentation()%> + }*/ + } +/*{ *) + <%=op.getVisibility()%> <%=op.getReturnType()%> <%=op.getName()%>(}*/ + String vir = ""; + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param + " vir" + vir); + } +/*{<%=vir%><%=param.getType()%> <%=param.getName()%>}*/ + vir = ", "; + } +/*{)}*/ + Set<String> exceptions = op.getExceptions(); + vir = " throws "; + for (String exception : exceptions) { + if (log.isTraceEnabled()) { + log.trace("exception" + exception + " vir" + vir); + } +/*{<%=vir%><%=exception%>}*/ + vir = ", "; + } +/*{; + +}*/ + } + } + +} //InterfaceGenerator \ No newline at end of file Property changes on: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

r1264 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:30:17 +0000 (Wed, 10 Dec 2008) New Revision: 1264 Modified: topia-test/trunk/pom.xml Log: push back scm generic values Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:23:30 UTC (rev 1263) +++ topia-test/trunk/pom.xml 2008-12-10 16:30:17 UTC (rev 1264) @@ -22,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -128,9 +128,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>

1 0

r1263 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:30 +0000 (Wed, 10 Dec 2008) New Revision: 1263 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) +++ topia-test/trunk/pom.xml 2008-12-10 16:23:30 UTC (rev 1263) @@ -14,7 +14,7 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <dependencies> @@ -22,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -128,9 +128,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> </scm>

1 0

r1262 - in topia-test/tags: . 2.1.0
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:27 +0000 (Wed, 10 Dec 2008) New Revision: 1262 Added: topia-test/tags/2.1.0/ topia-test/tags/2.1.0/changelog.txt topia-test/tags/2.1.0/pom.xml Removed: topia-test/tags/2.1.0/changelog.txt topia-test/tags/2.1.0/pom.xml Log: [maven-release-plugin] copy for tag 2.1.0 Copied: topia-test/tags/2.1.0 (from rev 1250, topia-test/trunk) Deleted: topia-test/tags/2.1.0/changelog.txt =================================================================== --- topia-test/trunk/changelog.txt 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-test/tags/2.1.0/changelog.txt 2008-12-10 16:23:27 UTC (rev 1262) @@ -1,3 +0,0 @@ -2.0.28 ?? 200812?? - * 20081206 [chemit] - improve poms, use lutinproject 3.2 - \ No newline at end of file Copied: topia-test/tags/2.1.0/changelog.txt (from rev 1260, topia-test/trunk/changelog.txt) =================================================================== --- topia-test/tags/2.1.0/changelog.txt (rev 0) +++ topia-test/tags/2.1.0/changelog.txt 2008-12-10 16:23:27 UTC (rev 1262) @@ -0,0 +1,3 @@ +2.1.0 chemit 20081210 + * 20081206 [chemit] - improve poms, use lutinproject 3.2 + \ No newline at end of file Deleted: topia-test/tags/2.1.0/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-test/tags/2.1.0/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) @@ -1,134 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>topia-test</artifactId> - <version>2.0.28-SNAPSHOT</version> - - <dependencies> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.61</version> - <scope>test</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA Testing</name> - - <description>Test de ToPIA</description> - <inceptionYear>2007</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> - -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <topia.version>2.0.27</topia.version> - -  - <generator.version>0.62-SNAPSHOT</generator.version> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> -  - <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-sources/java</destDirGen> - <defaultPackage>org.codelutin.topia</defaultPackage> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - -</project> Copied: topia-test/tags/2.1.0/pom.xml (from rev 1261, topia-test/trunk/pom.xml) =================================================================== --- topia-test/tags/2.1.0/pom.xml (rev 0) +++ topia-test/tags/2.1.0/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) @@ -0,0 +1,137 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>topia-test</artifactId> + <version>2.1.0</version> + + <dependencies> + +  + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>2.1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.61</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA Testing</name> + + <description>Test de ToPIA</description> + <inceptionYear>2007</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <generator.version>0.62</generator.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> +  + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>org.codelutin.topia</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + </scm> + + +</project>

1 0

r1261 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:24 +0000 (Wed, 10 Dec 2008) New Revision: 1261 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.1.0 Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:20:41 UTC (rev 1260) +++ topia-test/trunk/pom.xml 2008-12-10 16:23:24 UTC (rev 1261) @@ -1,6 +1,5 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,7 +14,7 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.0</version> <dependencies> @@ -23,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> + <version>2.1.0</version> <scope>compile</scope> </dependency> @@ -129,9 +128,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> </scm>

1 0

r1260 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:20:41 +0000 (Wed, 10 Dec 2008) New Revision: 1260 Modified: topia-test/trunk/changelog.txt topia-test/trunk/pom.xml Log: prepare release Modified: topia-test/trunk/changelog.txt =================================================================== --- topia-test/trunk/changelog.txt 2008-12-10 15:57:54 UTC (rev 1259) +++ topia-test/trunk/changelog.txt 2008-12-10 16:20:41 UTC (rev 1260) @@ -1,3 +1,3 @@ -2.0.28 ?? 200812?? +2.1.0 chemit 20081210 * 20081206 [chemit] - improve poms, use lutinproject 3.2 \ No newline at end of file Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 15:57:54 UTC (rev 1259) +++ topia-test/trunk/pom.xml 2008-12-10 16:20:41 UTC (rev 1260) @@ -15,15 +15,15 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.0.28-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <dependencies>  <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -42,6 +42,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + </dependencies>  @@ -67,11 +74,8 @@  <labs.project>topia</labs.project> -  - <topia.version>2.0.27</topia.version> -  - <generator.version>0.62-SNAPSHOT</generator.version> + <generator.version>0.62</generator.version> </properties> <build> @@ -106,9 +110,9 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r1259 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 15:57:54 +0000 (Wed, 10 Dec 2008) New Revision: 1259 Modified: topia-service/trunk/pom.xml Log: push back scm generic values Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-10 15:47:07 UTC (rev 1258) +++ topia-service/trunk/pom.xml 2008-12-10 15:57:54 UTC (rev 1259) @@ -167,9 +167,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0