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

r2591 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework
by athimel＠users.nuiton.org June 29, 2012

June 29, 2012

Author: athimel Date: 2012-06-29 18:12:11 +0200 (Fri, 29 Jun 2012) New Revision: 2591 Url: http://nuiton.org/repositories/revision/topia/2591 Log: Fix isTableExists implementation in TopiaHibernateSpecificUtil Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-06-15 16:28:53 UTC (rev 2590) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-06-29 16:12:11 UTC (rev 2591) @@ -42,7 +42,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaContextIllegalStateException; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaImportExportException; import org.nuiton.topia.TopiaMisconfigurationException; import org.nuiton.topia.TopiaNotFoundException; @@ -339,6 +338,21 @@ result = getParentContext().getSpecificUtil(); } if (result == null) { + try { + // FIXME AThimel 29/06/2012 This should not be hard-coded + Class<?> specificUtilClass = Class.forName( + "org.nuiton.topia.persistence.TopiaHibernateSpecificUtil"); + + result = (TopiaSpecificUtil)specificUtilClass.newInstance(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + if (result == null) { throw new TopiaMisconfigurationException("TopiaSpecificUtil not " + "found. Please check that you're using a " + "topia-persistence-xxx implementation"); @@ -1012,7 +1026,7 @@ public boolean isTableExists(Class<?> clazz) { checkClosed("isTableExists"); - boolean result = getSpecificUtil().isTableExists(clazz); + boolean result = getSpecificUtil().isTableExists(this, clazz); return result; } @@ -1027,7 +1041,7 @@ try { boolean showSchema = log.isDebugEnabled(); getFiresSupport().firePreCreateSchema(this); - getSpecificUtil().createSchema(showSchema); + getSpecificUtil().createSchema(this, showSchema); getFiresSupport().firePostCreateSchema(this); } catch (PersistenceException pe) { throw new TopiaPersistenceException( @@ -1039,7 +1053,7 @@ @Override public void showCreateSchema() { try { - getSpecificUtil().showCreateSchema(); + getSpecificUtil().showCreateSchema(this); } catch (PersistenceException pe) { throw new TopiaPersistenceException( "Schema creation could not be displayed for the following reason : " @@ -1052,7 +1066,7 @@ try { boolean showSchema = log.isDebugEnabled(); getFiresSupport().firePreUpdateSchema(this); - getSpecificUtil().updateSchema(showSchema); + getSpecificUtil().updateSchema(this, showSchema); getFiresSupport().firePostUpdateSchema(this); } catch (PersistenceException pe) { throw new TopiaPersistenceException( Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-06-15 16:28:53 UTC (rev 2590) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-06-29 16:12:11 UTC (rev 2591) @@ -44,37 +44,41 @@ * storage for a given persistent class. This is used within the * TopiaContext * - * @param clazz the researched class + * @param context the context on which table existence is checked + * @param clazz the researched class * @return true if the table exists on storage * @see TopiaContext#isTableExists(Class) */ - boolean isTableExists(Class<?> clazz); + boolean isTableExists(TopiaContextImplementor context, Class<?> clazz); /** * Implementation-dependent method to create the schema on storage. This is * used within the TopiaContext * - * @param showSchema indicates if schema must be displayed + * @param context the context on which schema creation must append + * @param showSchema indicates if schema must be displayed * @see TopiaContext#createSchema() */ - void createSchema(boolean showSchema); + void createSchema(TopiaContextImplementor context, boolean showSchema); /** * Implementation-dependent method to display the SQL queries for the * schema creation on storage. This is used within the TopiaContext * + * @param context the context on which schema creation must be shown * @see TopiaContext#showCreateSchema() */ - void showCreateSchema(); + void showCreateSchema(TopiaContextImplementor context); /** * Implementation-dependent method to update the schema on storage. This is * used within the TopiaContext * - * @param showSchema indicates if schema must be displayed + * @param context the context on which schema update must append + * @param showSchema indicates if schema must be displayed * @see TopiaContext#updateSchema() */ - void updateSchema(boolean showSchema); + void updateSchema(TopiaContextImplementor context, boolean showSchema); /** * Method used by the given TopiaContext when it receives a replicated Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-06-15 16:28:53 UTC (rev 2590) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-06-29 16:12:11 UTC (rev 2591) @@ -107,6 +107,27 @@ Map<String, Object> properties, Set<Class<?>> entities) { + Ejb3Configuration configured = loadConfiguration( + entityManagerName, properties, entities); + + EntityManagerFactory entityManagerFactory = + configured.buildEntityManagerFactory(); + + // And build the hibernate's specific util + Configuration hibernateConfiguration = + configured.getHibernateConfiguration(); + TopiaSpecificUtil specificUtil = + new TopiaHibernateSpecificUtil(hibernateConfiguration); + + Pair<EntityManagerFactory, TopiaSpecificUtil> result = + Pair.of(entityManagerFactory, specificUtil); + return result; + } + + public static Ejb3Configuration loadConfiguration( + String entityManagerName, Map<String, Object> properties, + Set<Class<?>> entities) { + Map<String, Object> hibernateProperties = Maps.newHashMap(properties); boolean useHibernateMapping = false; @@ -150,19 +171,9 @@ // Start configuration and build EntityManagerFactory Ejb3Configuration configured = cfg.configure(metadata, - hibernateProperties); - EntityManagerFactory entityManagerFactory = - configured.buildEntityManagerFactory(); + hibernateProperties); - // And build the hibernate's specific util - Configuration hibernateConfiguration = - configured.getHibernateConfiguration(); - TopiaSpecificUtil specificUtil = - new TopiaHibernateSpecificUtil(hibernateConfiguration); - - Pair<EntityManagerFactory, TopiaSpecificUtil> result = - Pair.of(entityManagerFactory, specificUtil); - return result; + return configured; } private static final ArrayList<EventType<? extends Serializable>> EVENT_TYPES = Lists.newArrayList( @@ -172,7 +183,7 @@ EventType.PRE_DELETE, EventType.POST_DELETE ); - private void registerListener(Map<String, Object> hibernateProperties) { + private static void registerListener(Map<String, Object> hibernateProperties) { String entityListenerFQN = TopiaHibernateEntityListener.class.getName(); @@ -185,7 +196,7 @@ } - protected void loadHibernateMappingFiles(List<String> entitiesNames, + protected static void loadHibernateMappingFiles(List<String> entitiesNames, PersistenceMetadata metadata) { // For each entity, get the HBM InputStream @@ -196,7 +207,7 @@ metadata.setHbmfiles(entitiesHbmFiles); } - protected void loadJPAMappingFiles(List<String> entitiesNames, + protected static void loadJPAMappingFiles(List<String> entitiesNames, PersistenceMetadata metadata) { // For each entity, get the ORM mapping path Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-06-15 16:28:53 UTC (rev 2590) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-06-29 16:12:11 UTC (rev 2591) @@ -31,6 +31,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.EntityManagerImpl; import org.hibernate.jdbc.Work; import org.hibernate.mapping.PersistentClass; @@ -40,6 +41,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.hbm2ddl.TableMetadata; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaPersistenceProvider; import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.topia.framework.TopiaSpecificUtil; @@ -49,6 +51,8 @@ import java.sql.SQLException; import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Set; /** * Hibernate implementation of the {@link TopiaSpecificUtil}. @@ -65,32 +69,57 @@ protected Configuration configuration; + public TopiaHibernateSpecificUtil() { + // No need to set the 'configuration' + } + public TopiaHibernateSpecificUtil(Configuration configuration) { this.configuration = configuration; } + protected Configuration getConfiguration(TopiaContextImplementor context) { + Configuration result = configuration; + if (result == null) { + String entityManagerName = "whatever"; + Map<String, Object> properties = context.getJPAConfiguration(); + Set<Class<?>> entities = (Set<Class<?>>) properties.get(TopiaPersistenceProvider.TOPIA_ENTITIES); + + Ejb3Configuration configured = TopiaHibernatePersistenceProvider.loadConfiguration(entityManagerName, properties, entities); + + // WARNING AThimel 29/06/2012 : Do not set 'configuration' because it might be used in a non-initialized context + result = configured.getHibernateConfiguration(); + } + return result; + } + @Override - public void createSchema(boolean showSchema) { + public void createSchema(TopiaContextImplementor context, boolean showSchema) { + Configuration configuration = getConfiguration(context); SchemaExport schemaExport = new SchemaExport(configuration); schemaExport.create(showSchema, true); } @Override - public void showCreateSchema() { + public void showCreateSchema(TopiaContextImplementor context) { + Configuration configuration = getConfiguration(context); new SchemaExport(configuration).execute(true, false, false, true); } @Override - public void updateSchema(boolean showSchema) { + public void updateSchema(TopiaContextImplementor context, boolean showSchema) { + Configuration configuration = getConfiguration(context); new SchemaUpdate(configuration).execute(showSchema, true); } @Override - public boolean isTableExists(Class<?> clazz) { + public boolean isTableExists(TopiaContextImplementor context, Class<?> clazz) { String entityName = clazz.getName(); + Configuration configuration = getConfiguration(context); boolean result = false; try { + // Force the mapping loading (should not create the tables) + configuration.buildMappings(); PersistentClass classMapping = configuration.getClassMapping(entityName); if (classMapping == null) { Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-06-15 16:28:53 UTC (rev 2590) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-06-29 16:12:11 UTC (rev 2591) @@ -103,18 +103,13 @@ public void testIsSchemaExist() throws Exception { TopiaContext rootContext = db.getRootCtxt(); - // XXX AThimel 10/05/2012 This cannot be done with ToPIA 3 because of - // XXX independence regarding to the JPA implem, which changes the way - // XXX EntityManager is created -// boolean actual = rootContext.isTableExists(PersonImpl.class); - boolean actual = false; + boolean actual = rootContext.isTableExists(PersonImpl.class); assertFalse(actual); TopiaContext tx = rootContext.beginTransaction(); - tx.createSchema(); - actual = rootContext.isTableExists(PersonImpl.class); + actual = rootContext.isTableExists(PersonImpl.class); assertTrue(actual); }

