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

r1911 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework site/rst
by fdesbois＠users.nuiton.org April 27, 2010

April 27, 2010

Author: fdesbois Date: 2010-04-27 18:26:36 +0200 (Tue, 27 Apr 2010) New Revision: 1911 Log: [TopiaQuery] - correct documentation for null case - add method addInElements + ignore problematic orderBy in executeCount Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/site/rst/TopiaQuery.rst Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-04-23 14:35:05 UTC (rev 1910) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-04-27 16:26:36 UTC (rev 1911) @@ -798,6 +798,26 @@ } /** + * Add link constraint between two properties. {@code propertyA} is in + * elements of {@code propertyB} which is a collection with same type than + * {@code propertyA}. (HQL : A IN elements (B)) + * + * @param propertyA contains in propertyB collection + * @param propertyB collection which contains propertyA + * @return the TopiaQuery + */ + public TopiaQuery addInElements(String propertyA, String propertyB) { + StringBuilder builder = new StringBuilder(propertyA). + append("IN elements ("). + append(propertyB). + append(')'); + parentheses = false; + add(builder.toString()); + parentheses = true; + return this; + } + + /** * Add an element to the select in the query. Depends on the result wanted * in execute methods. The main entity will be automatically added only if * an alias is initialize from constructor. If you want only this select @@ -1257,14 +1277,18 @@ /** * Execute a simple count on the query, i.e. the number of results get from - * the query. + * the query. The order is not considered to count the elements. * * @param transaction the TopiaContext to use for execution * @return an int corresponding to the number of result in the query * @throws TopiaException */ public int executeCount(TopiaContext transaction) throws TopiaException { - return executeToInteger(transaction, "COUNT(*)"); + StringBuilder oldOrder = orderBy; + orderBy = null; + int result = executeToInteger(transaction, "COUNT(*)"); + orderBy = oldOrder; + return result; } /** Modified: trunk/topia-persistence/src/site/rst/TopiaQuery.rst =================================================================== --- trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-23 14:35:05 UTC (rev 1910) +++ trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-27 16:26:36 UTC (rev 1911) @@ -104,10 +104,10 @@ query.addNotNull("name"); // Recherche des navires n'ayant pas de nom - query.add("name", null); + query.add("name", Op.EQ, null); // Recherche des navires ayant une date de construction 2003, 2004 ou 2006 - query.add("buildYear", Arrays.asList(new Object[] {2003, 2004, 2006})); + query.add("buildYear", 2003, 2004, 2006); Il est fortement conseillé d'utiliser les constantes des entités pour les noms de leurs propriétés ::

1 0

r1910 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:35:05 +0200 (Fri, 23 Apr 2010) New Revision: 1910 Log: - Evolution #552: Clean api - Deprecates some TopiaGeneratorUil methods (already present in GeneratorUtil) Modified: trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/pom.xml 2010-04-23 14:35:05 UTC (rev 1910) @@ -274,7 +274,7 @@  <profile> - <id>reporting-profile</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -38,11 +38,11 @@ import java.util.*; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; @@ -56,7 +56,7 @@ /** * Classe regroupant divers méthodes utiles pour la génération des entités */ -public class TopiaGeneratorUtil extends GeneratorUtil { +public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Logger @@ -77,7 +77,10 @@ public static final String STEREOTYPE_DTO = "dto"; /** * Stéréotype pour les objets devant être générées sous forme de bean + * @deprecated since 2.4, prefer use the + * {@link JavaGeneratorUtil#STEREOTYPE_BEAN} method. */ + @Deprecated public static final String STEREOTYPE_BEAN = "bean"; /** * Stéréotype pour les interfaces devant être générées sous forme de @@ -594,15 +597,19 @@ * * @param attr l'attribut a traiter * @return le nom de l'attribut de classe d'association + * @deprecated since 2.4, prefer use the + * {@link GeneratorUtil#getAssocAttrName(ObjectModelAttribute)} */ + @Deprecated public static String getAssocAttrName(ObjectModelAttribute attr) { - String typeName = attr.getType().substring( - attr.getType().lastIndexOf(".") + 1); - String result = attr.getName(); - if (attr.getName().equalsIgnoreCase(typeName)) { - result += StringUtils.capitalize( - attr.getAssociationClass().getName()); - } + String result = GeneratorUtil.getAssocAttrName(attr); +// String typeName = attr.getType().substring( +// attr.getType().lastIndexOf(".") + 1); +// String result = attr.getName(); +// if (attr.getName().equalsIgnoreCase(typeName)) { +// result += StringUtils.capitalize( +// attr.getAssociationClass().getName()); +// } return result; } @@ -953,13 +960,21 @@ return result; } + /** + * + * @param fqn fqn to parse + * @return the simple name of fqn + * @deprecated since 2.0.2 : already in GeneratorUtil + */ + @Deprecated public static String getSimpleName(String fqn) { - int lasIndex = fqn.lastIndexOf("."); - if (lasIndex == 1) { - // primitive type - return fqn; - } - return fqn.substring(lasIndex + 1); + return GeneratorUtil.getSimpleName(fqn); +// int lasIndex = fqn.lastIndexOf("."); +// if (lasIndex == 1) { +// // primitive type +// return fqn; +// } +// return fqn.substring(lasIndex + 1); /*if (lasIndex == aClass.getPackageName().length()) { // same package return fqn.substring(lasIndex + 1); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -36,7 +36,6 @@ */ package org.nuiton.topia.persistence; -import java.lang.Class; import java.security.Permission; import java.util.Collection; import java.util.List; @@ -72,7 +71,7 @@ * * @return new entity instance * @since 2.3.1 - * @throws TopiaException + * @throws TopiaException if any pb while creating the entitie */ Entity newInstance() throws TopiaException; @@ -134,17 +133,17 @@ * * @param e l'entité instanciée à sauver * @return l'entité avec son topiaID valorisé - * @throws TopiaException + * @throws TopiaException if any pb while creating datas * * @since 2.3.1 - * @throw TopiaException if any pb while creating datas */ Entity create(Entity e) throws TopiaException; /** * Permet d'ajouter ou de mettre a jour un objet. Cela permet d'ajouter * par exemple un objet provenant d'un autre context mais du meme type - * de DAO + * de DAO. + * * @param e l'entite a ajouter ou mettre a jour * @return l'entity passé en paramètre. * @throws TopiaException if any pb while updating datas @@ -152,9 +151,10 @@ Entity update(Entity e) throws TopiaException; /** - * Permet de supprimer - * @param e - * @throws TopiaException + * Permet de supprimer une entite. + * + * @param e l'entite a supprimer + * @throws TopiaException if any pb while deleting datas */ void delete(Entity e) throws TopiaException; @@ -258,7 +258,7 @@ * * @param keys la liste des champs de la cle naturelle avec leur valeur * @return l'entite trouvé - * @throws TopiaException + * @throws TopiaException if any pb while getting datas */ Entity findByPrimaryKey(Map<String, Object> keys) throws TopiaException; @@ -278,8 +278,8 @@ /** * - * @param propertyName - * @param value + * @param propertyName le nom de la propriété + * @param value la valeur à tester * @param others les autres proprietes doivent aller par 2 propertyName, * value * @return l'entité trouvé @@ -295,8 +295,8 @@ /** * - * @param propertyName - * @param value + * @param propertyName le nom de la propriété + * @param value la valeur à tester * @param others les autres proprietes doivent aller par 2 propertyName, * value * @return l'entité trouvé @@ -315,35 +315,35 @@ * 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 + * @param properties les proprietes a utiliser * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - Entity findContainsProperties(Map<String, Collection> properties) throws + Entity findContainsProperties(Map<String, Collection<?>> properties) throws TopiaException; /** * 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 + * @param propertyName le nom de la propriété + * @param values les premières valeurs à tester + * @param others les secondes valeurs ) tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - Entity findContainsProperties(String propertyName, Collection values, + Entity findContainsProperties(String propertyName, Collection<?> values, Object... others) throws TopiaException; /** * 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 + * @param properties les propriétés à tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - List<Entity> findAllContainsProperties(Map<String, Collection> properties) + List<Entity> findAllContainsProperties(Map<String, Collection<?>> properties) throws TopiaException; /** @@ -351,13 +351,13 @@ * propertyName contient values, ainsi de suite avec others. * * @param propertyName the name of the property - * @param values - * @param others + * @param values les premières valeurs à tester + * @param others les secondes valeurs à tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ List<Entity> findAllContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException; + Collection<?> values, Object... others) throws TopiaException; /** * Find usages of the given {@code entity} in the entities of the given @@ -393,7 +393,7 @@ * service Taas. * * @param topiaId topiaId d'une entite - * @param actions + * @param actions encoded actions * @return la liste des permissions * @throws TopiaException if any pb while getting datas */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -273,7 +273,7 @@ public E create(Object... properties) throws TopiaException { Map<String, Object> map = new HashMap<String, Object>(); Object propertyName = null; - Object value = null; + Object value; try { for (int i = 0; i < properties.length;) { propertyName = properties[i++]; @@ -413,7 +413,7 @@ } @Override - public E findContainsProperties(Map<String, Collection> properties) + public E findContainsProperties(Map<String, Collection<?>> properties) throws TopiaException { List<E> results = findAllContainsProperties(properties); E result = null; @@ -425,14 +425,14 @@ @Override public E findContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException { - Map<String, Collection> properties = new HashMap<String, Collection>(); + Collection<?> values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; for (int i = 0; i < others.length;) { try { name = others[i++]; - values = (Collection) others[i++]; + values = (Collection<?>) others[i++]; properties.put((String) name, values); } catch (ClassCastException eee) { throw new IllegalArgumentException( @@ -467,16 +467,16 @@ */ @Override public List<E> findAllContainsProperties(Map<String, - Collection> properties) throws TopiaException { + Collection<?>> properties) throws TopiaException { List<E> all = findAll(); List<E> result = new ArrayList<E>(); for (E e : all) { boolean ok = true; try { - for (Entry<String, Collection> kv : properties.entrySet()) { - Collection entityValues = (Collection) PropertyUtils + for (Entry<String, Collection<?>> kv : properties.entrySet()) { + Collection<?> entityValues = (Collection<?>) PropertyUtils .getProperty(e, kv.getKey()); - Collection values = kv.getValue(); + Collection<?> values = kv.getValue(); if (!entityValues.containsAll(values)) { ok = false; break; @@ -521,14 +521,14 @@ @Override public List<E> findAllContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException { - Map<String, Collection> properties = new HashMap<String, Collection>(); + Collection<?> values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; for (int i = 0; i < others.length;) { try { name = others[i++]; - values = (Collection) others[i++]; + values = (Collection<?>) others[i++]; properties.put((String) name, values); } catch (ClassCastException eee) { throw new IllegalArgumentException(

1 0

r1909 - in trunk: . topia-service-replication
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:32:23 +0200 (Fri, 23 Apr 2010) New Revision: 1909 Log: - comment no more used dependencies from no used modules - rename reporting-profile into reporting Modified: trunk/pom.xml trunk/topia-service-replication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 14:28:34 UTC (rev 1908) +++ trunk/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) @@ -71,21 +71,9 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> + - </dependency> <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -113,40 +101,7 @@ <scope>runtime</scope> </dependency> -  <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>asm</artifactId> - <version>1.5.4-snapshot</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - <version>1.2.6</version> - <scope>compile</scope> - <exclusions> -  - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.8.0.GA</version> @@ -176,8 +131,61 @@ <scope>test</scope> </dependency> +  + +  + +  +  + +  +  +  + +  - <dependency> +  </dependencies> </dependencyManagement> @@ -216,7 +224,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.1</eugene.version> + <eugene.version>2.0.2-SNAPSHOT</eugene.version> <lutinutil.version>1.2.2</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.1</i18n.version> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-04-23 14:28:34 UTC (rev 1908) +++ trunk/topia-service-replication/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) @@ -190,7 +190,7 @@  <profile> - <id>reporting-profile</id> + <id>reporting</id> <activation> <property> <name>performRelease</name>

