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

r2295 - in branches/topia-2.6.x: . topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/resources/i18n topia-persistence/src/test/java/org/nuiton/topia/framework topia-persistence/src/test/java/org/nuiton/topiatest/persistence topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings
by tchemit＠users.nuiton.org May 27, 2011

May 27, 2011

Author: tchemit Date: 2011-05-27 09:24:56 +0200 (Fri, 27 May 2011) New Revision: 2295 Url: http://nuiton.org/repositories/revision/topia/2295 Log: Evolution #1553: Updates to h2 1.3.154 Evolution #1554: Updates to sl4j 1.6.1 Anomalie #1548: topia-persistence does not build (some test are failing) when using hibernate 3.5.6 Evolution #476: Updates to hibernate 3.6.4.Final Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml branches/topia-2.6.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java branches/topia-2.6.x/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/pom.xml 2011-05-27 07:24:56 UTC (rev 2295) @@ -82,6 +82,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> <scope>compile</scope> </dependency> @@ -110,8 +116,14 @@ --> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${sl4jVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> + <version>${sl4jVersion}</version> <scope>test</scope> </dependency> @@ -119,7 +131,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> + <version>1.3.154</version> <scope>test</scope> </dependency> @@ -261,7 +273,9 @@ <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>3.3.2.GA</hibernateVersion> +  + <hibernateVersion>3.6.4.Final</hibernateVersion> + <sl4jVersion>1.6.1</sl4jVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-05-27 07:24:56 UTC (rev 2295) @@ -607,7 +607,7 @@ // ajout des repertoires contenant les mappings hibernate String[] dirs = getConfig().getProperty( - TOPIA_PERSISTENCE_DIRECTORIES, "").split(","); + TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES, "").split(","); for (String dir : dirs) { dir = dir.trim(); if (StringUtils.isNotEmpty(dir)) { @@ -634,7 +634,7 @@ } String listPersistenceClasses = getConfig().getProperty( - TOPIA_PERSISTENCE_CLASSES, ""); + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, ""); String[] classes = listPersistenceClasses.split(","); for (String classname : classes) { @@ -677,7 +677,7 @@ // TOPIA_PERSISTENCE_PROPERTIES_FILE in config. Properties propertiesFromClasspath = TopiaUtil.getProperties(getConfig(). - getProperty(TOPIA_PERSISTENCE_PROPERTIES_FILE)); + getProperty(TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE)); if (!propertiesFromClasspath.isEmpty()) { if (log.isDebugEnabled()) { @@ -688,6 +688,9 @@ } hibernateConfiguration.setProperties(prop); + + // tchemit 2011-05-26 When using hibernate > 3.3, need to make sure all mappings are loaded (the one from directory files are not still done). + hibernateConfiguration.buildMappings(); } } return hibernateConfiguration; @@ -1212,8 +1215,7 @@ } } } catch (HibernateException eee) { - throw new TopiaException(_( - "topia.persistence.error.on.replicate", + throw new TopiaException(_("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } @@ -1572,8 +1574,7 @@ } } catch (HibernateException eee) { - throw new TopiaException(_( - "topia.persistence.error.on.replicate", + throw new TopiaException(_("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-05-27 07:24:56 UTC (rev 2295) @@ -42,16 +42,16 @@ package org.nuiton.topia.generator; +import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelGenerator; -import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import org.nuiton.eugene.models.object.ObjectModelGenerator; import java.io.File; import java.io.IOException; @@ -62,7 +62,7 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang.BooleanUtils; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; /** * FIXME-poussin-20060102 mettre les attributs node="..." sur tous les attributs @@ -118,7 +118,8 @@ return; } /*{<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + <hibernate-mapping default-access="field" auto-import="true" package="<%=input.getPackageName()%>"> }*/ boolean haveSuper = input.getSuperclasses().size() > 0; Modified: branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2011-05-27 07:24:56 UTC (rev 2295) @@ -9,6 +9,7 @@ topia.persistence.error.on.export=An error occurs while export operation \: %1$s topia.persistence.error.on.loding.xml.doc=Could not read xml document for following reason \: %1$s topia.persistence.error.on.query=An error occurs while query operation \: %1$s +topia.persistence.error.on.replicate=An error occurs while a replication operation \: %s topia.persistence.error.on.rollback=An error occurs while rollback operation \: %1$s topia.persistence.error.open.transaction.failed=An error occurs while asking a new transaction \: %1$s topia.persistence.error.replicate.entity=Could not replicate entity '%1$s' pour following reason \: %2$s Modified: branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2011-05-27 07:24:56 UTC (rev 2295) @@ -9,6 +9,7 @@ topia.persistence.error.on.export=Se produjo un error durante la exportación \: %1$s topia.persistence.error.on.loding.xml.doc=No se puede leer el documento debido a \: %1$s topia.persistence.error.on.query=Se produjo un error duratne la busqueda (consulta %1$s) \: %2$s +topia.persistence.error.on.replicate=Se produjo un error durante la vuelta a atrás (replication) \: %1$s topia.persistence.error.on.rollback=Se produjo un error durante la vuelta a atrás (rollback) \: %1$s topia.persistence.error.open.transaction.failed= topia.persistence.error.replicate.entity=Error de repliación de la entidad %1$s\ndebido a la siguiente razón \: %2$s Modified: branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2011-05-27 07:24:56 UTC (rev 2295) @@ -9,6 +9,7 @@ topia.persistence.error.on.export=Une erreur est apparue pendant l'export \: %1$s topia.persistence.error.on.loding.xml.doc=Lecture du document impossible pour la raison suivante \: %1$s topia.persistence.error.on.query=Une erreur est apparue pendant le recherche (requête %1$s) \: %2$s +topia.persistence.error.on.replicate=Une erreur lors de la réplication est survenue \: %s topia.persistence.error.on.rollback=Une erreur est apparue pendant le rollback \: %1$s topia.persistence.error.open.transaction.failed=Une erreur est apparue pendant la demande de transaction \: %1$s topia.persistence.error.replicate.entity=Echec de replication de l'entite %1$s\npour la raison suivante \: %2$s Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-05-27 07:24:56 UTC (rev 2295) @@ -130,28 +130,40 @@ TopiaContextImpl child = new TopiaContextImpl(context); /** EXEC METHOD **/ - log.info("test 1 : with child context"); + if (log.isInfoEnabled()) { + log.info("test 1 : with child context"); + } Map<String, TopiaService> test1 = child.getServices(); Assert.assertEquals(1, test1.size()); Assert.assertTrue(test1.containsKey("test")); - log.info("test 2 : test serviceEnabled method"); + if (log.isInfoEnabled()) { + log.info("test 2 : test serviceEnabled method"); + } boolean test2 = child.serviceEnabled("test"); Assert.assertTrue(test2); - log.info("test 3 : test getService method"); + if (log.isInfoEnabled()) { + log.info("test 3 : test getService method"); + } TopiaService test3 = child.getService("test"); Assert.assertEquals(TestService.class, test3.getClass()); - log.info("test 4 : test serviceEnabled from class TestService"); + if (log.isInfoEnabled()) { + log.info("test 4 : test serviceEnabled from class TestService"); + } boolean test4 = child.serviceEnabled(TestService.class); Assert.assertTrue(test4); - log.info("test 5 : test getService from class TestService"); + if (log.isInfoEnabled()) { + log.info("test 5 : test getService from class TestService"); + } TestService test5 = child.getService(TestService.class); Assert.assertNotNull(test5); - log.info("test 6 : test serviceEnabled error with class FakeService"); + if (log.isInfoEnabled()) { + log.info("test 6 : test serviceEnabled error with class FakeService"); + } // FakeService doesn't contains property SERVICE_NAME used by // serviceEnabled method // Even it's properly loaded the serviceEnabled method will return false @@ -163,14 +175,19 @@ boolean test6 = otherContext.serviceEnabled(FakeService.class); Assert.assertFalse(test6); - log.info("test 7 : test getService with error TopiaNotFoundException" + - " : service not loaded"); + if (log.isInfoEnabled()) { + log.info("test 7 : test getService with error TopiaNotFoundException" + + " : service not loaded"); + } // TestService is not loaded in otherContext try { TestService test7 = otherContext.getService(TestService.class); - } catch (Exception eee) { - log.error(eee.getClass().getSimpleName() + " : " + eee.getMessage()); - Assert.assertEquals(TopiaNotFoundException.class, eee.getClass()); + Assert.fail(); + } catch (TopiaNotFoundException eee) { + //log.error(eee.getClass().getSimpleName() + " : " + eee.getMessage()); + //Assert.assertEquals(TopiaNotFoundException.class, eee.getClass()); + } catch (Exception e) { + Assert.fail(); } } @@ -182,17 +199,23 @@ TopiaContextImpl context = new TopiaContextImpl(properties); /** EXEC METHODS **/ - log.info("test 1 : constructor with parent context"); + if (log.isInfoEnabled()) { + log.info("test 1 : constructor with parent context"); + } TopiaContextImpl test1 = new TopiaContextImpl(context); Assert.assertEquals(context, test1.parentContext); - log.info("test 2 : addChildContext"); + if (log.isInfoEnabled()) { + log.info("test 2 : addChildContext"); + } TopiaContextImpl test2 = new TopiaContextImpl(properties); TopiaContextImpl child2 = new TopiaContextImpl(); test2.addChildContext(child2); Assert.assertEquals(1, test2.childContext.size()); - log.info("test 3 : removeChildContext"); + if (log.isInfoEnabled()) { + log.info("test 3 : removeChildContext"); + } TopiaContextImpl test3 = new TopiaContextImpl(properties); TopiaContextImpl child3 = new TopiaContextImpl(test3); test3.childContext.add(child3); @@ -205,7 +228,9 @@ test3.removeChildContext(child3); Assert.assertEquals(1, test3.childContext.size()); - log.info("test 4 : getRootContext"); + if (log.isInfoEnabled()) { + log.info("test 4 : getRootContext"); + } TopiaContextImplementor test4 = child3.getRootContext(); Assert.assertEquals(test3, test4); @@ -232,7 +257,9 @@ @Test public void testGetHibernateFactory() throws Exception { - log.info("## testGetHibernateFactory"); + if (log.isInfoEnabled()) { + log.info("## testGetHibernateFactory"); + } /** PREPARE DATA **/ TopiaContextImpl context = new TopiaContextImpl(); @@ -245,7 +272,9 @@ basedir = new File("").getAbsolutePath(); } - log.debug("baseDir : " + basedir); + if (log.isDebugEnabled()) { + log.debug("baseDir : " + basedir); + } File persistenceDir = new File(basedir, "target" + File.separator + "test-classes" +File.separator + @@ -253,14 +282,21 @@ "nuiton" + File.separator + "topiatest" + File.separator + "persistence"); - log.debug("persistenceDir : " + persistenceDir); + if (log.isDebugEnabled()) { + log.debug("persistenceDir : " + persistenceDir); + } File resourcesDir = new File(basedir, "target" + File.separator + "test-classes"); /** EXEC METHOD **/ - log.info("test 1 : load mappings from directory"); - + if (log.isInfoEnabled()) { + log.info("test 1 : load mappings from directory"); + } + +// properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, +// Entity1Impl.class.getName()); + properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES, persistenceDir.getAbsolutePath()); context.config = properties; @@ -276,7 +312,9 @@ // log.debug("entity : " + o.getEntityName()); // } - log.info("test 2 : load mappings for all entities"); + if (log.isInfoEnabled()) { + log.info("test 2 : load mappings for all entities"); + } //reset from previous test context = new TopiaContextImpl(); context.services = new HashMap<String, TopiaService>(); @@ -292,7 +330,9 @@ Assert.assertNotNull(persistentClass); Assert.assertEquals(Entity1.class, persistentClass.getProxyInterface()); - log.info("test 3 : add properties from file"); + if (log.isInfoEnabled()) { + log.info("test 3 : add properties from file"); + } //reset from previous test context = new TopiaContextImpl(); context.services = new HashMap<String, TopiaService>(); Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2011-05-27 07:24:56 UTC (rev 2295) @@ -24,7 +24,8 @@ #L% --> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topiatest"> <class name="org.nuiton.topiatest.persistence.Entity1Impl" table="entity1" node="org.nuiton.topiatest.persistence.Entity1Impl" abstract="false" proxy="org.nuiton.topiatest.persistence.Entity1" > <id name="topiaId" type="string" length="255" node="@topiaId"/> Modified: branches/topia-2.6.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- branches/topia-2.6.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-05-27 07:24:56 UTC (rev 2295) @@ -687,6 +687,7 @@ prop.putAll(config); configuration.setProperties(prop); + configuration.buildMappings(); return configuration; } Modified: branches/topia-2.6.x/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2011-05-26 18:06:07 UTC (rev 2294) +++ branches/topia-2.6.x/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2011-05-27 07:24:56 UTC (rev 2295) @@ -24,7 +24,8 @@ #L% --> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <hibernate-mapping> <class name="org.nuiton.topia.migration.mappings.TMSVersion" table="tms_version"> <id column="version" name="version"/>