1 0

r2590 - in tags/topia-2.6.11: src/site/rst topia-persistence/src/site/rst topia-persistence/src/site/rst/devel topia-persistence/src/site/rst/user topia-service-migration/src/site/rst topia-service-replication/src/site/rst topia-service-security/src/site/rst
by tchemit＠users.nuiton.org June 15, 2012

June 15, 2012

Author: tchemit Date: 2012-06-15 18:28:53 +0200 (Fri, 15 Jun 2012) New Revision: 2590 Url: http://nuiton.org/repositories/revision/topia/2590 Log: fix rst documentation Modified: tags/topia-2.6.11/src/site/rst/index.rst tags/topia-2.6.11/topia-persistence/src/site/rst/TopiaDocumentation.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Devel.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/HibernateMapping.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Isolation.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/SchemaMigration.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Todo.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/event.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/project.rst tags/topia-2.6.11/topia-persistence/src/site/rst/devel/security.rst tags/topia-2.6.11/topia-persistence/src/site/rst/index.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/FAQ.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/ModelGeneration.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/TopiaQuery.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/continue_devel.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/extend_model.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/howto.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/start.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/start_using_api.rst tags/topia-2.6.11/topia-persistence/src/site/rst/user/tagvalues.rst tags/topia-2.6.11/topia-service-migration/src/site/rst/index.rst tags/topia-2.6.11/topia-service-migration/src/site/rst/manualMigration.rst tags/topia-2.6.11/topia-service-replication/src/site/rst/index.rst tags/topia-2.6.11/topia-service-security/src/site/rst/index.rst Modified: tags/topia-2.6.11/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.11/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/src/site/rst/index.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======= Accueil ======= Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/TopiaDocumentation.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/TopiaDocumentation.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/TopiaDocumentation.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ===== ToPIA ===== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Devel.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Devel.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Devel.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +=================== TopiaContextFactory =================== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/HibernateMapping.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/HibernateMapping.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/HibernateMapping.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================= Mapping hibernate ================= Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Isolation.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Isolation.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Isolation.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =========================== Isolation des TopiaContexts =========================== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/SchemaMigration.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/SchemaMigration.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/SchemaMigration.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========================================================= Comment migrer les version d'un schema de base de données ========================================================= Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Todo.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Todo.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/Todo.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==== TODO ==== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/event.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/event.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/event.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====================== Gestion des évènements ====================== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/project.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/project.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/project.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============================================= Liste de projets similaires ou se rapprochant ============================================= Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/devel/security.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/devel/security.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/devel/security.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ======== sécurité ======== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/index.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +===== ToPIA ===== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/FAQ.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/FAQ.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/FAQ.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + === FAQ === Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/ModelGeneration.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,8 +22,10 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====================== Génération des modèles ----------------------- +====================== Le module "topia-persistence" de topia est capable de Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/TopiaQuery.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/TopiaQuery.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/TopiaQuery.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========== TopiaQuery ========== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/continue_devel.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/continue_devel.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/continue_devel.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================== Continuer le développement ========================== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/extend_model.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/extend_model.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/extend_model.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================= Étendre le modèle ================= Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/howto.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/howto.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/howto.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====== How to ====== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/start.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/start.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/start.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================================ Démarrer un projet ToPIA - Maven ================================ Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/start_using_api.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/start_using_api.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/start_using_api.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====================== Commencer à développer ====================== Modified: tags/topia-2.6.11/topia-persistence/src/site/rst/user/tagvalues.rst =================================================================== --- tags/topia-2.6.11/topia-persistence/src/site/rst/user/tagvalues.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-persistence/src/site/rst/user/tagvalues.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========== Tag values ========== Modified: tags/topia-2.6.11/topia-service-migration/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.11/topia-service-migration/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-service-migration/src/site/rst/index.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================= ToPIA Migration Service ======================= Modified: tags/topia-2.6.11/topia-service-migration/src/site/rst/manualMigration.rst =================================================================== --- tags/topia-2.6.11/topia-service-migration/src/site/rst/manualMigration.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-service-migration/src/site/rst/manualMigration.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================================== ToPIA Migration Service (manual version) ======================================== Modified: tags/topia-2.6.11/topia-service-replication/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.11/topia-service-replication/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-service-replication/src/site/rst/index.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================= ToPIA Recherche Service ======================= Modified: tags/topia-2.6.11/topia-service-security/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.11/topia-service-security/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) +++ tags/topia-2.6.11/topia-service-security/src/site/rst/index.rst 2012-06-15 16:28:53 UTC (rev 2590) @@ -1,6 +1,3 @@ -ToPIA Sécurité Service -====================== - .. - .. * #%L .. * ToPIA :: Service Security @@ -26,5 +23,9 @@ .. * #L% .. - +====================== +ToPIA Sécurité Service +====================== + Permet la gestion des authentifications et des autorisations. Il repose sur le mécanisme de JAAS.

