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

r2092 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 26 Jul '10

26 Jul '10

Author: tchemit Date: 2010-07-26 16:35:54 +0200 (Mon, 26 Jul 2010) New Revision: 2092 Url: http://nuiton.org/repositories/revision/topia/2092 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-07-26 14:35:52 UTC (rev 2091) +++ trunk/pom.xml 2010-07-26 14:35:54 UTC (rev 2092) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4.2</version> + <version>2.4.3-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4.2</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-07-26 14:35:52 UTC (rev 2091) +++ trunk/topia-persistence/pom.xml 2010-07-26 14:35:54 UTC (rev 2092) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2</version> + <version>2.4.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-26 14:35:52 UTC (rev 2091) +++ trunk/topia-service-migration/pom.xml 2010-07-26 14:35:54 UTC (rev 2092) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2</version> + <version>2.4.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-26 14:35:52 UTC (rev 2091) +++ trunk/topia-service-replication/pom.xml 2010-07-26 14:35:54 UTC (rev 2092) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2</version> + <version>2.4.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-26 14:35:52 UTC (rev 2091) +++ trunk/topia-service-security/pom.xml 2010-07-26 14:35:54 UTC (rev 2092) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2</version> + <version>2.4.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2091 - in tags: . topia-2.4.2
by tchemit＠users.nuiton.org 26 Jul '10

26 Jul '10

Author: tchemit Date: 2010-07-26 16:35:52 +0200 (Mon, 26 Jul 2010) New Revision: 2091 Url: http://nuiton.org/repositories/revision/topia/2091 Log: [maven-release-plugin] copy for tag topia-2.4.2 Added: tags/topia-2.4.2/ Property changes on: tags/topia-2.4.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2090 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 26 Jul '10

26 Jul '10

Author: tchemit Date: 2010-07-26 16:35:50 +0200 (Mon, 26 Jul 2010) New Revision: 2090 Url: http://nuiton.org/repositories/revision/topia/2090 Log: [maven-release-plugin] prepare release topia-2.4.2 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-07-26 14:07:15 UTC (rev 2089) +++ trunk/pom.xml 2010-07-26 14:35:50 UTC (rev 2090) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,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.4.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4.2</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-07-26 14:07:15 UTC (rev 2089) +++ trunk/topia-persistence/pom.xml 2010-07-26 14:35:50 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-26 14:07:15 UTC (rev 2089) +++ trunk/topia-service-migration/pom.xml 2010-07-26 14:35:50 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-26 14:07:15 UTC (rev 2089) +++ trunk/topia-service-replication/pom.xml 2010-07-26 14:35:50 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-26 14:07:15 UTC (rev 2089) +++ trunk/topia-service-security/pom.xml 2010-07-26 14:35:50 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2089 - in trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication: . model operation
by tchemit＠users.nuiton.org 26 Jul '10

26 Jul '10

