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

r1806 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by tchemit＠users.nuiton.org 20 Feb '10

20 Feb '10

Author: tchemit Date: 2010-02-20 14:39:12 +0100 (Sat, 20 Feb 2010) New Revision: 1806 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java Log: reformat TopiaContext contract + fix checkstyle Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-02-20 13:38:35 UTC (rev 1805) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-02-20 13:39:12 UTC (rev 1806) @@ -53,132 +53,132 @@ public interface TopiaContext { /* Adders */ - public void addTopiaEntityListener(TopiaEntityListener listener); + void addTopiaEntityListener(TopiaEntityListener listener); - public void addTopiaEntityListener( + void addTopiaEntityListener( Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener); - public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); + void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); - public void addTopiaEntityVetoable( + void addTopiaEntityVetoable( Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable); - public void addTopiaTransactionListener(TopiaTransactionListener listener); + void addTopiaTransactionListener(TopiaTransactionListener listener); - public void addTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); + void addTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); - public void addPropertyChangeListener(PropertyChangeListener listener); + void addPropertyChangeListener(PropertyChangeListener listener); - public void addTopiaContextListener(TopiaContextListener listener); + void addTopiaContextListener(TopiaContextListener listener); - public void addTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable); + void addTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable); /* Removers */ - public void removeTopiaEntityListener(TopiaEntityListener listener); + void removeTopiaEntityListener(TopiaEntityListener listener); - public void removeTopiaEntityListener( + void removeTopiaEntityListener( Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener); - public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); + void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); - public void removeTopiaEntityVetoable( + void removeTopiaEntityVetoable( Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable); - public void removeTopiaTransactionListener(TopiaTransactionListener listener); + void removeTopiaTransactionListener(TopiaTransactionListener listener); - public void removeTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); + void removeTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); - public void removePropertyChangeListener(PropertyChangeListener listener); + void removePropertyChangeListener(PropertyChangeListener listener); - public void removeTopiaContextListener(TopiaContextListener listener); + void removeTopiaContextListener(TopiaContextListener listener); - public void removeTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable); + void removeTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable); /** - * Return true if specific service is available + * Return true if specific service is available. * * @param <E> type of service * @param interfaceService fqn of the service * @return the service */ - public <E extends TopiaService> boolean serviceEnabled( + <E extends TopiaService> boolean serviceEnabled( Class<E> interfaceService); /** - * Return the service + * Return the service. * * @param <E> type of service * @param interfaceService fqn of the service * @return the service * @throws TopiaNotFoundException if service is can't be retrieved */ - public <E extends TopiaService> E getService(Class<E> interfaceService) + <E extends TopiaService> E getService(Class<E> interfaceService) throws TopiaNotFoundException; /** - * Permet de créer le schema de la base de données + * Permet de créer le schema de la base de données. * * @throws TopiaException if any exception */ - public void createSchema() throws TopiaException; + void createSchema() throws TopiaException; /** - * Permet d'afficher les requetes SQL de creation de base + * Permet d'afficher les requetes SQL de creation de base. * * @throws TopiaException if any exception */ - public void showCreateSchema() throws TopiaException; + void showCreateSchema() throws TopiaException; /** - * Permet de mettre à jour le schema de la base de données + * Permet de mettre à jour le schema de la base de données. * * @throws TopiaException if any exception */ - public void updateSchema() throws TopiaException; + void updateSchema() throws TopiaException; - public TopiaContext beginTransaction() throws TopiaException; + TopiaContext beginTransaction() throws TopiaException; /** * applique les modifications apporté a ce context sur la base de données. * * @throws TopiaException if any exception */ - public void commitTransaction() throws TopiaException; + void commitTransaction() throws TopiaException; /** - * annule les modifications apporté a ce context + * annule les modifications apporté a ce context. * * @throws TopiaException if any exception */ - public void rollbackTransaction() throws TopiaException; + void rollbackTransaction() throws TopiaException; /** - * Permet de rechercher un entite directement par son TopiaId + * Permet de rechercher un entite directement par son TopiaId. * * @param topiaId l'id de l'entite recherche * @return l'entite trouvee (ou null si non trouve) * @throws TopiaException if any exception */ - public TopiaEntity findByTopiaId(String topiaId) throws TopiaException; + TopiaEntity findByTopiaId(String topiaId) throws TopiaException; /** - * Permet de faire une requete HQL hibernate directement sur la base + * Permet de faire une requete HQL hibernate directement sur la base. * * @param hql la requete a faire * @param args les arguments de la requete * @return La liste des resultats * @throws TopiaException si une erreur survient durant la requete */ - public List find(String hql, Object... args) throws TopiaException; + List find(String hql, Object... args) throws TopiaException; /** * Permet de faire une requete HQL hibernate directement sur la base - * en precisant la fenetre des elements a remonter avec les parametres <code>startIndex</code> - * et <code>endIndex</code>. + * en precisant la fenetre des elements a remonter avec les parametres + * {@code startIndex} et {@code endIndex}. * * @param hql la requete a faire * @param startIndex la position du premier element a remonter @@ -187,18 +187,18 @@ * @return La liste des resultats * @throws TopiaException si une erreur survient durant la requete */ - public List find(String hql, int startIndex, int endIndex, Object... args) + List find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException; /** - * Execute HQL operation on data (Update, Delete) + * Execute HQL operation on data (Update, Delete). * * @param hql la requete a faire * @param args les arguments de la requete * @return The number of entities updated or deleted. * @throws TopiaException if any exception */ - public int execute(String hql, Object... args) throws TopiaException; + int execute(String hql, Object... args) throws TopiaException; /** * Permet d'ajouter dans le TopiaContext une TopiaEntity créé par un @@ -207,53 +207,56 @@ * @param e l'entity a ajouter * @throws TopiaException if any exception */ - public void add(TopiaEntity e) throws TopiaException; + void add(TopiaEntity e) throws TopiaException; /** - * Permet d'importer des données en XML + * Permet d'importer des données en XML. * * @param xml le flux XML * @throws TopiaException si une erreur survient durant l'import */ - public void importXML(Reader xml) throws TopiaException; + void importXML(Reader xml) throws TopiaException; /** - * Permet d'exporter certaines données en XML + * Permet d'exporter certaines données en XML. * - * Note: Si le parametre <code>entityAndCondition</code> est vide, alors on duplique - * toutes les entités de la base. + * Note: Si le parametre <code>entityAndCondition</code> est vide, + * alors on duplique toutes les entités de la base. * * @param xml le flux XML dans lequel il faut ecrire * @param entityAndCondition paramètre qui vont par deux, qui represente - * la classe de l'entity a exporter et la condition where que doit - * respecter l'objet pour etre exporter - * (entityClass, condition) + * la classe de l'entity a exporter et la + * condition where que doit respecter l'objet + * pour etre exporter (entityClass, condition) * @throws TopiaException si une erreur survient durant l'export */ - public void exportXML(Writer xml, Object... entityAndCondition) + void exportXML(Writer xml, Object... entityAndCondition) throws TopiaException; /** * Permet de dupliquer de ce context vers un context d'une autre base des * données sans modification des entites. * - * Note: Si le parametre <code>entityAndCondition</code> est vide, alors on duplique - * toutes les entités de la base. + * Note: Si le parametre <code>entityAndCondition</code> est vide, + * alors on duplique toutes les entités de la base. * - * Note 2: Il se peut que la replication simple ne soit pas suffisante (par example - * si l'on veut repliquer q'une partie d'une entité), on utilisera donc la seconde méthode + * Note 2: Il se peut que la replication simple ne soit pas + * suffisante (par example si l'on veut repliquer q'une partie d'une + * entité), on utilisera donc la seconde méthode * {@link #replicateEntities(TopiaContext, List)}. * * @param dstCtxt le context de la base destination * @param entityAndCondition paramètre qui vont par deux, qui represente - * la classe de l'entity a exporter et la condition where que doit + * la classe de l'entity a exporter et la + * condition where que doit * respecter l'objet pour etre exporter * (entityClass, condition) * @throws TopiaException si une erreur pendant la duplication - * @throws IllegalArgumentException si l'un des context n'est pas ouvert, ou si on essaye de - * dupliquer dans la même base. + * @throws IllegalArgumentException si l'un des context n'est pas ouvert, + * ou si on essaye de dupliquer dans la + * même base. */ - public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) + void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException; /** @@ -263,10 +266,11 @@ * @param entity l'entité à répliquer * @param <T> le type des entités à répliquer * @throws TopiaException si une erreur pendant la duplication - * @throws IllegalArgumentException si l'un des context n'est pas ouvert, ou si on essaye de - * dupliquer dans la même base. + * @throws IllegalArgumentException si l'un des context n'est pas ouvert, + * ou si on essaye de dupliquer dans la + * même base. */ - public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) + <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException; /** @@ -276,55 +280,58 @@ * @param entities les entités à répliquer * @param <T> le type des entités à répliquer * @throws TopiaException si une erreur pendant la duplication - * @throws IllegalArgumentException si l'un des context n'est pas ouvert, ou si on essaye de - * dupliquer dans la même base. + * @throws IllegalArgumentException si l'un des context n'est pas ouvert, + * ou si on essaye de dupliquer dans + * la même base. */ - public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) + <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, + List<T> entities) throws TopiaException, IllegalArgumentException; /** * Sauve la base de données dans un format natif a la base, la * representation n'est pas portable d'une base a l'autre. Cette methode * ne doit être utilisé que pour un stockage temporaire utile à une - * application + * application. * * @param file le nom du fichier ou stocker les informations * @param compress si vrai compress le fichier avec gzip * @throws TopiaException if any exception */ - public void backup(File file, boolean compress) throws TopiaException; + void backup(File file, boolean compress) throws TopiaException; /** * Supprime toutes les tables et autres elements de la database. * * @param dropDatabase si vrai alors supprime aussi la base de données - * si la base utilise des fichiers les fichiers seront supprimé (ex: h2) - * ou sera fait sur la base (pastgresql) + * si la base utilise des fichiers les fichiers seront + * supprimé (ex: h2) ou sera fait sur la base + * (postgresql) * @throws TopiaException if any exception */ - public void clear(boolean dropDatabase) throws TopiaException; + void clear(boolean dropDatabase) throws TopiaException; /** - * l'inverse de la methode {@link #backup(File,boolean)} + * l'inverse de la methode {@link #backup(File,boolean)}. * * @param file le fichier ou prendre les informations, il peut-etre * compressé avec gzip ou non. * @throws TopiaException if any exception */ - public void restore(File file) throws TopiaException; + void restore(File file) throws TopiaException; /** - * Ferme le contexte + * Ferme le contexte. * * @throws TopiaException if any exception */ - public void closeContext() throws TopiaException; + void closeContext() throws TopiaException; /** - * Indique si le contexte a ete ferme + * Indique si le contexte a ete ferme. * - * @return <code>true</code> si le context est ferme, <code>false</code> autrement + * @return {@code true} si le context est ferme, {@code false} autrement */ - public boolean isClosed(); + boolean isClosed(); } //TopiaContext