1 0

r2589 - in branches/topia-2.6.x: src/site/rst topia-persistence/src/site/rst topia-persistence/src/site/rst/devel topia-persistence/src/site/rst/user topia-service-migration/src/site/rst topia-service-replication/src/site/rst topia-service-security/src/site/rst
by tchemit＠users.nuiton.org June 15, 2012

June 15, 2012

Author: tchemit Date: 2012-06-15 18:21:10 +0200 (Fri, 15 Jun 2012) New Revision: 2589 Url: http://nuiton.org/repositories/revision/topia/2589 Log: fix rst documentation Modified: branches/topia-2.6.x/src/site/rst/index.rst branches/topia-2.6.x/topia-persistence/src/site/rst/TopiaDocumentation.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Devel.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/HibernateMapping.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Isolation.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/SchemaMigration.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Todo.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/event.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/project.rst branches/topia-2.6.x/topia-persistence/src/site/rst/devel/security.rst branches/topia-2.6.x/topia-persistence/src/site/rst/index.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/FAQ.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/ModelGeneration.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/TopiaQuery.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/continue_devel.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/extend_model.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/howto.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/start.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst branches/topia-2.6.x/topia-persistence/src/site/rst/user/tagvalues.rst branches/topia-2.6.x/topia-service-migration/src/site/rst/index.rst branches/topia-2.6.x/topia-service-migration/src/site/rst/manualMigration.rst branches/topia-2.6.x/topia-service-replication/src/site/rst/index.rst branches/topia-2.6.x/topia-service-security/src/site/rst/index.rst Modified: branches/topia-2.6.x/src/site/rst/index.rst =================================================================== --- branches/topia-2.6.x/src/site/rst/index.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======= Accueil ======= Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/TopiaDocumentation.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/TopiaDocumentation.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/TopiaDocumentation.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ===== ToPIA ===== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Devel.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Devel.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Devel.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +=================== TopiaContextFactory =================== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/HibernateMapping.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/HibernateMapping.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/HibernateMapping.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================= Mapping hibernate ================= Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Isolation.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Isolation.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Isolation.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =========================== Isolation des TopiaContexts =========================== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/SchemaMigration.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/SchemaMigration.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/SchemaMigration.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========================================================= Comment migrer les version d'un schema de base de données ========================================================= Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Todo.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Todo.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/Todo.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==== TODO ==== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/event.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/event.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/event.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====================== Gestion des évènements ====================== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/project.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/project.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/project.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============================================= Liste de projets similaires ou se rapprochant ============================================= Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/devel/security.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/devel/security.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/devel/security.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ======== sécurité ======== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/index.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/index.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +===== ToPIA ===== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/FAQ.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/FAQ.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/FAQ.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + === FAQ === Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/ModelGeneration.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,8 +22,10 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====================== Génération des modèles ----------------------- +====================== Le module "topia-persistence" de topia est capable de Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/TopiaQuery.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/TopiaQuery.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/TopiaQuery.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + TopiaQuery ========== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/continue_devel.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/continue_devel.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/continue_devel.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================== Continuer le développement ========================== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/extend_model.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/extend_model.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/extend_model.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================= Étendre le modèle ================= Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/howto.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/howto.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/howto.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +====== How to ====== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/start.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/start.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ================================ Démarrer un projet ToPIA - Maven ================================ Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/start_using_api.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====================== Commencer à développer ====================== Modified: branches/topia-2.6.x/topia-persistence/src/site/rst/user/tagvalues.rst =================================================================== --- branches/topia-2.6.x/topia-persistence/src/site/rst/user/tagvalues.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-persistence/src/site/rst/user/tagvalues.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Tag values ========== Modified: branches/topia-2.6.x/topia-service-migration/src/site/rst/index.rst =================================================================== --- branches/topia-2.6.x/topia-service-migration/src/site/rst/index.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-service-migration/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================= ToPIA Migration Service ======================= Modified: branches/topia-2.6.x/topia-service-migration/src/site/rst/manualMigration.rst =================================================================== --- branches/topia-2.6.x/topia-service-migration/src/site/rst/manualMigration.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-service-migration/src/site/rst/manualMigration.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================================== ToPIA Migration Service (manual version) ======================================== Modified: branches/topia-2.6.x/topia-service-replication/src/site/rst/index.rst =================================================================== --- branches/topia-2.6.x/topia-service-replication/src/site/rst/index.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-service-replication/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -22,8 +22,11 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -ToPIA Recherche Service -======================= -Permet de rechercher un mot clé parmis les entités de l'application. Il repose -sur la librairie lucene d'apache. +========================= +ToPIA Replication Service +========================= + +Permet de répliquer des grappes d'objets plus facilement. + +Documentation à faire. \ No newline at end of file Modified: branches/topia-2.6.x/topia-service-security/src/site/rst/index.rst =================================================================== --- branches/topia-2.6.x/topia-service-security/src/site/rst/index.rst 2012-06-15 15:41:58 UTC (rev 2588) +++ branches/topia-2.6.x/topia-service-security/src/site/rst/index.rst 2012-06-15 16:21:10 UTC (rev 2589) @@ -1,6 +1,3 @@ -ToPIA Sécurité Service -====================== - .. - .. * #%L .. * ToPIA :: Service Security @@ -26,5 +23,9 @@ .. * #L% .. - +====================== +ToPIA Sécurité Service +====================== + Permet la gestion des authentifications et des autorisations. Il repose sur le mécanisme de JAAS.