Author: tchemit Date: 2010-07-26 16:07:15 +0200 (Mon, 26 Jul 2010) New Revision: 2089 Url: http://nuiton.org/repositories/revision/topia/2089 Log: reformat code of replication service + prepare to solve revert operations--Cette ligne, et les suivantes ci-dessous, seront ignor?\195?\169es-- M topia-service-replication/src/main/java/org/nuiton/topia/replication/ReplicationEngine.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/model/Link.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachDependency.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationImplementor.java M topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/ReplicationEngine.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationImplementor.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/Link.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachDependency.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/ReplicationEngine.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/ReplicationEngine.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/ReplicationEngine.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.ServiceLoader; @@ -173,7 +172,10 @@ TopiaContextImplementor srcCtxt = null; Map<Class<? extends TopiaEntity>, List<String>> data = null; - Set<ReplicationNode> treated = new HashSet<ReplicationNode>(); + + // keep the list of treated nodes (to roolback them if something + // is wrong). + List<ReplicationNode> treated = new ArrayList<ReplicationNode>(); try { srcCtxt = (TopiaContextImplementor) context.beginTransaction(); @@ -184,9 +186,22 @@ model.adjustOperations(data); + //FIXME tchemit 2077-07-26, should use next line when + // http://nuiton.org/issues/show/779 is closed + boolean needTransaction = true; +// boolean needTransaction = ((TopiaContextImplementor) dstCtxt).getRootContext().equals(dstCtxt); + + TopiaContext tx; + for (ReplicationNode node : model.getOrder()) { + srcCtxt = (TopiaContextImplementor) context.beginTransaction(); - TopiaContext tx = dstCtxt.beginTransaction(); + + if (needTransaction) { + tx = dstCtxt.beginTransaction(); + } else { + tx = dstCtxt; + } try { doReplicateNode(node, srcCtxt, tx, data, treated); } catch (Exception e) { @@ -194,7 +209,12 @@ throw e; } finally { srcCtxt.closeContext(); - tx.closeContext(); + if (needTransaction) { + // on doit fermer la transaction car on l'a ouverte dans + // cette méthode, sinon c'est de la responsabilite du + // code appellant + tx.closeContext(); + } } } // } catch (Exception e) { @@ -221,14 +241,16 @@ //-------------------------------------------------------------------------- @Override - public ReplicationModel createModel(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException { + public ReplicationModel createModel(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException { Set<Class<? extends TopiaEntity>> detectTypes = detectTypes(contracts, topiaIds); ReplicationModel model = new ReplicationModel(contracts, detectTypes, topiaIds); return model; } @Override - public ReplicationModel createModelWithComputedOrder(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException { + public ReplicationModel createModelWithComputedOrder(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException { ReplicationModel model = new ReplicationModel(contracts, false, topiaIds); return model; } @@ -240,7 +262,8 @@ } @Override - public ReplicationModel initModel(ReplicationModel model, boolean computeOrder) throws TopiaException { + public ReplicationModel initModel(ReplicationModel model, + boolean computeOrder) throws TopiaException { checkNotNull("initModel", "model", model); model.detectAssociations(); @@ -273,7 +296,11 @@ } @Override - public void createOperation(ReplicationModel model, TopiaEntityEnum type, ReplicationOperationPhase phase, Class<? extends TopiaReplicationOperation> operationClass, Object... parameters) { + public void createOperation(ReplicationModel model, + TopiaEntityEnum type, + ReplicationOperationPhase phase, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters) { checkNotNull("createOperation", "model", model); checkNotNull("createOperation", "type", type); @@ -335,12 +362,12 @@ } @Override - public <E extends TopiaEntity> void doReplicateNode( + public void doReplicateNode( ReplicationNode node, TopiaContext srcCtxt, TopiaContext dstCtxt, Map<Class<? extends TopiaEntity>, List<String>> data, - Set<ReplicationNode> treated) throws Exception { + List<ReplicationNode> treated) throws Exception { // on trie toujours les operations a realiser selon leur phase (avant ou apres la duplication) node.sortOperations(); @@ -369,9 +396,15 @@ log.info("start " + operationDef); - TopiaReplicationOperation operation = getOperation(operationDef.getOperationClass()); + TopiaReplicationOperation operation = + getOperation(operationDef.getOperationClass()); - operation.run(operationDef, (TopiaContextImplementor) srcCtxt, (TopiaContextImplementor) dstCtxt, nodeEntities, data); + operation.run(operationDef, + (TopiaContextImplementor) srcCtxt, + (TopiaContextImplementor) dstCtxt, + nodeEntities, + data + ); } // on rollback le context source (car on a peut-etre modifie @@ -445,7 +478,7 @@ } Class<?> foundType = value.getClass(); - if (!(requiredType.isAssignableFrom(foundType))) { + if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException("le paremetre de position " + index + " requiere un parametre de type " + requiredType + " mais est de type " + foundType); } } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationImplementor.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationImplementor.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationImplementor.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -36,22 +36,23 @@ */ package org.nuiton.topia.replication; -import org.nuiton.topia.replication.model.ReplicationModel; -import org.nuiton.topia.replication.model.ReplicationNode; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.replication.model.ReplicationModel; +import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationPhase; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Class used internaly in framework, when you want implement new replication * engin, you must used this interface - * + * * @author chemit * @since 2.2.0 */ @@ -61,9 +62,8 @@ * Creation d'un modele de replication non initialise. * * @param contracts le contrats d'entites autorises - * @param topiaIds les ids des entites a repliquer + * @param topiaIds les ids des entites a repliquer * @return le modele instancie mais non initialise - * * @throws TopiaException pour toute erreur */ ReplicationModel createModel(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; @@ -73,7 +73,6 @@ * * @param contracts le contrats d'entites autorises * @return le modele instancie mais non initialise - * * @throws TopiaException pour toute erreur */ ReplicationModel createModelForAll(TopiaEntityEnum[] contracts) throws TopiaException; @@ -83,58 +82,56 @@ * (celui des contrats donnés). * * @param contracts le contrats d'entites autorises - * @param topiaIds les ids des entities a repliquer + * @param topiaIds les ids des entities a repliquer * @return le modele instancie mais non initialise - * * @throws TopiaException pour toute erreur */ ReplicationModel createModelWithComputedOrder(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; /** * Initialisation du modele de replication. - * + * * Cette methode realise les calculs sur le modele pour obtenir l'ordre * de replication des entites {@link ReplicationModel#getOrder()} * et les operations a realiser lors de la replication sur chaque noeud * de replication {@link ReplicationNode#getOperations()}. * - * @param model le modele a initialise + * @param model le modele a initialise * @param computeOrder drapeau pour effectuer le calcul d'ordre des - * entites a repliquer, sinon on utilise l'ordre de creation des - * noeuds dans le model. + * entites a repliquer, sinon on utilise l'ordre de creation des + * noeuds dans le model. * @return le modele initialise - * - * @throws TopiaException + * @throws TopiaException pour toute erreur */ ReplicationModel initModel(ReplicationModel model, boolean computeOrder) throws TopiaException; Set<Class<? extends TopiaEntity>> detectTypes(TopiaEntityEnum[] contracts, String... ids) throws TopiaException; /** - * + * Récupération d'une opération de réplication à partir de son type. + * * @param operationClass le type de l'opération * @return l'opération du type donne */ TopiaReplicationOperation getOperation(Class<? extends TopiaReplicationOperation> operationClass); /** - * - * @param model le modele en cours - * @param type le contrat de l'entite concerne - * @param phase la phase de l'operation + * @param model le modele en cours + * @param type le contrat de l'entite concerne + * @param phase la phase de l'operation * @param operationClass le type de l'operation - * @param parameters les parametres dynamiques de l'operation + * @param parameters les parametres dynamiques de l'operation */ void createOperation(ReplicationModel model, - TopiaEntityEnum type, - ReplicationOperationPhase phase, - Class<? extends TopiaReplicationOperation> operationClass, - Object... parameters); + TopiaEntityEnum type, + ReplicationOperationPhase phase, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters); /** * Recupere les ids des entites a repliquer. * - * @param model le modele utilise + * @param model le modele utilise * @param srcCtxt le context de la base source * @return les ids des donnes a repliquer. * @throws TopiaException pour toute erreur de recuperation d'ids en base @@ -144,19 +141,17 @@ TopiaContextImplementor srcCtxt) throws TopiaException; /** - * - * @param <E> le type de l'entite a repliquer - * @param node le noeud de replication + * @param node le noeud de replication * @param srcCtxt la base source * @param dstCtxt la base destination - * @param data le dictionnaire des ids a repliquer + * @param data le dictionnaire des ids a repliquer * @param treated l'ensemble des noeuds deja repliques * @throws Exception pour tout erreur */ - <E extends TopiaEntity> void doReplicateNode( + void doReplicateNode( ReplicationNode node, TopiaContext srcCtxt, TopiaContext dstCtxt, Map<Class<? extends TopiaEntity>, List<String>> data, - Set<ReplicationNode> treated) throws Exception; + List<ReplicationNode> treated) throws Exception; } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,33 +25,34 @@ package org.nuiton.topia.replication; -import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; - import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; import org.nuiton.topia.replication.model.ReplicationOperationPhase; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; + /** * Le contrat d'une operation a effectuer lors de la replication. - * + * * Le module propose des operations de base dans le paquetage * <code>org.nuiton.topia.replication.operation</code>. * - * + * * Pour definir une nouvelle implantation d'operation, il faut l'enregister * en tant que service (au sens de la classe {@link ServiceLoader}, * c'est à dire ajouter dans un fichier (du class-path) * <code>META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation</code> - * + * * une ligne avec le nom qualifie de votre implantation. + * + * Lors du chargement du service, on detecte toutes les operations disponibles. * - * Lors du chargement du service, on detecte toutes les operations disponibles. - * * @author chemit * @since 2.2.0 */ @@ -60,37 +61,36 @@ /** * Creer et enregister une operation utilisateur apres la creation du * modele via la methode - * + * * {@link TopiaReplicationService#prepare(TopiaEntityEnum[], String...)}. * - * @param model le modele de replication - * @param ownerNode le noeud proprietaire de l'operation - * @param phase la phase ou positionner l'operation + * @param model le modele de replication + * @param ownerNode le noeud proprietaire de l'operation + * @param phase la phase ou positionner l'operation * @param parameters les parametres de l'operation - * * @see ReplicationModel * @see ReplicationOperationPhase */ void register(ReplicationModel model, - ReplicationNode ownerNode, - ReplicationOperationPhase phase, - Object... parameters); + ReplicationNode ownerNode, + ReplicationOperationPhase phase, + Object... parameters); /** * Execute l'operation avec le parametrage donnee. + * + * Note : le commit sur le context cible doit etre geree dans la methode. * - * Note : le commit sur le context cible doit etre geree dans la methode. - * * @param operationDef la definition de l'operation a realiser - * @param srcCtxt le context source - * @param dstCtxt le context destination - * @param entities - * @param data le dictionnaire de toutes les donnees a repliquer + * @param srcCtxt le context source + * @param dstCtxt le context destination + * @param entities la liste des + * @param data le dictionnaire de toutes les donnees a repliquer * @throws Exception pour toute erreur */ void run(ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, - TopiaContextImplementor dstCtxt, - List<? extends TopiaEntity> entities, - Map<Class<? extends TopiaEntity>, List<String>> data) throws Exception; + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> entities, + Map<Class<? extends TopiaEntity>, List<String>> data) throws Exception; } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/Link.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/Link.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/Link.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -37,9 +37,13 @@ public class Link { protected final ReplicationNode source; + protected final Set<ReplicationNode> requires; + protected final ReplicationNode target; + protected final String name; + protected final boolean association; public Link(ReplicationNode source, ReplicationNode target, String name, boolean association) { @@ -74,12 +78,12 @@ /** * Teste si on peut reattacher le lien en connaissant l'univers des * noeuds disponibles. - * + * * On teste si toutes les pre-requis sont disponibles. - * + * * Si oui, on peut reattacher. * - * @param universe l'univers des noeuds disponibles + * @param universe l'univers des noeuds disponibles * @param currentNode le noeud qui vient d'etre replique * @return <code>true</code> si on peut reattacher ce lien */ Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,16 +25,6 @@ package org.nuiton.topia.replication.model; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; @@ -48,26 +38,34 @@ import org.nuiton.topia.replication.operation.Duplicate; import org.nuiton.topia.replication.operation.LoadLink; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + public class ReplicationModel { /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(ReplicationModel.class); - /** - * l'ensemble des contrats d'entites a repliquer - */ + + /** l'ensemble des contrats d'entites a repliquer */ final protected TopiaEntityEnum[] contracts; - /** - * les ids des entites a repliquer (non utilise en mode replicateAll) - */ + + /** les ids des entites a repliquer (non utilise en mode replicateAll) */ final protected String[] topiaIds; - /** - * le dictionnaire des noeuds a repliquer associes a leur type - */ + + /** le dictionnaire des noeuds a repliquer associes a leur type */ protected Map<Class<? extends TopiaEntity>, ReplicationNode> nodes; - /** - * la liste des noeuds a repliquer (dans l'ordre de replication) - */ + + /** la liste des noeuds a repliquer (dans l'ordre de replication) */ protected List<ReplicationNode> order; + /** * un drapeau pour savoir si on effectue une replication de toutes les donnees * des contrats. @@ -390,7 +388,7 @@ for (String name : associationProperties) { Class<?> associationPropertyType = node.getOperator().getAssociationPropertyType(name); if (!TopiaEntity.class.isAssignableFrom(associationPropertyType) || - !nodes.containsKey(associationPropertyType)) { + !nodes.containsKey(associationPropertyType)) { Link link = new Link(node, null, name, true); Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,6 +25,13 @@ package org.nuiton.topia.replication.model; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.topia.persistence.util.EntityOperatorStore; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -33,52 +40,42 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.util.EntityOperator; -import org.nuiton.topia.persistence.util.EntityOperatorStore; /** * Le modele d'un noeud de replication. - * + * * Un noeud represente exactement un type d'entite a repliquer - * + * * @author chemit */ public class ReplicationNode { /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(ReplicationNode.class); + final TopiaEntityEnum contract; + final EntityOperator<? super TopiaEntity> operator; - /** - * les couples d'association a partir de ce noeud - */ + + /** les couples d'association a partir de ce noeud */ Map<String, ReplicationNode> associations; - /** - * les couples de composition a partir de ce noeud - */ + + /** les couples de composition a partir de ce noeud */ Map<String, ReplicationNode> dependencies; - /** - * l'ensemble des associations a dettacher pendant la replication - */ + + /** l'ensemble des associations a dettacher pendant la replication */ Set<String> associationsToDettach; - /** - * l'ensemble des dependences a dettacher pendant la replication - */ + + /** l'ensemble des dependences a dettacher pendant la replication */ Set<String> dependenciesToDettach; - /** - * la couverture de ce noeud - */ + + /** la couverture de ce noeud */ Set<ReplicationNode> shell; - /** - * la sequences d'operations a realiser lors de la replication de ce node - */ + + /** la sequences d'operations a realiser lors de la replication de ce node */ List<ReplicationOperationDef> operations; - public ReplicationNode(TopiaEntityEnum contract) { + public ReplicationNode(TopiaEntityEnum contract) { this.contract = contract; operator = EntityOperatorStore.getOperator(contract); associations = new HashMap<String, ReplicationNode>(); @@ -229,6 +226,7 @@ public String toString() { return contract.toString(); } + public static final Comparator<ReplicationOperationDef> OPERATION_COMPARATOR = new Comparator<ReplicationOperationDef>() { Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -29,7 +29,7 @@ /** * Une enumeration pour definir quand appliquer une operation. - * + * * L'ordre induit par cette enumeration sera utiliser pour trier les operations * a realiser sur chaque noeud de replication. * @@ -37,17 +37,13 @@ */ public enum ReplicationOperationPhase { - /** - * a appliquer avant la duplicate d'un noeud - */ + /** a appliquer avant la duplicate d'un noeud */ before, /** * pour dupliquer un noeud (cette phase ne doit etre utilise que sur l'operation * de type {@link Duplicate} */ duplicate, - /** - * a appliquer apres avoir duplique le noeud - */ + /** a appliquer apres avoir duplique le noeud */ after } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -93,16 +93,16 @@ log.debug("currentNode : " + operationDef.getNode() + " , association name : " + name + " reverse ? " + reverse); } - ReplicationNode ownerNode = null; - ReplicationNode cibleNode = null; + ReplicationNode ownerNode; + ReplicationNode cibleNode; - EntityOperator<? super TopiaEntity> ownerOperator = null; + EntityOperator<? super TopiaEntity> ownerOperator; // contient la liste des ids d'association autorisees ici - List<String> associationsId = null; + List<String> associationsId; // contient la liste des ids des entite source de l'association - List<String> ownerIds = null; + List<String> ownerIds; if (reverse) { // on est en mode reverse, i.e : @@ -141,7 +141,7 @@ } // contient la liste des entites sources de l'association - List<? extends TopiaEntity> ownerEntities = null; + List<? extends TopiaEntity> ownerEntities; // on recharge obligatoirement les donnees sources car elles ont pu etre // modifiees (dettachement d'association ou autres) Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,28 +25,30 @@ package org.nuiton.topia.replication.operation; -import org.nuiton.topia.replication.*; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.topia.replication.TopiaReplicationOperation; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; import org.nuiton.topia.replication.model.ReplicationOperationPhase; + +import java.util.List; +import java.util.Map; + import static org.nuiton.i18n.I18n._; /** * Pour dettacher une association. - * + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. - * + * * @author chemit */ public class DettachAssociation implements TopiaReplicationOperation { @@ -57,15 +59,15 @@ @Override public void register(ReplicationModel model, ReplicationNode ownerNode, ReplicationOperationPhase phase, Object... parameters) { - throw new UnsupportedOperationException(_("topia.replication.operation.error.uncreatable",getClass())); + throw new UnsupportedOperationException(_("topia.replication.operation.error.uncreatable", getClass())); } @Override public void run(ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, - TopiaContextImplementor dstCtxt, - List<? extends TopiaEntity> entities, - Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> entities, + Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { String name = (String) operationDef.getParameters()[0]; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachDependency.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachDependency.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachDependency.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,27 +25,29 @@ package org.nuiton.topia.replication.operation; -import org.nuiton.topia.replication.*; -import java.util.List; -import java.util.Map; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.replication.TopiaReplicationOperation; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; import org.nuiton.topia.replication.model.ReplicationOperationPhase; + +import java.util.List; +import java.util.Map; + import static org.nuiton.i18n.I18n._; /** * Pour dettacher une dependance. - * + * * TODO Pas implante pour le moment - * + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. - * + * * @author chemit */ public class DettachDependency implements TopiaReplicationOperation { @@ -58,10 +60,10 @@ @Override public void run(ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, - TopiaContextImplementor dstCtxt, - List<? extends TopiaEntity> nodeEntities, - Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> nodeEntities, + Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { throw new UnsupportedOperationException(_("topia.replication.operation.error.notImplemented", getClass())); //TODO non implante pour le moment Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,8 +25,6 @@ package org.nuiton.topia.replication.operation; -import java.util.List; -import java.util.Map; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; @@ -35,13 +33,17 @@ import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; import org.nuiton.topia.replication.model.ReplicationOperationPhase; + +import java.util.List; +import java.util.Map; + import static org.nuiton.i18n.I18n._; /** * L'operation de duplication d'un noeud de replication. - * + * * Note : cette operation est interne, et n'est pas creable par - * l'utilisateur via la methode + * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. * * @author chemit @@ -50,15 +52,15 @@ @Override public void register(ReplicationModel model, ReplicationNode ownerNode, ReplicationOperationPhase phase, Object... parameters) { - throw new UnsupportedOperationException(_("topia.replication.operation.error.uncreatable",getClass())); + throw new UnsupportedOperationException(_("topia.replication.operation.error.uncreatable", getClass())); } @Override public void run(ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, - TopiaContextImplementor dstCtxt, - List<? extends TopiaEntity> entities, - Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> entities, + Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { // replication des donnees vers la destination srcCtxt.replicateEntities(dstCtxt, entities); Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2010-07-26 08:44:30 UTC (rev 2088) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2010-07-26 14:07:15 UTC (rev 2089) @@ -25,29 +25,31 @@ package org.nuiton.topia.replication.operation; -import org.nuiton.topia.replication.*; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.topia.replication.TopiaReplicationOperation; import org.nuiton.topia.replication.model.Link; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; import org.nuiton.topia.replication.model.ReplicationOperationPhase; + +import java.util.List; +import java.util.Map; + import static org.nuiton.i18n.I18n._; /** * Pour charger une association sur le noeud de l'operation. - * + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. - * + * * @author chemit */ public class LoadLink implements TopiaReplicationOperation { @@ -63,10 +65,10 @@ @Override public void run(ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, - TopiaContextImplementor dstCtxt, - List<? extends TopiaEntity> nodeEntities, - Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> nodeEntities, + Map<Class<? extends TopiaEntity>, List<String>> data) throws TopiaException { Link link = (Link) operationDef.getParameters()[0];