1 0

r1908 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:28:34 +0200 (Fri, 23 Apr 2010) New Revision: 1908 Log: add FIXME on ServiceTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-23 12:28:49 UTC (rev 1907) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-23 14:28:34 UTC (rev 1908) @@ -451,7 +451,8 @@ */ protected void createOperationImplementation( ObjectModelClass serviceAbstract, - ObjectModelOperation abstOp, ObjectModelOperation source, + ObjectModelOperation abstOp, + ObjectModelOperation source, String serviceContractName) { // boolean to specify if the method need a transaction or not @@ -656,6 +657,7 @@ */ protected String getReturnValue(String returnType) { try { + //FIXME-TC20100423 : can not deal with Object types (float != Float) Primitive prim = Primitive.valueOf(StringUtils.upperCase(returnType)); return prim.getValue(); @@ -665,6 +667,7 @@ } } + //FIXME-TC20100423 : REMOVE THIS! protected enum Primitive { BYTE("0"), SHORT("0"),

1 0

r1907 - trunk/src/site/rst
by jcouteau＠users.nuiton.org April 23, 2010

April 23, 2010

Author: jcouteau Date: 2010-04-23 14:28:49 +0200 (Fri, 23 Apr 2010) New Revision: 1907 Log: Add text in english to inform that we are updating and translating the documentation on the index page Modified: trunk/src/site/rst/index.rst Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-04-21 16:01:01 UTC (rev 1906) +++ trunk/src/site/rst/index.rst 2010-04-23 12:28:49 UTC (rev 1907) @@ -25,6 +25,14 @@ Accueil ======= +Presentation +------------ + +ToPIA stands for Tools for Portable and Independent Architecture. It is a +technical platform abstraction framework. This documentation is not up-to-date +and in French. We are in the process to update this documentation, we will +translate it in English at the same time. + Présentation ------------

1 0

r1906 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org April 21, 2010

April 21, 2010

Author: fdesbois Date: 2010-04-21 18:01:01 +0200 (Wed, 21 Apr 2010) New Revision: 1906 Log: Ano #546 : - getChildContext() is used to make a thread-safe copy of the childContext set. This method need to be used when iteration is needed on childContext (no local copy is needed anymore). - Use Collections methods to avoid warning on childContext instantiation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-04-20 13:08:06 UTC (rev 1905) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-04-21 16:01:01 UTC (rev 1906) @@ -25,7 +25,6 @@ package org.nuiton.topia.framework; -import org.apache.commons.collections.set.MapBackedSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -83,9 +82,11 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -93,7 +94,6 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.zip.GZIPInputStream; -import org.apache.commons.collections.set.SynchronizedSet; import org.nuiton.topia.persistence.TopiaDAOImpl; import static org.nuiton.i18n.I18n._; @@ -162,13 +162,22 @@ * cache des DAO deja chargé pour ce context */ protected Map<Class<? extends TopiaEntity>, TopiaDAO<? extends TopiaEntity>> daoCache = new HashMap<Class<? extends TopiaEntity>, TopiaDAO<? extends TopiaEntity>>(); + /** - * Set des sous context creer avec un beginTransaction et donc sur lequel - * nous sommes listener + * Set of child context created with {@link #beginTransaction()}. We are + * listener on these context. + * A WeakHashMap is used to remove old context automically when it's not + * used anymore. The {@link #finalize} method will be executed when Garbage + * collector is called when reference is removed. + * The set is synchronized in case of using multi-threading. + * @see Collections#synchronizedSet(Set) + * @see Collections#newSetFromMap(Map) */ - // by sletellier 24/09/09 : Fix concurent acces error -// protected Set<TopiaContextImplementor> childContext = MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()); - protected Set<TopiaContextImplementor> childContext = SynchronizedSet.decorate(MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>())); + protected final Set<TopiaContextImplementor> childContext = + Collections.synchronizedSet( + Collections.newSetFromMap( + new WeakHashMap<TopiaContextImplementor, Boolean>())); + /** key: service name; value: service instance */ protected Map<String, TopiaService> services; /** */ @@ -326,7 +335,14 @@ @Override public Set<TopiaContextImplementor> getChildContext() { - return childContext; + // FD-20100421 : Ano #546 + // Copy the childContext into a new set + final Set<TopiaContextImplementor> values; + // Synchronize copy to be thread-safe during iteration + synchronized (childContext) { + values = new HashSet<TopiaContextImplementor>(childContext); + } + return values; } protected void addChildContext(TopiaContextImplementor child) { @@ -707,26 +723,22 @@ @Override public void closeContext() throws TopiaException { - // 20060926 poussin: Si si on peut, ca ferme en fait tous les enfants et c tout - // if (getRootContext() == this) { - // throw new TopiaException( - // "Vous ne pouvez pas fermer le root context"); - // } + // Throw exception if context is already closed checkClosed(_("topia.persistence.error.context.already.closed")); -// checkClosed("Ce contexte a deja ete ferme"); - // suppression des contexts fils - TopiaContextImplementor[] childs = childContext.toArray(new TopiaContextImplementor[childContext.size()]); - for (TopiaContextImplementor child : childs) { + // FD-20100421 : Ano #546 : no need to copy childContext, the + // {@link #getChildContext()} provides a thread-safe copy to iterate + // on it. +// TopiaContextImplementor[] children = childContext.toArray( +// new TopiaContextImplementor[childContext.size()]); + + // Remove all children context + for (TopiaContextImplementor child : getChildContext()) { + // Avoid to have exception from checkClosed method on child if (!child.isClosed()) { child.closeContext(); } } - // for (Iterator iter = childContext.iterator(); iter.hasNext();) { - // TopiaContextImplementor child = (TopiaContextImplementor) iter.next(); - // child.closeContext(); - // iter.remove(); - // } // on se desenregistre du context pere et on ferme les connexions si // on est pas le root context Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2010-04-20 13:08:06 UTC (rev 1905) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2010-04-21 16:01:01 UTC (rev 1906) @@ -58,6 +58,8 @@ public interface TopiaContextImplementor extends TopiaContext { /** + * Retrieve a thread-safe copy of children context set. + * * @return Returns the childContext. */ Set<TopiaContextImplementor> getChildContext(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2010-04-20 13:08:06 UTC (rev 1905) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2010-04-21 16:01:01 UTC (rev 1906) @@ -531,11 +531,12 @@ protected TopiaContextImplementor getContext( TopiaContextImplementor parent, Session hibernate) { TopiaContextImplementor result = null; - // on copie la liste pour evite les acces concurrent (parcours durant la - // creation d'un sous context) - Set<TopiaContextImplementor> contextChilds = new HashSet<TopiaContextImplementor>(parent.getChildContext()); - for (TopiaContextImplementor context : contextChilds) { + // FD-20100421 : Ano #546 : no need to copy childContext, the + // {@link #getChildContext()} provides a thread-safe copy to iterate + // on it. +// Set<TopiaContextImplementor> contextChilds = new HashSet<TopiaContextImplementor>(parent.getChildContext()); + for (TopiaContextImplementor context : parent.getChildContext()) { // by sletellier 24/09/09 : Fix concurent acces error // ArrayList<TopiaContextImplementor> children = new ArrayList(parent.getChildContext());

1 0

r1905 - trunk
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 15:08:06 +0200 (Tue, 20 Apr 2010) New Revision: 1905 Log: Utilisation de mavenpom4redmine 2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) +++ trunk/pom.xml 2010-04-20 13:08:06 UTC (rev 1905) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.1</version> + <version>2.1.2</version> </parent> <artifactId>topia</artifactId>