1 0

r2588 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org June 15, 2012

June 15, 2012

Author: maven-release Date: 2012-06-15 17:41:58 +0200 (Fri, 15 Jun 2012) New Revision: 2588 Url: http://nuiton.org/repositories/revision/topia/2588 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-06-15 15:41:56 UTC (rev 2587) +++ branches/topia-2.6.x/pom.xml 2012-06-15 15:41:58 UTC (rev 2588) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -442,9 +442,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.11</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.11</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.11</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-15 15:41:56 UTC (rev 2587) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-15 15:41:58 UTC (rev 2588) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-06-15 15:41:56 UTC (rev 2587) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-06-15 15:41:58 UTC (rev 2588) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-06-15 15:41:56 UTC (rev 2587) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-06-15 15:41:58 UTC (rev 2588) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-15 15:41:56 UTC (rev 2587) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-15 15:41:58 UTC (rev 2588) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2587 - in tags: . topia-2.6.11
by maven-release＠users.nuiton.org June 15, 2012

June 15, 2012

Author: maven-release Date: 2012-06-15 17:41:56 +0200 (Fri, 15 Jun 2012) New Revision: 2587 Url: http://nuiton.org/repositories/revision/topia/2587 Log: [maven-release-plugin] copy for tag topia-2.6.11 Added: tags/topia-2.6.11/ Property changes on: tags/topia-2.6.11 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2586 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org June 15, 2012