1 0

r2088 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 26 Jul '10

26 Jul '10

Author: tchemit Date: 2010-07-26 10:44:30 +0200 (Mon, 26 Jul 2010) New Revision: 2088 Url: http://nuiton.org/repositories/revision/topia/2088 Log: Anomalie #778: Version is saved whatever migration was successfull Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java 2010-07-19 10:49:13 UTC (rev 2087) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java 2010-07-26 08:44:30 UTC (rev 2088) @@ -132,6 +132,8 @@ log.error("Migration impossible de la base", eee); // rollback du travail en cours tx.rollbackTransaction(); + // propagation de l'erreur + throw eee; } finally { // close database connexion if (tx != null) { @@ -142,6 +144,8 @@ } catch (Exception eee) { log.error("Error lors de la tentative de migration", eee); doMigrate = false; + // toute erreur arrête la mgration + break; } } }

1 0

r2087 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 19 Jul '10

19 Jul '10

Author: tchemit Date: 2010-07-19 12:49:13 +0200 (Mon, 19 Jul 2010) New Revision: 2087 Url: http://nuiton.org/repositories/revision/topia/2087 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-07-19 10:49:09 UTC (rev 2086) +++ trunk/pom.xml 2010-07-19 10:49:13 UTC (rev 2087) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4.1</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-07-19 10:49:09 UTC (rev 2086) +++ trunk/topia-persistence/pom.xml 2010-07-19 10:49:13 UTC (rev 2087) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-19 10:49:09 UTC (rev 2086) +++ trunk/topia-service-migration/pom.xml 2010-07-19 10:49:13 UTC (rev 2087) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-19 10:49:09 UTC (rev 2086) +++ trunk/topia-service-replication/pom.xml 2010-07-19 10:49:13 UTC (rev 2087) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-19 10:49:09 UTC (rev 2086) +++ trunk/topia-service-security/pom.xml 2010-07-19 10:49:13 UTC (rev 2087) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2086 - in tags: . topia-2.4.1
by tchemit＠users.nuiton.org 19 Jul '10