1 0

r2294 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security topia-tutorial
by tchemit＠users.nuiton.org May 26, 2011

May 26, 2011

Author: tchemit Date: 2011-05-26 20:06:07 +0200 (Thu, 26 May 2011) New Revision: 2294 Url: http://nuiton.org/repositories/revision/topia/2294 Log: pass to version 2.6-SNAPSHOT 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 branches/topia-2.6.x/topia-tutorial/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-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 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-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 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-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 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-tutorial/pom.xml =================================================================== --- branches/topia-2.6.x/topia-tutorial/pom.xml 2011-05-26 18:04:47 UTC (rev 2293) +++ branches/topia-2.6.x/topia-tutorial/pom.xml 2011-05-26 18:06:07 UTC (rev 2294) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2293 - in branches: . topia-2.6.x
by tchemit＠users.nuiton.org May 26, 2011

May 26, 2011

Author: tchemit Date: 2011-05-26 20:04:47 +0200 (Thu, 26 May 2011) New Revision: 2293 Url: http://nuiton.org/repositories/revision/topia/2293 Log: do a branch to resolv http://nuiton.org/issues/476 Added: branches/topia-2.6.x/ Property changes on: branches/topia-2.6.x ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2292 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-tutorial/src/license
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 23:41:47 +0200 (Sun, 15 May 2011) New Revision: 2292 Url: http://nuiton.org/repositories/revision/topia/2292 Log: add svn properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-tutorial/src/license/THIRD-PARTY.properties Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/topia-tutorial/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r2291 - in trunk/topia-tutorial: . src src/license
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 23:41:24 +0200 (Sun, 15 May 2011) New Revision: 2291 Url: http://nuiton.org/repositories/revision/topia/2291 Log: optimize third-parties + dependencies Added: trunk/topia-tutorial/src/license/ trunk/topia-tutorial/src/license/THIRD-PARTY.properties Modified: trunk/topia-tutorial/pom.xml Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2011-05-15 21:12:09 UTC (rev 2290) +++ trunk/topia-tutorial/pom.xml 2011-05-15 21:41:24 UTC (rev 2291) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -23,12 +23,22 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency>  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> Added: trunk/topia-tutorial/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-tutorial/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-tutorial/src/license/THIRD-PARTY.properties 2011-05-15 21:41:24 UTC (rev 2291) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun May 15 23:37:10 CEST 2011 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Property changes on: trunk/topia-tutorial/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r2290 - in tags/topia-2.5.4: topia-persistence/src/license topia-service-migration/src/license topia-service-replication/src/license topia-service-security/src/license topia-tutorial/src topia-tutorial/src/license
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 23:12:09 +0200 (Sun, 15 May 2011) New Revision: 2290 Url: http://nuiton.org/repositories/revision/topia/2290 Log: optimize THIRD-PARTIES Added: tags/topia-2.5.4/topia-tutorial/src/license/ tags/topia-2.5.4/topia-tutorial/src/license/THIRD-PARTY.properties Modified: tags/topia-2.5.4/topia-persistence/src/license/THIRD-PARTY.properties tags/topia-2.5.4/topia-service-migration/src/license/THIRD-PARTY.properties tags/topia-2.5.4/topia-service-replication/src/license/THIRD-PARTY.properties tags/topia-2.5.4/topia-service-security/src/license/THIRD-PARTY.properties Modified: tags/topia-2.5.4/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- tags/topia-2.5.4/topia-persistence/src/license/THIRD-PARTY.properties 2011-05-15 21:09:55 UTC (rev 2289) +++ tags/topia-2.5.4/topia-persistence/src/license/THIRD-PARTY.properties 2011-05-15 21:12:09 UTC (rev 2290) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -16,7 +16,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:42:33 CET 2010 +#Sun May 15 22:58:02 CEST 2011 antlr--antlr--2.7.6--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License @@ -25,5 +25,4 @@ jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 org.slf4j--slf4j-api--1.5.8--jar=MIT License -org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: tags/topia-2.5.4/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- tags/topia-2.5.4/topia-service-migration/src/license/THIRD-PARTY.properties 2011-05-15 21:09:55 UTC (rev 2289) +++ tags/topia-2.5.4/topia-service-migration/src/license/THIRD-PARTY.properties 2011-05-15 21:12:09 UTC (rev 2290) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -14,11 +14,10 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:41 CET 2010 +#Sun May 15 23:05:22 CEST 2011 antlr--antlr--2.7.6--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8--jar=MIT License -org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License Modified: tags/topia-2.5.4/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- tags/topia-2.5.4/topia-service-replication/src/license/THIRD-PARTY.properties 2011-05-15 21:09:55 UTC (rev 2289) +++ tags/topia-2.5.4/topia-service-replication/src/license/THIRD-PARTY.properties 2011-05-15 21:12:09 UTC (rev 2290) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -14,11 +14,10 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:43:27 CET 2010 +#Sun May 15 23:02:52 CEST 2011 antlr--antlr--2.7.6--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8--jar=MIT License -org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License Modified: tags/topia-2.5.4/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- tags/topia-2.5.4/topia-service-security/src/license/THIRD-PARTY.properties 2011-05-15 21:09:55 UTC (rev 2289) +++ tags/topia-2.5.4/topia-service-security/src/license/THIRD-PARTY.properties 2011-05-15 21:12:09 UTC (rev 2290) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -14,11 +14,10 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:46 CET 2010 +#Sun May 15 23:06:02 CEST 2011 antlr--antlr--2.7.6--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8--jar=MIT License -org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License Added: tags/topia-2.5.4/topia-tutorial/src/license/THIRD-PARTY.properties =================================================================== --- tags/topia-2.5.4/topia-tutorial/src/license/THIRD-PARTY.properties (rev 0) +++ tags/topia-2.5.4/topia-tutorial/src/license/THIRD-PARTY.properties 2011-05-15 21:12:09 UTC (rev 2290) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun May 15 23:07:21 CEST 2011 +antlr--antlr--2.7.6--jar= +commons-primitives--commons-primitives--1.0--jar= +dom4j--dom4j--1.6.1--jar= +javassist--javassist--3.8.0.GA--jar= +javax.transaction--jta--1.1--jar=