June 15, 2012

Author: maven-release Date: 2012-06-15 17:41:54 +0200 (Fri, 15 Jun 2012) New Revision: 2586 Url: http://nuiton.org/repositories/revision/topia/2586 Log: [maven-release-plugin] prepare release topia-2.6.11 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) +++ branches/topia-2.6.x/pom.xml 2012-06-15 15:41:54 UTC (rev 2586) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> <modules> <module>topia-persistence</module> @@ -442,9 +442,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.11</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.11</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.11</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-15 15:41:54 UTC (rev 2586) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-06-15 15:41:54 UTC (rev 2586) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-06-15 15:41:54 UTC (rev 2586) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-15 15:41:54 UTC (rev 2586) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2585 - in branches/topia-2.6.x: topia-persistence topia-service-security
by tchemit＠users.nuiton.org June 15, 2012

June 15, 2012

Author: tchemit Date: 2012-06-15 17:24:21 +0200 (Fri, 15 Jun 2012) New Revision: 2585 Url: http://nuiton.org/repositories/revision/topia/2585 Log: optimize dependencies Modified: branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-13 10:39:00 UTC (rev 2584) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) @@ -74,6 +74,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-13 10:39:00 UTC (rev 2584) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-06-15 15:24:21 UTC (rev 2585) @@ -83,6 +83,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency>