19 Jul '10

Author: tchemit Date: 2010-07-19 12:49:09 +0200 (Mon, 19 Jul 2010) New Revision: 2086 Url: http://nuiton.org/repositories/revision/topia/2086 Log: [maven-release-plugin] copy for tag topia-2.4.1 Added: tags/topia-2.4.1/ Property changes on: tags/topia-2.4.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2085 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 19 Jul '10

19 Jul '10

Author: tchemit Date: 2010-07-19 12:49:07 +0200 (Mon, 19 Jul 2010) New Revision: 2085 Url: http://nuiton.org/repositories/revision/topia/2085 Log: [maven-release-plugin] prepare release topia-2.4.1 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-07-19 10:42:59 UTC (rev 2084) +++ trunk/pom.xml 2010-07-19 10:49:07 UTC (rev 2085) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,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.4.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4.1</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-07-19 10:42:59 UTC (rev 2084) +++ trunk/topia-persistence/pom.xml 2010-07-19 10:49:07 UTC (rev 2085) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-19 10:42:59 UTC (rev 2084) +++ trunk/topia-service-migration/pom.xml 2010-07-19 10:49:07 UTC (rev 2085) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-19 10:42:59 UTC (rev 2084) +++ trunk/topia-service-replication/pom.xml 2010-07-19 10:49:07 UTC (rev 2085) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-19 10:42:59 UTC (rev 2084) +++ trunk/topia-service-security/pom.xml 2010-07-19 10:49:07 UTC (rev 2085) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2084 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 19 Jul '10