1 0

r1904 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 11:07:19 +0200 (Tue, 20 Apr 2010) New Revision: 1904 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 09:07:16 UTC (rev 1903) +++ trunk/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -294,9 +294,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.3</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-04-20 09:07:16 UTC (rev 1903) +++ trunk/topia-persistence/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-04-20 09:07:16 UTC (rev 1903) +++ trunk/topia-service-migration/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-04-20 09:07:16 UTC (rev 1903) +++ trunk/topia-service-replication/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-04-20 09:07:16 UTC (rev 1903) +++ trunk/topia-service-security/pom.xml 2010-04-20 09:07:19 UTC (rev 1904) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1903 - in tags: . topia-2.3.3
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 11:07:16 +0200 (Tue, 20 Apr 2010) New Revision: 1903 Log: [maven-release-plugin] copy for tag topia-2.3.3 Added: tags/topia-2.3.3/ Property changes on: tags/topia-2.3.3 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r1902 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 11:07:14 +0200 (Tue, 20 Apr 2010) New Revision: 1902 Log: [maven-release-plugin] prepare release topia-2.3.3 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 09:04:14 UTC (rev 1901) +++ trunk/pom.xml 2010-04-20 09:07:14 UTC (rev 1902) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.3.3</version> <modules> <module>topia-persistence</module> @@ -294,9 +294,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.3</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-04-20 09:04:14 UTC (rev 1901) +++ trunk/topia-persistence/pom.xml 2010-04-20 09:07:14 UTC (rev 1902) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-04-20 09:04:14 UTC (rev 1901) +++ trunk/topia-service-migration/pom.xml 2010-04-20 09:07:14 UTC (rev 1902) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-04-20 09:04:14 UTC (rev 1901) +++ trunk/topia-service-replication/pom.xml 2010-04-20 09:07:14 UTC (rev 1902) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-04-20 09:04:14 UTC (rev 1901) +++ trunk/topia-service-security/pom.xml 2010-04-20 09:07:14 UTC (rev 1902) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.3.3</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0