1 0

r2584 - branches/topia-2.6.x
by athimel＠users.nuiton.org June 13, 2012

June 13, 2012

Author: athimel Date: 2012-06-13 12:39:00 +0200 (Wed, 13 Jun 2012) New Revision: 2584 Url: http://nuiton.org/repositories/revision/topia/2584 Log: Fix SCM according to new branch name Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-06-11 16:04:07 UTC (rev 2583) +++ branches/topia-2.6.x/pom.xml 2012-06-13 10:39:00 UTC (rev 2584) @@ -442,9 +442,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6-maintenance</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6-maintenance</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6-maintena…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> </scm> <distributionManagement>

1 0

r2583 - in branches/topia-2.6.x: topia-persistence/src/test/java/org/nuiton/topia topia-service-security/src/test/java/org/nuiton/topia
by tchemit＠users.nuiton.org June 11, 2012

June 11, 2012

Author: tchemit Date: 2012-06-11 18:04:07 +0200 (Mon, 11 Jun 2012) New Revision: 2583 Url: http://nuiton.org/repositories/revision/topia/2583 Log: replace no more api from nuiton-utils Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2012-06-11 14:49:33 UTC (rev 2582) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2012-06-11 16:04:07 UTC (rev 2583) @@ -24,6 +24,7 @@ */ package org.nuiton.topia; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -74,7 +75,7 @@ // when calling this method (always in a BeforeClass method), we wants // to clean the directory, this is a new build - FileUtil.deleteRecursively(result); + FileUtils.deleteDirectory(result); } // always create the directory Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java =================================================================== --- branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java 2012-06-11 14:49:33 UTC (rev 2582) +++ branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java 2012-06-11 16:04:07 UTC (rev 2583) @@ -25,16 +25,18 @@ package org.nuiton.topia; +import org.apache.commons.io.FileUtils; +import org.nuiton.util.FileUtil; + import java.io.File; +import java.io.IOException; -import org.nuiton.util.FileUtil; - /** * Une classe pour avoir des choses utiles pour tous les tests. * * @author Chatellier Eric - * - * Last update : $Date$ + * <p/> + * Last update : $Date$ * @deprecated since 2.5, everything usefull already exists in the class {@link TestHelper} from {@code topia-persistence module}. */ @Deprecated @@ -45,7 +47,7 @@ protected static File targetdir; protected static File dirDatabase; - + public static File getBasedir() { if (basedir == null) { String base = System.getProperty("basedir"); @@ -65,28 +67,26 @@ } return targetdir; } - + /** * Create a temp dir and init isis with that temp dir as database. - * + * * @throws Exception */ public static void init() throws Exception { - + File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir"); dirDatabase = FileUtil.createTempDirectory("topia-test", "", mavenTestDir); } - + public static File getDirDatabase() { return dirDatabase; } - - /** - * Delete created temp directory. - */ - public static void clean() { - if(dirDatabase != null) { - FileUtil.deleteRecursively(dirDatabase); + + /** Delete created temp directory. */ + public static void clean() throws IOException { + if (dirDatabase != null) { + FileUtils.deleteDirectory(dirDatabase); dirDatabase = null; } }

1 0

r2582 - in branches: . topia-2.6.x
by tchemit＠users.nuiton.org June 11, 2012

June 11, 2012

Author: tchemit Date: 2012-06-11 16:49:33 +0200 (Mon, 11 Jun 2012) New Revision: 2582 Url: http://nuiton.org/repositories/revision/topia/2582 Log: rename branch Added: branches/topia-2.6.x/ Removed: branches/topia-2.6-maintenance/ Property changes on: branches/topia-2.6.x ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0