19 Jul '10

Author: tchemit Date: 2010-07-19 12:42:59 +0200 (Mon, 19 Jul 2010) New Revision: 2084 Url: http://nuiton.org/repositories/revision/topia/2084 Log: reformat code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java 2010-07-19 10:42:36 UTC (rev 2083) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java 2010-07-19 10:42:59 UTC (rev 2084) @@ -25,41 +25,38 @@ package org.nuiton.topia.persistence.util; -import java.util.ArrayDeque; -import java.util.Collection; -import java.util.Deque; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.DepthEntityVisitor; -import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import java.util.ArrayDeque; +import java.util.Collection; +import java.util.Deque; + /** * Un objet qui permet de parcourir des entites (via un * {@link CollectorVisitor}) et de collecter des donnees pendant le parcours. - * - * La classe a un type qui est le type de retour de la methode + * + * La classe a un type qui est le type de retour de la methode * {@link #detect(TopiaEntity...)}. - * + * * On peut donc très facilement en faire un collecteur de donnees. * - * @param <R> les donnes a retourner - * * @author tchemit <chemit(a)codelutin.com> - * + * @param <R> les donnes a retourner * @since 2.2.0 */ public abstract class Collector<R> { private static final Log log = LogFactory.getLog(Collector.class); - /** - * le visiteur utiliser pour trouver les types - */ + + /** le visiteur utiliser pour trouver les types */ protected CollectorVisitor visitor; - /** - * la liste des contracts des entites connues. - */ + + /** la liste des contracts des entites connues. */ protected TopiaEntityEnum[] contracts; public Collector(CollectorVisitor visitor, TopiaEntityEnum[] contracts) { @@ -135,8 +132,7 @@ protected abstract R afterAll(CollectorVisitor visitor, TopiaEntity... entities); - public synchronized R detect(TopiaEntity... entities) - throws TopiaException { + public R detect(TopiaEntity... entities) throws TopiaException { try { beforeAll(visitor, entities); @@ -157,10 +153,9 @@ public static class CollectorVisitor extends DepthEntityVisitor { - /** - * la pile des entites en cours de parcours - */ + /** la pile des entites en cours de parcours */ protected Deque<TopiaEntity> stack = new ArrayDeque<TopiaEntity>(); + Collector<?> collector; protected void setCollector(Collector<?> collector) { @@ -216,7 +211,7 @@ super.visit(e, name, collectionType, type, value); } collector.onVisited(e, name, collectionType, type, value, - canContinue); + canContinue); } @Override @@ -224,12 +219,12 @@ Class<?> type, int index, Object value) { boolean canContinue = collector.onVisiting(e, name, collectionType, type, index, - value); + value); if (canContinue) { super.visit(e, name, collectionType, type, index, value); } collector.onVisited(e, name, collectionType, type, index, value, - canContinue); + canContinue); } @Override @@ -271,6 +266,6 @@ protected TopiaEntity getTopiaValue(Object value) { return (TopiaEntity) (value != null && - value instanceof TopiaEntity ? value : null); + value instanceof TopiaEntity ? value : null); } }