1 0

r1805 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org 20 Feb '10

20 Feb '10

Author: tchemit Date: 2010-02-20 14:38:35 +0100 (Sat, 20 Feb 2010) New Revision: 1805 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Log: fix hashcode when topiaDateCreate is null + improve a test Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2010-02-18 18:44:04 UTC (rev 1804) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2010-02-20 13:38:35 UTC (rev 1805) @@ -204,7 +204,11 @@ */ @Override public int hashCode() { - int result = getTopiaCreateDate().hashCode(); + Date date = getTopiaCreateDate(); + //TC-20100220 : il se peut que la date de creation soit nulle + // lorsque l'entite est utilise comme objet d'edition d'un formulaire + // par exemple... + int result = date == null ? 0 :date.hashCode(); return result; } @@ -219,7 +223,9 @@ if (this == obj) { return true; } - if (obj instanceof TopiaEntity == false) { + //TC-20100220 : test farfeulu :) + //if (obj instanceof TopiaEntity == false) { + if (!(obj instanceof TopiaEntity)) { return false; } TopiaEntity other = (TopiaEntity) obj;

1 0

r1804 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: fdesbois Date: 2010-02-18 19:44:04 +0100 (Thu, 18 Feb 2010) New Revision: 1804 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java Log: Change log level Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-02-18 18:10:23 UTC (rev 1803) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-02-18 18:44:04 UTC (rev 1804) @@ -597,14 +597,10 @@ List<ObjectModelAttribute> props = TopiaGeneratorUtil.getNaturalIdAttributes(clazz); - if (log.isInfoEnabled()) { - log.info("generateNaturalId for " + clazz.getName()); - } - if (!props.isEmpty()) { - if (log.isInfoEnabled()) { - log.info("props " + props); + if (log.isDebugEnabled()) { + log.debug("generateNaturalId for " + props); } ObjectModelOperation findByNaturalId = addOperation(result, "findByNaturalId", "E", ObjectModelModifier.PUBLIC);

1 0

r1803 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator src/test/java/org/nuiton/topia/persistence src/test/java/org/nuiton/topiatest src/test/resources src/test/xmi
by fdesbois＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: fdesbois Date: 2010-02-18 19:10:23 +0100 (Thu, 18 Feb 2010) New Revision: 1803 Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/TestUtils.java Modified: trunk/topia-persistence/ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties trunk/topia-persistence/src/test/xmi/topiatest.properties trunk/topia-persistence/src/test/xmi/topiatest.zargo Log: Evo #323 : add methods for naturalId managment + tests Property changes on: trunk/topia-persistence ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project *.iml *.ipr *.iws + target .settings .classpath .project *.iml *.ipr *.iws nbproject Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java 2010-02-18 13:04:14 UTC (rev 1802) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java 2010-02-18 18:10:23 UTC (rev 1803) @@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ImportsManager; +import org.nuiton.eugene.java.ImportsManager; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-02-18 13:04:14 UTC (rev 1802) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-02-18 18:10:23 UTC (rev 1803) @@ -226,6 +226,7 @@ ); setOperationBody(op,body.toString()); + generateNaturalId(result, clazz); for (ObjectModelAttribute attr : clazz.getAttributes()) { if (!attr.isNavigable()) { @@ -590,4 +591,61 @@ } return results; } + + private void generateNaturalId(ObjectModelClass result, + ObjectModelClass clazz) { + List<ObjectModelAttribute> props = + TopiaGeneratorUtil.getNaturalIdAttributes(clazz); + + if (log.isInfoEnabled()) { + log.info("generateNaturalId for " + clazz.getName()); + } + + if (!props.isEmpty()) { + + if (log.isInfoEnabled()) { + log.info("props " + props); + } + ObjectModelOperation findByNaturalId = addOperation(result, + "findByNaturalId", "E", ObjectModelModifier.PUBLIC); + addException(findByNaturalId, TopiaException.class); + + ObjectModelOperation existNaturalId = addOperation(result, + "existNaturalId", "boolean", ObjectModelModifier.PUBLIC); + addException(existNaturalId, TopiaException.class); + + // used for calling findByProperties in findByNaturalId + String searchProperties = ""; + // used for calling findByNaturalId in existNaturalId + String params = ""; + String clazzName = clazz.getName(); + for (ObjectModelAttribute attr : props) { + String propName = attr.getName(); + // add property as param in both methods + addParameter(findByNaturalId, attr.getType(), propName); + addParameter(existNaturalId, attr.getType(), propName); + + searchProperties += + ", " + clazzName + "." + getConstantName(propName) + + ", " + propName; + params += ", " + propName; + } + searchProperties = searchProperties.substring(2); + params = params.substring(2); + + setOperationBody(findByNaturalId, "" +/*{ + return findByProperties(<%=searchProperties%>); + }*/ + ); + + setOperationBody(existNaturalId, "" +/*{ + return findByNaturalId(<%=params%>) != null; + }*/ + ); + } + + + } } 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-02-18 13:04:14 UTC (rev 1802) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-02-18 18:10:23 UTC (rev 1803) @@ -350,7 +350,11 @@ * * @param clazz la classe à tester * @return la liste des attributs de la clef métier ou null si pas de clef métier. + * @deprecated use {@link #getNaturalIdAttributes(ObjectModelClass) } instead + * this usage is not allowed, prefer put tagvalue.naturalId on each + * entity attribute needed */ + @Deprecated public static List<String> getNaturalId(ObjectModelClass clazz) { String value = clazz.getTagValue(TAG_NATURAL_ID); if (value == null || value.trim().isEmpty()) { @@ -367,6 +371,22 @@ * Cherche et renvoie la liste des attributs constituant la clef metier d'une classe. * * @param clazz la classe à tester + * @return la liste des attributs de la clef métier + */ + public static List<ObjectModelAttribute> getNaturalIdAttributes(ObjectModelClass clazz) { + List<ObjectModelAttribute> results = new ArrayList<ObjectModelAttribute>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (isNaturalId(attr)) { + results.add(attr); + } + } + return results; + } + + /** + * Cherche et renvoie la liste des attributs constituant la clef metier d'une classe. + * + * @param clazz la classe à tester * @param model le modele * @return la liste des attributs de la clef métier ou null si pas de clef métier. */ Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2010-02-18 18:10:23 UTC (rev 1803) @@ -0,0 +1,171 @@ + +package org.nuiton.topia.persistence; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.PropertyValueException; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topiatest.NaturalizedEntity; +import org.nuiton.topiatest.NaturalizedEntityDAO; +import org.nuiton.topiatest.TestUtils; + +/** + * NaturalIdTest + * + * Created: 18 févr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class NaturalIdTest { + + private static final Log log = LogFactory.getLog(NaturalIdTest.class); + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testCreateSucessfull() throws Exception { + log.info("Test naturalId : create succesfull"); + TopiaContext root = TestUtils.start("naturalIdTest/createSucessfull"); + TopiaContext transaction = root.beginTransaction(); + + NaturalizedEntityDAO dao = + TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + + // No exception will be thrown with the two properties + dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.NATURAL_ID_NULL, "str"); + transaction.commitTransaction(); + + // No exception will only the need property + dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 3); + transaction.commitTransaction(); + + transaction.closeContext(); + root.closeContext(); + } + + @Test + public void testCreateFailed() throws Exception { + log.info("Test naturalId : create failed"); + TopiaContext root = TestUtils.start("naturalIdTest/createFailed"); + TopiaContext transaction = root.beginTransaction(); + + NaturalizedEntityDAO dao = + TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + + // Exception will be throw + try { + dao.create(); + transaction.commitTransaction(); + + // Note : this is possible to create an empty entity if the type + // is primitive like 'int' which have a default value of '0' + } catch (PropertyValueException eee) { + Assert.assertEquals("naturalIdNotNull", eee.getPropertyName()); + } + + transaction.closeContext(); + root.closeContext(); + } + + @Test + public void testUpdateFailed() throws Exception { + log.info("Test naturalId : update failed"); + TopiaContext root = TestUtils.start("naturalIdTest/updateFailed"); + + TopiaContext transaction = root.beginTransaction(); + + NaturalizedEntityDAO dao = + TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + + NaturalizedEntity entity = + dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.NATURAL_ID_NULL, "str"); + transaction.commitTransaction(); + + // Exception will be throw : not allowed to modify a naturalId property + try { + entity.setNaturalIdNotNull(8); + transaction.commitTransaction(); + } catch(TopiaException eee) { + Assert.assertEquals("org.hibernate.HibernateException", + eee.getCause().getClass().getName()); + } finally { + transaction.closeContext(); + root.closeContext(); + } + } + + @Test + public void testFindByNaturalId() throws Exception { + log.info("Test naturalId : findByNaturalId"); + TopiaContext root = TestUtils.start("naturalIdTest/findByNaturalId"); + TopiaContext transaction = root.beginTransaction(); + + NaturalizedEntityDAO dao = + TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + + NaturalizedEntity entity = + dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.NATURAL_ID_NULL, "str"); + transaction.commitTransaction(); + + NaturalizedEntity result = dao.findByNaturalId(5, "str"); + + Assert.assertEquals(entity, result); + + transaction.closeContext(); + root.closeContext(); + } + + @Test + public void testExistNaturalId() throws Exception { + log.info("Test naturalId : existNaturalId"); + TopiaContext root = TestUtils.start("naturalIdTest/existNaturalId"); + TopiaContext transaction = root.beginTransaction(); + + NaturalizedEntityDAO dao = TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + + dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.NATURAL_ID_NULL, "str"); + transaction.commitTransaction(); + + boolean result = dao.existNaturalId(5, "str"); + + Assert.assertTrue(result); + + // not find with only one correct property + result = dao.existNaturalId(8, "str"); + + Assert.assertFalse(result); + + transaction.closeContext(); + root.closeContext(); + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/TestUtils.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/TestUtils.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/TestUtils.java 2010-02-18 18:10:23 UTC (rev 1803) @@ -0,0 +1,41 @@ + +package org.nuiton.topiatest; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.hibernate.cfg.Environment; +import org.junit.Ignore; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; + +/** + * TestUtils + * + * Created: 18 févr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +@Ignore +public class TestUtils { + + public static TopiaContext start(String dbname) throws IOException, TopiaNotFoundException { + InputStream stream = TestUtils.class.getResourceAsStream("/TopiaContextImpl.properties"); + + Properties configuration = new Properties(); + + configuration.load(stream); + configuration.setProperty("topia.persistence.classes", + TopiaTestDAOHelper.getImplementationClassesAsString()); + + configuration.setProperty("hibernate.connection.url", "jdbc:h2:file:target/surefire-data/" + dbname); + return TopiaContextFactory.getContext(configuration); + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/TestUtils.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties 2010-02-18 13:04:14 UTC (rev 1802) +++ trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties 2010-02-18 18:10:23 UTC (rev 1803) @@ -6,4 +6,4 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file://tmp/topiatest \ No newline at end of file +hibernate.connection.url=jdbc:h2:file:target/surefire-data/h2data \ No newline at end of file Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-02-18 13:04:14 UTC (rev 1802) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-02-18 18:10:23 UTC (rev 1803) @@ -1,2 +1,11 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true + +#org.nuiton.topiatest.Company.class.tagvalue.naturalIdMutable=false +#org.nuiton.topiatest.Company.attribute.siret.tagvalue.naturalId=true +#org.nuiton.topiatest.Company.attribute.name.tagvalue.naturalId=true +#org.nuiton.topiatest.Company.attribute.name.tagvalue.notNull=false + +org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNotNull.tagvalue.naturalId=true +org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNull.tagvalue.naturalId=true +org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNull.tagvalue.notNull=false \ No newline at end of file Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1802 - trunk/topia-persistence/src/site/rst
by fdesbois＠users.nuiton.org 18 Feb '10

18 Feb '10

Author: fdesbois Date: 2010-02-18 14:04:14 +0100 (Thu, 18 Feb 2010) New Revision: 1802 Modified: trunk/topia-persistence/src/site/rst/FAQ.rst Log: Add naturalId explanations (Ano #235 : problem with indexes) Modified: trunk/topia-persistence/src/site/rst/FAQ.rst =================================================================== --- trunk/topia-persistence/src/site/rst/FAQ.rst 2010-02-11 21:46:40 UTC (rev 1801) +++ trunk/topia-persistence/src/site/rst/FAQ.rst 2010-02-18 13:04:14 UTC (rev 1802) @@ -57,3 +57,36 @@ Note L'ajout du throws TopiaException est automatique et n'a pas besoin d'être spécifié au niveau du modèle. + +Comment gérer une clé métier sur une entité (naturalId) ? +========================================================= + +Chaque entité possède une cré primaire topiaId, mais dans certains cas il est +important d'avoir une notion d'unicité sur une ou plusieurs propriétés d'une +entité, ce qu'on appele une clé métier. Le comportement souhaité serait de +préserver l'unicité sur ces propriétés ainsi que la création d'un index pour +optimiser l'accès aux données. + +Il est donc nécessaire de préciser cette notion au niveau du modèle, cela +par le biais du tagValue (également propriété hibernate) **naturalId** :: + + fr.ird.observe.entities.referentiel.ParametrageTaillePoidsFaune.class.tagvalue.naturalIdMutable=false + fr.ird.observe.entities.referentiel.ParametrageTaillePoidsFaune.attribute.sexe.tagvalue.naturalId=true + fr.ird.observe.entities.referentiel.ParametrageTaillePoidsFaune.attribute.ocean.tagvalue.naturalId=true + fr.ird.observe.entities.referentiel.ParametrageTaillePoidsFaune.attribute.ocean.tagvalue.notNull=false + fr.ird.observe.entities.referentiel.ParametrageTaillePoidsFaune.attribute.espece.tagvalue.naturalId=true + +Ici, les propriétés "sexe", "ocean" et "espece" forment la clé métier de +l'entité "ParametrageTaillePoidsFaune". Par défaut les propriétés +d'une clé métier sont non null, mais il est possible de préciser dans certains +cas qu'une propriété peut l'être (comme ici avec "ocean"). + +Le naturalId provoque trois résultats : + +- création d'un index unique en base. +- vérification dans hibernate de l'intégrité de l'entité à la création : + il est donc nécessaire de créer l'entité avec des valeurs pour les propriétés + de la clé métier (méthode create sur le dao). +- impossibilité de modifier les valeurs de ces propriétés sur une entité + existante ; à moins de le préciser dans la configuration via le tagValue + "naturalIdMutable" placé à "true" (déconseillé). \ No newline at end of file

1 0

r1801 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 11 Feb '10

11 Feb '10

Author: fdesbois Date: 2010-02-11 22:46:40 +0100 (Thu, 11 Feb 2010) New Revision: 1801 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -261,9 +261,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-8</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-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-persistence/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-service-history/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-service-index/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-service-migration/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-service-replication/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-service-security/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-02-11 21:46:26 UTC (rev 1800) +++ trunk/topia-soa/pom.xml 2010-02-11 21:46:40 UTC (rev 1801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-9-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1800 - in tags: . topia-2.3.0-beta-8
by fdesbois＠users.nuiton.org 11 Feb '10

11 Feb '10

Author: fdesbois Date: 2010-02-11 22:46:26 +0100 (Thu, 11 Feb 2010) New Revision: 1800 Added: tags/topia-2.3.0-beta-8/ Log: [maven-scm] copy for tag topia-2.3.0-beta-8 Property changes on: tags/topia-2.3.0-beta-8 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r1799 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 11 Feb '10

11 Feb '10

Author: fdesbois Date: 2010-02-11 22:46:07 +0100 (Thu, 11 Feb 2010) New Revision: 1799 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] prepare release topia-2.3.0-beta-8 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> <modules> <module>topia-persistence</module> @@ -261,9 +261,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.0-beta-8</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-8</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-persistence/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-service-history/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-service-index/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-service-migration/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-service-replication/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-service-security/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) +++ trunk/topia-soa/pom.xml 2010-02-11 21:46:07 UTC (rev 1799) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1798 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 11 Feb '10

11 Feb '10

Author: fdesbois Date: 2010-02-11 22:27:47 +0100 (Thu, 11 Feb 2010) New Revision: 1798 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] rollback the release of topia-2.3.0-beta-8 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -261,9 +261,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-8</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-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-persistence/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-service-history/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-service-index/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-service-migration/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-service-replication/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-service-security/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) +++ trunk/topia-soa/pom.xml 2010-02-11 21:27:47 UTC (rev 1798) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8</version> + <version>2.3.0-beta-8-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1797 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 11 Feb '10

11 Feb '10

Author: fdesbois Date: 2010-02-11 22:23:18 +0100 (Thu, 11 Feb 2010) New Revision: 1797 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] prepare release topia-2.3.0-beta-8 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> <modules> <module>topia-persistence</module> @@ -261,9 +261,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.0-beta-8</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-8</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-8</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-persistence/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-service-history/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-service-index/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-service-migration/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-service-replication/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-service-security/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-02-09 01:12:37 UTC (rev 1796) +++ trunk/topia-soa/pom.xml 2010-02-11 21:23:18 UTC (rev 1797) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-8-SNAPSHOT</version> + <version>2.3.0-beta-8</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0