1 0

r2289 - tags/topia-2.5.4
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 23:09:55 +0200 (Sun, 15 May 2011) New Revision: 2289 Url: http://nuiton.org/repositories/revision/topia/2289 Log: do not include toturial in release Modified: tags/topia-2.5.4/pom.xml Modified: tags/topia-2.5.4/pom.xml =================================================================== --- tags/topia-2.5.4/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) +++ tags/topia-2.5.4/pom.xml 2011-05-15 21:09:55 UTC (rev 2289) @@ -333,12 +333,12 @@ </configuration> </plugin> - <plugin> +  </plugins> </pluginManagement>

1 0

r2288 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:56:48 +0200 (Sun, 15 May 2011) New Revision: 2288 Url: http://nuiton.org/repositories/revision/topia/2288 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 20:56:47 UTC (rev 2287) +++ trunk/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -386,9 +386,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.4</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5.4</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 2011-05-15 20:56:47 UTC (rev 2287) +++ trunk/topia-persistence/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-05-15 20:56:47 UTC (rev 2287) +++ trunk/topia-service-migration/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-05-15 20:56:47 UTC (rev 2287) +++ trunk/topia-service-replication/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-05-15 20:56:47 UTC (rev 2287) +++ trunk/topia-service-security/pom.xml 2011-05-15 20:56:48 UTC (rev 2288) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2287 - in tags: . topia-2.5.4
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:56:47 +0200 (Sun, 15 May 2011) New Revision: 2287 Url: http://nuiton.org/repositories/revision/topia/2287 Log: [maven-release-plugin] copy for tag topia-2.5.4 Added: tags/topia-2.5.4/ Property changes on: tags/topia-2.5.4 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2286 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:56:46 +0200 (Sun, 15 May 2011) New Revision: 2286 Url: http://nuiton.org/repositories/revision/topia/2286 Log: [maven-release-plugin] prepare release topia-2.5.4 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 20:18:50 UTC (rev 2285) +++ trunk/pom.xml 2011-05-15 20:56:46 UTC (rev 2286) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.4</version> <modules> <module>topia-persistence</module> @@ -386,9 +386,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.5.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5.4</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-05-15 20:18:50 UTC (rev 2285) +++ trunk/topia-persistence/pom.xml 2011-05-15 20:56:46 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-05-15 20:18:50 UTC (rev 2285) +++ trunk/topia-service-migration/pom.xml 2011-05-15 20:56:46 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-05-15 20:18:50 UTC (rev 2285) +++ trunk/topia-service-replication/pom.xml 2011-05-15 20:56:46 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-05-15 20:18:50 UTC (rev 2285) +++ trunk/topia-service-security/pom.xml 2011-05-15 20:56:46 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0