1 0

r2083 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 19 Jul '10

19 Jul '10

Author: tchemit Date: 2010-07-19 12:42:36 +0200 (Mon, 19 Jul 2010) New Revision: 2083 Url: http://nuiton.org/repositories/revision/topia/2083 Log: test if there is a natyural id + reformat code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-07-19 10:03:11 UTC (rev 2082) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-07-19 10:42:36 UTC (rev 2083) @@ -25,6 +25,13 @@ package org.nuiton.topia.persistence.util; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.util.ObjectUtil; + import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -42,20 +49,13 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.ObjectUtil; - /** * Un objet qui permet d'effecuter des operations de manipulation des donnees * dans les entites du type donne. - * + * * L'objet connait la liste des proprietes et des associations du type donne et * permet de modifier ces valeurs : - * + * * {@link #get(String, TopiaEntity)} * {@link #set(String, TopiaEntity,Object)} * {@link #copy(String, TopiaEntity,TopiaEntity)} @@ -63,18 +63,18 @@ * {@link #addChild(String, TopiaEntity, Object)} * {@link #removeChild(String, TopiaEntity, Object)} * ... - * + * * D'autres methodes permettent d'effectuer des operations en lot (sur plusieurs * proprietes en meme temps) sur les proprietes : - * + * * {@link #copyProperties(TopiaEntity, TopiaEntity, boolean, String...)} * {@link #obtainProperties(TopiaEntity, String...)} * {@link #clearProperties(TopiaEntity, String...)} - * + * * Note : cet objet ne permet pas d'operation vers les bases. * - * @param type de l'entite * @author tchemit <chemit(a)codelutin.com> + * @param type de l'entite * @since 2.2.0 */ public class EntityOperator { @@ -82,64 +82,40 @@ /** Logger */ private static Log log = LogFactory.getLog(EntityOperator.class); - /** - * the constant of the entity - */ + /** the constant of the entity */ protected final TopiaEntityEnum contract; - /** - * list of property names available on the entity. - */ + /** list of property names available on the entity. */ protected List<String> properties; - /** - * list of association names available on the entity. - */ + /** list of association names available on the entity. */ protected List<String> associationProperties; - /** - * cache of getter methods. - */ + /** cache of getter methods. */ protected Method[] getMethods; - /** - * cache of setter methods. - */ + /** cache of setter methods. */ protected Method[] setMethods; - /** - * cache of assocation {@code get} methods. - */ + /** cache of assocation {@code get} methods. */ protected Method[] childGetMethods; - /** - * cache of assocation {@code add} methods. - */ + /** cache of assocation {@code add} methods. */ protected Method[] childAddMethods; - /** - * cache of assocation {@code addAll} methods. - */ + /** cache of assocation {@code addAll} methods. */ protected Method[] childAddAllMethods; - /** - * cache of assocation {@code remove} methods. - */ + /** cache of assocation {@code remove} methods. */ protected Method[] childRemoveMethods; - /** - * cache of assocation {@code size} methods. - */ + /** cache of assocation {@code size} methods. */ protected Method[] childSizeMethods; - /** - * cache of assocation {@code isEmpty} methods. - */ + /** cache of assocation {@code isEmpty} methods. */ protected Method[] childIsEmptyMethods; - /** - * cache of assocation {@code clear}methods. - */ + /** cache of assocation {@code clear}methods. */ protected Method[] childClearMethods; protected EntityOperator(TopiaEntityEnum contract) { @@ -153,9 +129,9 @@ /** * Recupere la valeur de la propriete donnee. - * + * * Note : cela apellera la methode <code>getXXX()</code>. - + * * @param name le nom de la propriete * @param bean l'instance a interroger * @return la valeur de la propriete @@ -168,11 +144,11 @@ /** * Positionner la valeur donne de la propriete donnee. - * + * * Note : cela apellera la methode <code>setXXX(value)</code>. * - * @param name le nom de la propriete - * @param bean l'instance a mettre a jour + * @param name le nom de la propriete + * @param bean l'instance a mettre a jour * @param value la valeur a positionner */ public void set(String name, B bean, Object value) { @@ -183,26 +159,30 @@ /** * Pour obtenir un dictionnaire de la clef naturelle (clef métier) du {@code bean} * donne. + * * @param bean le bean a inspecter * @return le dictionnaire de la clef naturel du bean * @since 2.4.1 */ - public Map<String,Object> getNaturalId(B bean) { - Map<String,Object> result = new TreeMap<String, Object>(); + public Map<String, Object> getNaturalId(B bean) { + Map<String, Object> result = new TreeMap<String, Object>(); String[] ids = contract.getNaturalIds(); - for (String id : ids) { - result.put(id,get(id, bean)); + if (ids != null) { + for (String id : ids) { + result.put(id, get(id, bean)); + } } return result; } + /** * Copie une propriete de src vers dst. - * + * * Note : cela apellera la methode <code>setXXX(value)</code>. * * @param name le nom de la propriete * @param from l'instance a interroger - * @param dst l'instance a mettre a jour + * @param dst l'instance a mettre a jour */ public void copy(String name, B from, B dst) { int index = checkPropertyIndex(name); @@ -212,7 +192,7 @@ /** * Positionner la valeur nulle de la propriete donnee. - * + * * Note : cela apellera la methode <code>setXXX(nullValue)</code>. * * @param name le nom de la propriete @@ -228,11 +208,11 @@ /** * Recupere une entite d'association a partir de son id. - * + * * Note : cela apellera la methode <code>getXXXByTopiaId(topiaId)</code>. * - * @param name le nom de la propriete d'association - * @param bean l'instance a interroger + * @param name le nom de la propriete d'association + * @param bean l'instance a interroger * @param topiaId l'id de l'entite recherchee * @return l'entite */ @@ -244,7 +224,7 @@ /** * Test s'il existe des entites d'association pour la propriete donnee. - * + * * Note : cela apellera la methode <code>isXXXEmpty()</code>. * * @param name le nom de la propriete d'association @@ -259,11 +239,11 @@ /** * Ajoute une entite d'association. - * + * * Note : cela apellera la methode <code>addXXX(child)</code>. * - * @param name le nom de la propriete d'association - * @param bean l'instance a mettre a jour + * @param name le nom de la propriete d'association + * @param bean l'instance a mettre a jour * @param child l'entite a ajouter */ public void addChild(String name, B bean, Object child) { @@ -273,11 +253,11 @@ /** * Ajoute toutes les entites d'association. - * + * * Note : cela apellera la methode <code>addXXX(child)</code>. * - * @param name le nom de la propriete d'association - * @param bean l'instance a mettre a jour + * @param name le nom de la propriete d'association + * @param bean l'instance a mettre a jour * @param childs les entites a ajouter */ public void addAllChild(String name, B bean, Collection<?> childs) { @@ -287,11 +267,11 @@ /** * Retire une entite d'association. - * + * * Note : cela apellera la methode <code>removeXXX(child)</code>. * - * @param name le nom de la propriete d'association - * @param bean l'instance a mettre a jour + * @param name le nom de la propriete d'association + * @param bean l'instance a mettre a jour * @param child l'entite a retirer */ public void removeChild(String name, B bean, Object child) { @@ -301,7 +281,7 @@ /** * Retourne le nombre d'entite d'association. - * + * * Note : cela apellera la methode <code>sizeXXX(childs)</code>. * * @param name le nom de la propriete d'association @@ -316,7 +296,7 @@ /** * Retire toutes les entites d'association. - * + * * Note : cela apellera la methode <code>clearXXX(childs)</code>. * * @param name le nom de la propriete d'association @@ -329,13 +309,13 @@ /** * Recopie toutes les proprietes donnes depuis src vers dst. - * + * * Note : si aucune propriete n'est donnee, on utilise toutes les proprietes * connues par l'operateur. - * - * @param from l'entite a interroger - * @param dst l'entite a mettre a jour - * @param tech un drapeau pour recopier aussi les infos techniques + * + * @param from l'entite a interroger + * @param dst l'entite a mettre a jour + * @param tech un drapeau pour recopier aussi les infos techniques * @param properties les proprietes a recopier */ public void copyProperties(B from, B dst, boolean tech, @@ -362,11 +342,11 @@ /** * Obtenir dans un dictionnaire, les valeurs des proprietes donnees. - * + * * Si aucune proropiete n'est donne, alors on utilise toutes les proprietes * connu par l'operateur. * - * @param from l'object a scanne + * @param from l'object a scanne * @param properties les proprietes a retenir (vide si on les veut toutes) * @return le dictionnaire des valeurs des proprietes */ @@ -389,11 +369,11 @@ /** * Met a null toutes les proprietes donnees. - * + * * Si aucune proropiete n'est donnee, alors on utilise toutes les proprietes * connu par l'operateur. * - * @param from l'object a scanne + * @param from l'object a scanne * @param properties les proprietes a retenir (vide si on les veut toutes) */ public void clearProperties(B from, String... properties) { @@ -448,7 +428,7 @@ return super.clone(); } catch (CloneNotSupportedException e) { throw new RuntimeException("could not clone " + this + - " for reason : " + e.getMessage(), e); + " for reason : " + e.getMessage(), e); } } @@ -526,9 +506,9 @@ } init(getClazz(), explored, properties, associationProperties, - getters, setters, childGetters, childAdders, - childAddersAll, childRemovers, childSize, - childClearers, childIsEmpty); + getters, setters, childGetters, childAdders, + childAddersAll, childRemovers, childSize, + childClearers, childIsEmpty); if (!properties.isEmpty()) { int size = properties.size(); @@ -553,8 +533,8 @@ } if (log.isDebugEnabled()) { log.debug("===== end for " + getClazz() + " (" + - properties.size() + " properties, " + - associationProperties.size() + " associations)"); + properties.size() + " properties, " + + associationProperties.size() + " associations)"); } } catch (IntrospectionException e) { throw new RuntimeException(e); @@ -576,7 +556,7 @@ Method[] methodDescriptors) { for (Method m : methodDescriptors) { if (name.equals(m.getName()) && - m.getParameterTypes().length == nbParams) { + m.getParameterTypes().length == nbParams) { return m; } } @@ -587,7 +567,7 @@ int index = properties.indexOf(name); if (index == -1) { throw new IllegalArgumentException("property " + name + - " is unknown for " + this); + " is unknown for " + this); } return index; } @@ -596,7 +576,7 @@ int index = associationProperties.indexOf(name); if (index == -1) { throw new IllegalArgumentException("association property " + - name + " is unknown for " + this); + name + " is unknown for " + this); } return index; } @@ -630,25 +610,25 @@ } protected void init(Class<?> entityClass, - Set<Class<?>> explored, - List<String> properties, - List<String> associationProperties, - List<Method> getters, - List<Method> setters, - List<Method> childGetters, - List<Method> childAdders, - List<Method> childAddersAll, - List<Method> childRemovers, - List<Method> childSize, - List<Method> childClearers, - List<Method> childIsEmpty) throws IntrospectionException { + Set<Class<?>> explored, + List<String> properties, + List<String> associationProperties, + List<Method> getters, + List<Method> setters, + List<Method> childGetters, + List<Method> childAdders, + List<Method> childAddersAll, + List<Method> childRemovers, + List<Method> childSize, + List<Method> childClearers, + List<Method> childIsEmpty) throws IntrospectionException { if (entityClass == null) { throw new NullPointerException("entityClass can not be null!"); } if (!entityClass.isInterface()) { throw new IllegalArgumentException("entityClass parameter " + - entityClass + " is not interface!"); + entityClass + " is not interface!"); } if (explored.contains(entityClass)) { return; @@ -669,7 +649,7 @@ for (PropertyDescriptor propertydescriptor : propertyDescriptors) { String propertyName = propertydescriptor.getName(); if (propertydescriptor.getReadMethod() != null && - propertydescriptor.getWriteMethod() != null) { + propertydescriptor.getWriteMethod() != null) { // on a detecte une propriete (lecture/ecriture) if (log.isDebugEnabled()) { log.debug("detected property : " + propertyName); @@ -696,12 +676,12 @@ Method isEmptyMethod = getMethod("is" + cap + "Empty", 0, methods); if (addMethod != null && - addAllMethod != null && - removeMethod != null && - sizeMethod != null && - getMethod != null && - clearMethod != null && - isEmptyMethod != null) { + addAllMethod != null && + removeMethod != null && + sizeMethod != null && + getMethod != null && + clearMethod != null && + isEmptyMethod != null) { // on a detecte une association if (log.isDebugEnabled()) { log.debug("detected association : " + propertyName); @@ -721,24 +701,24 @@ if (interfaces.length > 0) { for (Class<?> c : interfaces) { if (TopiaEntity.class.equals(c) || - !TopiaEntity.class.isAssignableFrom(c) || - explored.contains(c)) { + !TopiaEntity.class.isAssignableFrom(c) || + explored.contains(c)) { // on ne traite pas continue; } init(c, - explored, - properties, - associationProperties, - getters, - setters, - childGetters, - childAdders, - childAddersAll, - childRemovers, - childSize, - childClearers, - childIsEmpty); + explored, + properties, + associationProperties, + getters, + setters, + childGetters, + childAdders, + childAddersAll, + childRemovers, + childSize, + childClearers, + childIsEmpty); } }

1 0