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

r2310 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org June 28, 2011

June 28, 2011

Author: hudson Date: 2011-06-28 13:34:35 +0200 (Tue, 28 Jun 2011) New Revision: 2310 Url: http://nuiton.org/repositories/revision/topia/2310 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-06-28 11:34:34 UTC (rev 2309) +++ trunk/pom.xml 2011-06-28 11:34:35 UTC (rev 2310) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6</version> + <version>2.6.1-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6</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-06-28 11:34:34 UTC (rev 2309) +++ trunk/topia-persistence/pom.xml 2011-06-28 11:34:35 UTC (rev 2310) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6</version> + <version>2.6.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-06-28 11:34:34 UTC (rev 2309) +++ trunk/topia-service-migration/pom.xml 2011-06-28 11:34:35 UTC (rev 2310) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6</version> + <version>2.6.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-06-28 11:34:34 UTC (rev 2309) +++ trunk/topia-service-replication/pom.xml 2011-06-28 11:34:35 UTC (rev 2310) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6</version> + <version>2.6.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-06-28 11:34:34 UTC (rev 2309) +++ trunk/topia-service-security/pom.xml 2011-06-28 11:34:35 UTC (rev 2310) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6</version> + <version>2.6.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2309 - in tags: . topia-2.6
by hudson＠users.nuiton.org June 28, 2011

June 28, 2011

Author: hudson Date: 2011-06-28 13:34:34 +0200 (Tue, 28 Jun 2011) New Revision: 2309 Url: http://nuiton.org/repositories/revision/topia/2309 Log: [maven-release-plugin] copy for tag topia-2.6 Added: tags/topia-2.6/ Property changes on: tags/topia-2.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2308 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org June 28, 2011

June 28, 2011

Author: hudson Date: 2011-06-28 13:34:33 +0200 (Tue, 28 Jun 2011) New Revision: 2308 Url: http://nuiton.org/repositories/revision/topia/2308 Log: [maven-release-plugin] prepare release topia-2.6 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-06-28 10:54:14 UTC (rev 2307) +++ trunk/pom.xml 2011-06-28 11:34:33 UTC (rev 2308) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,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.6</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-06-28 10:54:14 UTC (rev 2307) +++ trunk/topia-persistence/pom.xml 2011-06-28 11:34:33 UTC (rev 2308) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-06-28 10:54:14 UTC (rev 2307) +++ trunk/topia-service-migration/pom.xml 2011-06-28 11:34:33 UTC (rev 2308) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-06-28 10:54:14 UTC (rev 2307) +++ trunk/topia-service-replication/pom.xml 2011-06-28 11:34:33 UTC (rev 2308) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-06-28 10:54:14 UTC (rev 2307) +++ trunk/topia-service-security/pom.xml 2011-06-28 11:34:33 UTC (rev 2308) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2307 - trunk
by tchemit＠users.nuiton.org June 28, 2011

June 28, 2011

Author: tchemit Date: 2011-06-28 12:54:14 +0200 (Tue, 28 Jun 2011) New Revision: 2307 Url: http://nuiton.org/repositories/revision/topia/2307 Log: fix eugene version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-28 09:50:33 UTC (rev 2306) +++ trunk/pom.xml 2011-06-28 10:54:14 UTC (rev 2307) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4</eugeneVersion> + <eugeneVersion>2.3.5</eugeneVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion>

1 0

r2306 - trunk
by tchemit＠users.nuiton.org June 28, 2011

June 28, 2011

Author: tchemit Date: 2011-06-28 11:50:33 +0200 (Tue, 28 Jun 2011) New Revision: 2306 Url: http://nuiton.org/repositories/revision/topia/2306 Log: Evolution #1598: Updates to eugene 2.4 Evolution #1553: Updates to h2 1.3.157 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-21 15:46:57 UTC (rev 2305) +++ trunk/pom.xml 2011-06-28 09:50:33 UTC (rev 2306) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.4</eugeneVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> @@ -164,7 +164,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.156</version> + <version>1.3.157</version> <scope>test</scope> </dependency>

1 0

r2305 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator site/rst/user test/java/org/nuiton/topiatest test/xmi
by bleny＠users.nuiton.org June 21, 2011

June 21, 2011

Author: bleny Date: 2011-06-21 17:46:57 +0200 (Tue, 21 Jun 2011) New Revision: 2305 Url: http://nuiton.org/repositories/revision/topia/2305 Log: add possibility to use name instead of ordinal to store enumeration value using a tagValue Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java trunk/topia-persistence/src/site/rst/user/tagvalues.rst trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java trunk/topia-persistence/src/test/xmi/topiatest.properties trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-21 15:46:57 UTC (rev 2305) @@ -47,15 +47,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGenerator; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelGenerator; +import javax.persistence.EnumType; import java.io.File; import java.io.IOException; import java.io.Writer; +import java.sql.Types; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -432,7 +435,19 @@ if (attrIsEnumeration) { /*{> <%=prefix%> <type name="org.hibernate.type.EnumType"> -<%=prefix%> <param name="enumClass"><%=attrType%></param> +<%=prefix%> <param name="<%=org.hibernate.type.EnumType.ENUM%>"><%=attrType%></param>}*/ + + // if the user tuned the model to use name instead of + // ordinal to store the values, we must add a clause + boolean useEnumerationName = TopiaGeneratorUtil.hasUseEnumerationNameTagValue(attr, model); + if (useEnumerationName) { + String enumSQLType = String.valueOf(Types.VARCHAR); +/*{ +<%=prefix%>  +<%=prefix%> <param name="<%=org.hibernate.type.EnumType.TYPE%>"><%=enumSQLType%></param>}*/ + } + +/*{ <%=prefix%> </type> <%=prefix%> </property> }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-06-21 15:46:57 UTC (rev 2305) @@ -43,6 +43,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -1757,5 +1758,10 @@ return value; } + public static boolean hasUseEnumerationNameTagValue(ObjectModelAttribute attr, ObjectModel model) { + String value = findTagValue(TopiaTagValues.TAG_USE_ENUMERATION_NAME, attr, model); + return Boolean.parseBoolean(value); + } + } // TopiaGeneratorUtil Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2011-06-21 15:46:57 UTC (rev 2305) @@ -214,6 +214,16 @@ String TAG_NOT_NULL = "notNull"; /** + * Tag à placer sur un l'attribut d'une entité. Cet attribut est de type + * énumération : l'ajout de la tagValue indique qu'il faut utiliser le + * {@code name} de l'énumération et non l'ordinal pour stocker la valeur en + * base + */ + @TagValueDefinition(target = {ObjectModelAttribute.class}, + documentation = "'true' if the value of this attribute of type Enumeration should be stored with its name (instead of using ordinal)") + String TAG_USE_ENUMERATION_NAME = "useEnumerationName"; + + /** * Tag pour configurer l'interface du proxy sur autre chose que l'implementation par defaut. * <p/> * Par defaut : Modified: trunk/topia-persistence/src/site/rst/user/tagvalues.rst =================================================================== --- trunk/topia-persistence/src/site/rst/user/tagvalues.rst 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/site/rst/user/tagvalues.rst 2011-06-21 15:46:57 UTC (rev 2305) @@ -68,8 +68,11 @@ | hibernateProxyInterface | hibernate | To not generate proxy information in | | | | hibernate mappings. | +--------------------------+-----------+----------------------------------------------------+ +| useEnumerationName | hibernate | To make an entity attribute of type enum be stored | +| | | in DB with its name (instead of ordinal, which is | +| | | the default in Hibernate) | ++--------------------------+-----------+----------------------------------------------------+ - Eugene tag values ----------------- Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2011-06-21 15:46:57 UTC (rev 2305) @@ -37,6 +37,10 @@ import java.io.File; import java.io.IOException; +/** + * Test the support of possibility to have an attribute of type enumeration + * in a entity + */ public class EnumTest { private static final Log log = LogFactory.getLog(EnumTest.class); @@ -55,6 +59,14 @@ return root; } + /** + * Create an entity having two field of type enumeration. One is stored + * using ordinal, the other using the name. + * + * The test check that values are stored, and that find methods works + * + * @throws Exception + */ @Test public void storeEntityWithEnumValue() throws Exception { TopiaContext root = initTopiaContext("storeEntityWithEnumValue"); @@ -63,6 +75,7 @@ PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); Personne personne = new PersonneImpl(); personne.setGender(Gender.FEMALE); + personne.setOtherGender(Gender.MALE); dao.create(personne); String topiaId = personne.getTopiaId(); transaction.commitTransaction(); @@ -72,8 +85,10 @@ dao = TopiaTestDAOHelper.getPersonneDAO(transaction); dao.findByTopiaId(topiaId); Assert.assertEquals(Gender.FEMALE, personne.getGender()); + Assert.assertEquals(Gender.MALE, personne.getOtherGender()); Assert.assertNotNull(dao.findByGender(Gender.FEMALE)); + Assert.assertNotNull(dao.findByOtherGender(Gender.MALE)); transaction.closeContext(); } } Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2011-06-21 14:21:35 UTC (rev 2304) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2011-06-21 15:46:57 UTC (rev 2305) @@ -38,4 +38,6 @@ org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNotNull.tagvalue.naturalId=true org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNull.tagvalue.naturalId=true -org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNull.tagvalue.notNull=false \ No newline at end of file +org.nuiton.topiatest.NaturalizedEntity.attribute.naturalIdNull.tagvalue.notNull=false + +org.nuiton.topiatest.Personne.attribute.otherGender.tagValue.useEnumerationName=true \ No newline at end of file Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2304 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by bleny＠users.nuiton.org June 21, 2011

June 21, 2011

Author: bleny Date: 2011-06-21 16:21:35 +0200 (Tue, 21 Jun 2011) New Revision: 2304 Url: http://nuiton.org/repositories/revision/topia/2304 Log: change generated mapping in entity to use org.hibernate.type.EnumType instead of serializing values in DB Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-21 07:53:37 UTC (rev 2303) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-21 14:21:35 UTC (rev 2304) @@ -344,6 +344,9 @@ String declaringElementDBName = TopiaGeneratorUtil.getDbName(attr.getDeclaringElement()); String tableName = declaringElementDBName + "_" + attrName; + boolean attrIsEnumeration = attr.getClassifier() != null + && attr.getClassifier().isEnum(); + if (attrType.trim().endsWith("[]")) { attrType = attrType.trim().substring(0, attrType.trim().length()-2); @@ -380,7 +383,10 @@ // optionalAttributes += " unique=\"true\""; } optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_NOT_NULL, TopiaGeneratorUtil.getNotNullTagValue(attr)); -/*{<%=prefix%> <property name="<%=attrName%>" type="<%=attrType%>" access="<%=accessField%>"}*/ +/*{<%=prefix%> <property name="<%=attrName%>" access="<%=accessField%>"}*/ + if ( ! attrIsEnumeration) { +/*{ type="<%=attrType%>"}*/ + } optionalAttributes = optionalAttributes.trim(); String[] columnNames = columnNamesMap.get(attrType); @@ -422,8 +428,18 @@ // simple case with no column node to generate -/*{ column="<%=attrColumn%>" node="<%=attrName%>"<%=optionalAttributes%>/> +/*{ column="<%=attrColumn%>" node="<%=attrName%>"<%=optionalAttributes%>}*/ + if (attrIsEnumeration) { +/*{> +<%=prefix%> <type name="org.hibernate.type.EnumType"> +<%=prefix%> <param name="enumClass"><%=attrType%></param> +<%=prefix%> </type> +<%=prefix%> </property> }*/ + } else { +/*{/> +}*/ + } } else { // there is some attributes to write for the column node

1 0

r2303 - trunk/topia-persistence/src/test/java/org/nuiton/topiatest
by tchemit＠users.nuiton.org June 21, 2011

June 21, 2011

Author: tchemit Date: 2011-06-21 09:53:37 +0200 (Tue, 21 Jun 2011) New Revision: 2303 Url: http://nuiton.org/repositories/revision/topia/2303 Log: add svn properties + license header Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2011-06-21 07:42:17 UTC (rev 2302) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2011-06-21 07:53:37 UTC (rev 2303) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topiatest; import junit.framework.Assert; Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-06-21 07:42:17 UTC (rev 2302) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-06-21 07:53:37 UTC (rev 2303) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topiatest; public enum Gender { Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2302 - trunk
by tchemit＠users.nuiton.org June 21, 2011

June 21, 2011

Author: tchemit Date: 2011-06-21 09:42:17 +0200 (Tue, 21 Jun 2011) New Revision: 2302 Url: http://nuiton.org/repositories/revision/topia/2302 Log: Evolution #1553: Updates to h2 1.3.156 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) +++ trunk/pom.xml 2011-06-21 07:42:17 UTC (rev 2302) @@ -164,7 +164,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.154</version> + <version>1.3.156</version> <scope>test</scope> </dependency>

1 0

June 21, 2011

Author: tchemit Date: 2011-06-21 09:35:52 +0200 (Tue, 21 Jun 2011) New Revision: 2301 Url: http://nuiton.org/repositories/revision/topia/2301 Log: Evolution #1598: Updates to eugene 2.4 Evolution #476: Updates to hibernate 3.6.4.Final Anomalie #1548: topia-persistence does not build (some test are failing) when using hibernate 3.5.6 Anomalie #1547: Make topia-replication-service works with hibernate > 3.5 Modified: trunk/ trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml trunk/topia-service-migration/pom.xml trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml trunk/topia-service-replication/pom.xml trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-security/pom.xml trunk/topia-service-security/src/license/THIRD-PARTY.properties trunk/topia-tutorial/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/from2.2.2-eugene2-beta:1662-1714 + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -54,6 +54,33 @@  </modules> + <name>ToPIA</name> + <description> + Tools for Portable and Independent Architecture : + Framework de persistance et de distribution d'application. + </description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/topia</url> + + <properties> +  + <projectId>topia</projectId> + +  + <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <processorPluginVersion>1.2.1</processorPluginVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> +  + <hibernateVersion>3.6.5.Final</hibernateVersion> + <sl4jVersion>1.6.1</sl4jVersion> + +  + <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + + </properties> + <dependencyManagement> <dependencies> @@ -82,6 +109,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> @@ -89,13 +122,19 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> <scope>runtime</scope> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> + <version>3.12.1.GA</version> <scope>runtime</scope> </dependency> @@ -110,8 +149,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 +164,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> + <version>1.3.154</version> <scope>test</scope> </dependency> @@ -129,13 +174,7 @@    - <name>ToPIA</name> - <description> - Tools for Portable and Independent Architecture : - Framework de persistance et de distribution d'application. - </description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/topia</url> + <developers> @@ -251,23 +290,7 @@ <packaging>pom</packaging> - <properties> -  - <projectId>topia</projectId> -  - <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> - <processorPluginVersion>1.2.1</processorPluginVersion> - <nuitonI18nVersion>2.4</nuitonI18nVersion> - <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>3.3.2.GA</hibernateVersion> - -  - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - - </properties> - <build> <pluginManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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> @@ -132,6 +132,8 @@   + <packaging>jar</packaging> + <build> <testResources> Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -1,29 +1,27 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - LGPL -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://jaxen.codehaus.org/license.html +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:42:33 CET 2010 +#Fri Jun 03 13:49:37 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 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: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -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,7 @@ 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: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -136,7 +136,7 @@ configuration.load(stream); configuration.setProperty( - "topia.persistence.classes", + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, TopiaTestDAOHelper.getImplementationClassesAsString()); return configuration; } @@ -150,6 +150,10 @@ String dbname) throws IOException { - return initTopiaContextConfiguration(testDirectory, DEFAULT_CONFIGURATION_LOCATION, dbname); + return initTopiaContextConfiguration( + testDirectory, + DEFAULT_CONFIGURATION_LOCATION, + dbname + ); } } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -35,8 +35,16 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.i18n.I18n; +import org.nuiton.topia.TestHelper; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.test.entities.Pet; +import org.nuiton.topia.test.entities.PetDAO; import org.nuiton.topiatest.persistence.Entity1; import org.nuiton.topiatest.persistence.Entity1Impl; import org.nuiton.topiatest.service.FakeService; @@ -61,8 +69,12 @@ protected Properties properties = new Properties(); + static File testBasedir; + @BeforeClass public static void setUpClass() throws Exception { + + testBasedir = TestHelper.getTestBasedir(TopiaContextImplTest.class); I18n.init(null, Locale.FRENCH); } @@ -77,33 +89,41 @@ @Test public void testLoadServices() throws Exception { - log.info("## testLoadServices"); + if (log.isDebugEnabled()) { + log.debug("## testLoadServices"); + } /** PREPARE DATA **/ properties.setProperty("topia.service.test", - TestService.class.getName()); + TestService.class.getName()); TopiaContextImpl context = new TopiaContextImpl(); /** EXEC METHOD **/ - log.info("test 1 : load a simple TestService from properties"); + if (log.isInfoEnabled()) { + log.info("test 1 : load a simple TestService from properties"); + } Map<String, TopiaService> results = context.loadServices(properties); Assert.assertEquals(1, results.size()); Assert.assertTrue(results.containsKey("test")); TopiaService service = results.get("test"); Assert.assertEquals(TestService.class, service.getClass()); - log.info("test 2 : load with wrong key : will display a WARN"); + if (log.isInfoEnabled()) { + log.info("test 2 : load with wrong key : will display a WARN"); + } properties.clear(); properties.setProperty("topia.service.fake", - TestService.class.getName()); + TestService.class.getName()); results = context.loadServices(properties); Assert.assertEquals(0, results.size()); Assert.assertFalse(results.containsKey("fake")); - log.info("test 3 : load with fake service name : will display an ERROR"); + if (log.isInfoEnabled()) { + log.info("test 3 : load with fake service name : will display an ERROR"); + } properties.clear(); properties.setProperty("topia.service.test", "FAKE"); @@ -111,17 +131,17 @@ results = context.loadServices(properties); Assert.assertEquals(0, results.size()); Assert.assertFalse(results.containsKey("test")); - - // TODO-fdesbois-20100510 : need integration tests for all existing topia services } @Test public void testGetServices() throws Exception { - log.info("## testGetServices"); + if (log.isDebugEnabled()) { + log.debug("## testGetServices"); + } /** PREPARE DATA **/ properties.setProperty("topia.service.test", - TestService.class.getName()); + TestService.class.getName()); // Calling the constructor with properties will load the services TopiaContextImpl context = new TopiaContextImpl(properties); @@ -130,69 +150,94 @@ 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 properties.clear(); properties.setProperty("topia.service.fake", - FakeService.class.getName()); + FakeService.class.getName()); TopiaContextImpl otherContext = new TopiaContextImpl(properties); 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(); } } @Test public void testContextHierarchy() throws Exception { - log.info("## testContextHierarchy"); + if (log.isDebugEnabled()) { + log.debug("## testContextHierarchy"); + } /** PREPARE DATA **/ 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 +250,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 +279,9 @@ @Test public void testGetHibernateFactory() throws Exception { - log.info("## testGetHibernateFactory"); + if (log.isDebugEnabled()) { + log.debug("## testGetHibernateFactory"); + } /** PREPARE DATA **/ TopiaContextImpl context = new TopiaContextImpl(); @@ -245,24 +294,30 @@ 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 + - "org" + File.separator + - "nuiton" + File.separator + - "topiatest" + File.separator + - "persistence"); - log.debug("persistenceDir : " + persistenceDir); + "target" + File.separator + + "test-classes" + File.separator + + "org" + File.separator + + "nuiton" + File.separator + + "topiatest" + File.separator + + "persistence"); + 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_DIRECTORIES, - persistenceDir.getAbsolutePath()); + persistenceDir.getAbsolutePath()); context.config = properties; Configuration test1 = context.getHibernateConfiguration(); @@ -276,7 +331,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>(); @@ -284,7 +341,7 @@ // use property TOPIA_PERSISTENCE_CLASSES properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, - Entity1Impl.class.getName()); + Entity1Impl.class.getName()); context.config = properties; Configuration test2 = context.getHibernateConfiguration(); @@ -292,7 +349,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>(); @@ -301,7 +360,7 @@ // use property TOPIA_PERSISTENCE_PROPERTIES_FILE to add default // properties from file properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE, - resourcesDir + File.separator + "TopiaContextImpl.properties"); + resourcesDir + File.separator + "TopiaContextImpl.properties"); context.config = properties; Configuration test3 = context.getHibernateConfiguration(); @@ -311,6 +370,103 @@ // Note : maybe add a test to load classes from services } + + @Test + public void replicateEntity() throws Exception { + + Properties configSource = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "replicateSource"); + + Properties configTarget = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "replicateTarget"); + + + TopiaContext contextSource = null; + TopiaContext contextTarget = null; + + try { + contextSource = TopiaContextFactory.getContext(configSource); + contextTarget = TopiaContextFactory.getContext(configTarget); + + TopiaContext txSource; + TopiaContext txTarget; + PersonDAO daoSource, daoTarget; + PetDAO petDAOSource, petDAOTarget; + Person personSource, personTarget; + Pet petSource, petTarget; + + txSource = contextSource.beginTransaction(); + daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); + petDAOSource = TopiaTestDAOHelper.getPetDAO(txSource); + + personSource = daoSource.create(Person.PROPERTY_FIRSTNAME, " firstName", + Person.PROPERTY_NAME, " name" + ); + + petSource = petDAOSource.create(Pet.PROPERTY_NAME, "name", + Pet.PROPERTY_TYPE, "type", + Pet.PROPERTY_PERSON, personSource + ); + + personSource.addPet(petSource); + + txSource.commitTransaction(); + + daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); + + personSource = daoSource.findByTopiaId(personSource.getTopiaId()); + Assert.assertNotNull(personSource); + + petSource = petDAOSource.findByTopiaId(petSource.getTopiaId()); + Assert.assertNotNull(petSource); + Assert.assertEquals(1, personSource.sizePet()); + Assert.assertEquals(petSource, personSource.getPet().iterator().next()); + + txTarget = contextTarget.beginTransaction(); + + txSource.replicateEntity(txTarget, petSource); + txSource.replicateEntity(txTarget, personSource); + + txTarget.commitTransaction(); + + daoTarget = TopiaTestDAOHelper.getPersonDAO(txTarget); + petDAOTarget = TopiaTestDAOHelper.getPetDAO(txTarget); + + personTarget = daoTarget.findByTopiaId(personSource.getTopiaId()); + Assert.assertNotNull(personTarget); + Assert.assertEquals(personSource, personTarget); + Assert.assertEquals(1, personTarget.sizePet()); + + petTarget = petDAOTarget.findByTopiaId(petSource.getTopiaId()); + Assert.assertNotNull(petTarget); + Assert.assertEquals(petSource, petTarget); + + Assert.assertEquals(petTarget, personTarget.getPet().iterator().next()); + + + } finally { + closeDb(contextSource); + closeDb(contextTarget); + } + + } + + protected static void closeDb(TopiaContext contextSource) { + if (contextSource != null && !contextSource.isClosed()) + try { + contextSource.clear(false); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Could not close db " + contextSource, e); + } + } + } + + // // @Test // public void testGetHibernateConfiguration() throws Exception { @@ -368,9 +524,6 @@ // public void testExportXML() throws Exception { // } // -// @Test -// public void testReplicate() throws Exception { -// } // // @Test // public void testReplicateEntity() throws Exception { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -77,9 +77,10 @@ File testBasedir = TestHelper.getTestBasedir(TopiaTestCase.class); - config = TestHelper.initTopiaContextConfiguration(testBasedir, - "/TopiaContextImpl.properties", - "TopiaTestCaseDb"); + config = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "TopiaTestCaseDb"); // config = new Properties(); // config.setProperty("topia.persistence.classes", TopiaTestDAOHelper.getImplementationClassesAsString()); // @@ -95,8 +96,6 @@ public static void after() throws TopiaException { // destroy database context.clear(false); - - // TODO directory target/TopiaTestCase is not deleted } /** Create base with schema created. */ Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-migration/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:41 CET 2010 +#Fri Jun 03 13:51: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 Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -687,6 +687,7 @@ prop.putAll(config); configuration.setProperties(prop); + configuration.buildMappings(); return configuration; } Modified: trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml =================================================================== --- trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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"/> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-replication/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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> @@ -74,6 +74,11 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> +  <dependency> <groupId>com.h2database</groupId> Modified: trunk/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:43:27 CET 2010 +#Fri Jun 03 13:50:38 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: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -75,7 +75,9 @@ * removed in version 2.6 and never replaced */ @Deprecated - void register(ReplicationModel model, ReplicationNode ownerNode, ReplicationOperationPhase phase, + void register(ReplicationModel model, + ReplicationNode ownerNode, + ReplicationOperationPhase phase, Object... parameters) throws UnsupportedOperationException; @@ -91,8 +93,10 @@ * @param entities la liste des entités à traiter * @throws Exception pour toute erreur */ - void run(TopiaReplicationContext replicationContext, ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, TopiaContextImplementor dstCtxt, List<? extends TopiaEntity> entities) - throws Exception; + void run(TopiaReplicationContext replicationContext, + ReplicationOperationDef operationDef, + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> entities) throws Exception; } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -76,6 +76,12 @@ TopiaContextImplementor dstCtxt, List<? extends TopiaEntity> entities) throws TopiaException { + // fix http://nuiton.org/issues/1547 + //FIXME tchemit-2011-06-03 : while using hibernate 3.5.6, while duplicating entities we can have some associations in double sessions + //FIXME This hack works but it should be better to resolve the bug :( perharps this is not possible + //FIXME since we can not have a fresh empty hibernate session... + srcCtxt.getHibernate().clear(); + // replication des donnees vers la destination srcCtxt.replicateEntities(dstCtxt, entities); Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2011-06-21 07:35:52 UTC (rev 2301) @@ -141,7 +141,7 @@ protected abstract Log getLog(); protected <E extends TopiaEntity> E update(E e) throws TopiaException { - return (E) ((TopiaContextImplementor) ctxt).findByTopiaId(e.getTopiaId()); + return (E) ctxt.findByTopiaId(e.getTopiaId()); } /** Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-security/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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: trunk/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-security/src/license/THIRD-PARTY.properties 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2011-06-21 07:35:52 UTC (rev 2301) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:46 CET 2010 +#Fri Jun 03 13:51:11 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: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) +++ trunk/topia-tutorial/pom.xml 2011-06-21 07:35:52 UTC (rev 2301) @@ -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

r2300 - in trunk: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/test/java/org/nuiton/topiatest topia-persistence/src/test/xmi
by bleny＠users.nuiton.org June 20, 2011

June 20, 2011

Author: bleny Date: 2011-06-20 18:59:45 +0200 (Mon, 20 Jun 2011) New Revision: 2300 Url: http://nuiton.org/repositories/revision/topia/2300 Log: enable use of enumeration as an attribute of an entity in model Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) @@ -256,7 +256,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.3.4</eugeneVersion> + <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/pom.xml 2011-06-20 16:59:45 UTC (rev 2300) @@ -132,8 +132,6 @@   - <packaging>jar</packaging> - <build> <testResources> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -155,7 +155,7 @@ } ObjectModelClassifier classifier = dependency.getSupplier(); - if (TopiaGeneratorUtil.hasEntityStereotype(classifier)) { + if (TopiaGeneratorUtil.isEntity(classifier)) { // Only direct operations will be used. No need to have more // operations. @@ -172,7 +172,7 @@ @Override public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.hasEntityStereotype(clazz)) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { return; } @@ -187,7 +187,7 @@ String extendClass = ""; for (ObjectModelClass parent : clazz.getSuperclasses()) { extendClass = parent.getQualifiedName(); - if (TopiaGeneratorUtil.hasEntityStereotype(parent)) { + if (TopiaGeneratorUtil.isEntity(parent)) { extendClass += "DAOImpl<E>"; // in java no multi-inheritance break; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -86,14 +86,14 @@ } ObjectModelClassifier classifier = dependency.getSupplier(); - if (TopiaGeneratorUtil.hasEntityStereotype(classifier)) { + if (TopiaGeneratorUtil.isEntity(classifier)) { noGenerationNeeded.add(classifier.getQualifiedName()); } } @Override public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.hasEntityStereotype(clazz) || hasDAOOperations(clazz)) { + if (!TopiaGeneratorUtil.isEntity(clazz) || hasDAOOperations(clazz)) { return; } String clazzName = clazz.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -45,7 +45,7 @@ @Override public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.hasEntityStereotype(clazz)) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { return; } String clazzName = clazz.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -434,7 +434,7 @@ attrEntity = model.getClass(attr.getType()); } boolean isDTO = attrEntity != null && - TopiaGeneratorUtil.hasEntityStereotype(attrEntity); //THIMEL : STEREOTYPE ENTITY ??? + TopiaGeneratorUtil.isEntity(attrEntity); //THIMEL : STEREOTYPE ENTITY ??? ObjectModelAttribute reverse = attr.getReverseAttribute(); if (isDTO && (reverse == null || !reverse.isNavigable()) && !attr.hasAssociationClass() || !isDTO) { String attrName = attr.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -168,7 +168,7 @@ ObjectModelClassifier classifier = dependency.getSupplier(); - if (!TopiaGeneratorUtil.hasEntityStereotype(classifier)) { + if (!TopiaGeneratorUtil.isEntity(classifier)) { // dependency supplier is not an entity... if (log.isWarnEnabled()) { @@ -201,7 +201,7 @@ @Override public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.hasEntityStereotype(clazz)) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { return; } String clazzName = clazz.getName(); @@ -261,7 +261,7 @@ String extendClass = ""; for (ObjectModelClass parent : clazz.getSuperclasses()) { extendClass = parent.getQualifiedName(); - if (TopiaGeneratorUtil.hasEntityStereotype(parent)) { + if (TopiaGeneratorUtil.isEntity(parent)) { extendClass += "DAOImpl<E>"; // in java no multi-inheritance break; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -53,12 +53,13 @@ public boolean isEntity(String type) { ObjectModelClassifier clazz = model.getClassifier(type); - return clazz != null && TopiaGeneratorUtil.hasEntityStereotype(clazz); + return clazz != null && ! clazz.isEnum() + && TopiaGeneratorUtil.isEntity(clazz); } @Override public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.hasEntityStereotype(clazz)) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { return; } String clazzName = clazz.getName(); @@ -310,7 +311,7 @@ if (model.hasClass(attr.getType())) { attrEntity = model.getClass(attr.getType()); } - boolean isEntity = attrEntity != null && TopiaGeneratorUtil.hasEntityStereotype(attrEntity); + boolean isEntity = attrEntity != null && TopiaGeneratorUtil.isEntity(attrEntity); ObjectModelAttribute reverse = attr.getReverseAttribute(); if (isEntity && (reverse == null || !reverse.isNavigable()) && !attr.hasAssociationClass() || !isEntity) { String attrName = attr.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -113,7 +113,7 @@ public void generateFromClass(Writer output, ObjectModelClass input) throws IOException { String persistenceType = TopiaGeneratorUtil.getPersistenceType(input); - if (!TopiaGeneratorUtil.hasEntityStereotype(input) && + if (!TopiaGeneratorUtil.isEntity(input) && TopiaGeneratorUtil.PERSISTENCE_TYPE_HIBERNATE.equals(persistenceType)) { return; } @@ -216,7 +216,7 @@ || hasUnidirectionalRelationOnAbstractType(reverse, model) || attr.hasAssociationClass()) { if (!GeneratorUtil.isNMultiplicity(attr)) { - if (attr.getClassifier() != null && TopiaGeneratorUtil.hasEntityStereotype(attr.getClassifier())) { + if (attr.getClassifier() != null && TopiaGeneratorUtil.isEntity(attr.getClassifier())) { if (GeneratorUtil.isNMultiplicity(attr.getReverseMaxMultiplicity()) && !attr.hasAssociationClass()) { generateHibernateManyToOne(output, attr, prefix); } else { @@ -226,7 +226,7 @@ generateHibernateProperty(output, attr, prefix); } } else { - if (attr.getClassifier() != null && TopiaGeneratorUtil.hasEntityStereotype(attr.getClassifier())) { + if (attr.getClassifier() != null && TopiaGeneratorUtil.isEntity(attr.getClassifier())) { if (GeneratorUtil.isNMultiplicity(attr.getReverseMaxMultiplicity()) && !attr.hasAssociationClass()) { generateHibernateManyToMany(output, attr, prefix); } else { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -104,7 +104,7 @@ @Override public void transformFromClass(ObjectModelClass input) { - if (!TopiaGeneratorUtil.hasEntityStereotype(input)) { + if (!TopiaGeneratorUtil.isEntity(input)) { // not an entity, skip class. return; @@ -200,7 +200,7 @@ // Extends from inheritance boolean needTopiaEntity = true; for (ObjectModelClassifier parent : input.getSuperclasses()) { - if (TopiaGeneratorUtil.hasEntityStereotype(parent)) { + if (TopiaGeneratorUtil.isEntity(parent)) { addInterface(outputInterface, parent.getQualifiedName()); needTopiaEntity = false; break; @@ -247,7 +247,7 @@ //Si une des classes parentes définies des méthodes abstraites, son // impl ne sera pas créé boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); - if (TopiaGeneratorUtil.hasEntityStereotype(parent)) { + if (TopiaGeneratorUtil.isEntity(parent)) { if (abstractParent) { extendClass += "Abstract"; } else { @@ -1227,7 +1227,7 @@ } boolean isEntity = attrEntity != null && - TopiaGeneratorUtil.hasEntityStereotype(attrEntity); + TopiaGeneratorUtil.isEntity(attrEntity); ObjectModelAttribute reverse = attr.getReverseAttribute(); if (isEntity && (reverse == null || !reverse.isNavigable()) @@ -1271,7 +1271,7 @@ for (ObjectModelAttribute attr : input.getAttributes()) { if (attr.referenceClassifier() && - TopiaGeneratorUtil.hasEntityStereotype(attr.getClassifier())) { + TopiaGeneratorUtil.isEntity(attr.getClassifier())) { if (attr.isComposite()) { String attrName = attr.getName(); @@ -1376,7 +1376,7 @@ for (ObjectModelAttribute attr : input.getAttributes()) { if (attr.referenceClassifier() && - TopiaGeneratorUtil.hasEntityStereotype(attr.getClassifier()) && + TopiaGeneratorUtil.isEntity(attr.getClassifier()) && attr.isAggregate()) { String attrName = attr.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -300,7 +300,8 @@ /*************************** INNER PROPERTY CLASSES ***********************/ @Override - public void transformFromClass(ObjectModelClass clazz) { +// public void transformFromClass(ObjectModelClass clazz) { + public void transformFromClassifier(ObjectModelClassifier clazz) { if (!TopiaGeneratorUtil.hasEntityStereotype(clazz)) { return; } @@ -357,7 +358,7 @@ return aliasPropertyName; } - protected ObjectModelClass createInnerClass(ObjectModelClass input, String aliasConstant) { + protected ObjectModelClass createInnerClass(ObjectModelClassifier input, String aliasConstant) { String className = getPropertyClassName(input); ObjectModelClass propertyClass = (ObjectModelClass) @@ -416,7 +417,7 @@ return propertyClass; } - protected void createGetterOperations(ObjectModelClass input, ObjectModelClass propertyClass) { + protected void createGetterOperations(ObjectModelClassifier input, ObjectModelClass propertyClass) { // Generate for all attributes for (ObjectModelAttribute attr : input.getAttributes()) { @@ -539,7 +540,7 @@ ); } - protected void addExtraForSubEntity(ObjectModelClass entityClass) { + protected void addExtraForSubEntity(ObjectModelClassifier entityClass) { for (ObjectModelAttribute attr : entityClass.getAttributes()) { if (attr.isNavigable() && attr.referenceClassifier() && Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -521,7 +521,7 @@ return type; } ObjectModelClass clazz = model.getClass(type); - if (hasEntityStereotype(clazz)) { + if (isEntity(clazz)) { if (shouldBeAbstract(clazz)) { type += "Abstract"; } else { @@ -650,7 +650,7 @@ if (!reverse.isNavigable()) { //Il s'agit d'une entity ObjectModelClass clazz = model.getClass(attr.getType()); - if (clazz != null && hasEntityStereotype(clazz)) { + if (clazz != null && isEntity(clazz)) { //Cette classe a des sous-classes dans le modèle for (ObjectModelClass subClass : model.getClasses()) { if (subClass.getSuperclasses().contains(clazz)) { @@ -1124,7 +1124,7 @@ * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} stereotype. * * @param classifier classifier to test - * @return {@code true} if stereotype was found, {@code false otherwise} + * @return {@code true} if stereotype was found, {@code false} otherwise * @see TopiaStereoTypes#STEREOTYPE_ENTITY * @since 2.5 */ @@ -1132,7 +1132,21 @@ return classifier.hasStereotype(TopiaStereoTypes.STEREOTYPE_ENTITY); } + /** + * Check if the given classifier has the + * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} and is not an enumeration + * + * @param classifier classifier to test + * @return {@code true} if stereotype was found and classifier is not + * enumeration, {@code false} otherwise + * @see TopiaStereoTypes#STEREOTYPE_ENTITY + * @since 2.5 + */ + public static boolean isEntity(ObjectModelClassifier classifier) { + return hasEntityStereotype(classifier) && ! classifier.isEnum(); + } + /** * Check if the given attribute has the * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} stereotype. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2011-06-10 10:28:38 UTC (rev 2299) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -61,7 +61,7 @@ /** * Stéréotype pour les objets devant être générées sous forme d'entités * - * @see TopiaGeneratorUtil#hasEntityStereotype(ObjectModelClassifier) + * @see TopiaGeneratorUtil#isEntity(ObjectModelClassifier) * @see TopiaGeneratorUtil#hasEntityStereotype(ObjectModelAttribute) */ @StereotypeDefinition(target = {ObjectModelClassifier.class, ObjectModelAttribute.class}, Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -0,0 +1,55 @@ +package org.nuiton.topiatest; + +import junit.framework.Assert; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.topia.TestHelper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; + +import java.io.File; +import java.io.IOException; + +public class EnumTest { + + private static final Log log = LogFactory.getLog(EnumTest.class); + + protected static File testBasedir; + + @BeforeClass + public static void setUpClass() throws Exception { + testBasedir = TestHelper.getTestBasedir(EnumTest.class); + } + + protected TopiaContext initTopiaContext(String testName) throws IOException, TopiaNotFoundException { + TopiaContext root = TestHelper.initTopiaContext(testBasedir, + "/TopiaContextImpl.properties", + testName); + return root; + } + + @Test + public void storeEntityWithEnumValue() throws Exception { + TopiaContext root = initTopiaContext("storeEntityWithEnumValue"); + TopiaContext transaction = root.beginTransaction(); + + PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + Personne personne = new PersonneImpl(); + personne.setGender(Gender.FEMALE); + dao.create(personne); + String topiaId = personne.getTopiaId(); + transaction.commitTransaction(); + transaction.closeContext(); + + transaction = root.beginTransaction(); + dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + dao.findByTopiaId(topiaId); + Assert.assertEquals(Gender.FEMALE, personne.getGender()); + + Assert.assertNotNull(dao.findByGender(Gender.FEMALE)); + transaction.closeContext(); + } +} Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-06-20 16:59:45 UTC (rev 2300) @@ -0,0 +1,5 @@ +package org.nuiton.topiatest; + +public enum Gender { + MALE, FEMALE; +} Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2299 - branches/topia-2.6.x
by tchemit＠users.nuiton.org June 10, 2011

June 10, 2011

Author: tchemit Date: 2011-06-10 12:28:38 +0200 (Fri, 10 Jun 2011) New Revision: 2299 Url: http://nuiton.org/repositories/revision/topia/2299 Log: use last stable version of hibernate Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2011-06-07 20:09:20 UTC (rev 2298) +++ branches/topia-2.6.x/pom.xml 2011-06-10 10:28:38 UTC (rev 2299) @@ -73,7 +73,7 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion>  - <hibernateVersion>3.6.4.Final</hibernateVersion> + <hibernateVersion>3.6.5.Final</hibernateVersion> <sl4jVersion>1.6.1</sl4jVersion>

1 0

r2298 - trunk
by tchemit＠users.nuiton.org June 7, 2011

June 7, 2011

Author: tchemit Date: 2011-06-07 22:09:20 +0200 (Tue, 07 Jun 2011) New Revision: 2298 Url: http://nuiton.org/repositories/revision/topia/2298 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-03 14:27:35 UTC (rev 2297) +++ trunk/pom.xml 2011-06-07 20:09:20 UTC (rev 2298) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <artifactId>topia</artifactId>

1 0

r2297 - in branches/topia-2.6.x: topia-persistence/src/license topia-persistence/src/test/java/org/nuiton/topia topia-persistence/src/test/java/org/nuiton/topia/framework topia-persistence/src/test/java/org/nuiton/topia/generator topia-service-migration/src/license topia-service-replication/src/license topia-service-replication/src/main/java/org/nuiton/topia/replication topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/test/java/org/
by tchemit＠users.nuiton.org June 3, 2011

June 3, 2011

Author: tchemit Date: 2011-06-03 16:27:35 +0200 (Fri, 03 Jun 2011) New Revision: 2297 Url: http://nuiton.org/repositories/revision/topia/2297 Log: optimize third parties Modified: branches/topia-2.6.x/topia-persistence/src/license/THIRD-PARTY.properties 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/framework/TopiaContextImplTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java branches/topia-2.6.x/topia-service-migration/src/license/THIRD-PARTY.properties branches/topia-2.6.x/topia-service-replication/src/license/THIRD-PARTY.properties branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java branches/topia-2.6.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java branches/topia-2.6.x/topia-service-security/src/license/THIRD-PARTY.properties Modified: branches/topia-2.6.x/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- branches/topia-2.6.x/topia-persistence/src/license/THIRD-PARTY.properties 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-persistence/src/license/THIRD-PARTY.properties 2011-06-03 14:27:35 UTC (rev 2297) @@ -1,29 +1,27 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - LGPL -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://jaxen.codehaus.org/license.html +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:42:33 CET 2010 +#Fri Jun 03 13:49:37 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 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: 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 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -136,7 +136,7 @@ configuration.load(stream); configuration.setProperty( - "topia.persistence.classes", + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, TopiaTestDAOHelper.getImplementationClassesAsString()); return configuration; } @@ -150,6 +150,10 @@ String dbname) throws IOException { - return initTopiaContextConfiguration(testDirectory, DEFAULT_CONFIGURATION_LOCATION, dbname); + return initTopiaContextConfiguration( + testDirectory, + DEFAULT_CONFIGURATION_LOCATION, + dbname + ); } } 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-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -35,8 +35,16 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.i18n.I18n; +import org.nuiton.topia.TestHelper; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.test.entities.Pet; +import org.nuiton.topia.test.entities.PetDAO; import org.nuiton.topiatest.persistence.Entity1; import org.nuiton.topiatest.persistence.Entity1Impl; import org.nuiton.topiatest.service.FakeService; @@ -61,8 +69,12 @@ protected Properties properties = new Properties(); + static File testBasedir; + @BeforeClass public static void setUpClass() throws Exception { + + testBasedir = TestHelper.getTestBasedir(TopiaContextImplTest.class); I18n.init(null, Locale.FRENCH); } @@ -77,33 +89,41 @@ @Test public void testLoadServices() throws Exception { - log.info("## testLoadServices"); + if (log.isDebugEnabled()) { + log.debug("## testLoadServices"); + } /** PREPARE DATA **/ properties.setProperty("topia.service.test", - TestService.class.getName()); + TestService.class.getName()); TopiaContextImpl context = new TopiaContextImpl(); /** EXEC METHOD **/ - log.info("test 1 : load a simple TestService from properties"); + if (log.isInfoEnabled()) { + log.info("test 1 : load a simple TestService from properties"); + } Map<String, TopiaService> results = context.loadServices(properties); Assert.assertEquals(1, results.size()); Assert.assertTrue(results.containsKey("test")); TopiaService service = results.get("test"); Assert.assertEquals(TestService.class, service.getClass()); - log.info("test 2 : load with wrong key : will display a WARN"); + if (log.isInfoEnabled()) { + log.info("test 2 : load with wrong key : will display a WARN"); + } properties.clear(); properties.setProperty("topia.service.fake", - TestService.class.getName()); + TestService.class.getName()); results = context.loadServices(properties); Assert.assertEquals(0, results.size()); Assert.assertFalse(results.containsKey("fake")); - log.info("test 3 : load with fake service name : will display an ERROR"); + if (log.isInfoEnabled()) { + log.info("test 3 : load with fake service name : will display an ERROR"); + } properties.clear(); properties.setProperty("topia.service.test", "FAKE"); @@ -111,17 +131,17 @@ results = context.loadServices(properties); Assert.assertEquals(0, results.size()); Assert.assertFalse(results.containsKey("test")); - - // TODO-fdesbois-20100510 : need integration tests for all existing topia services } @Test public void testGetServices() throws Exception { - log.info("## testGetServices"); + if (log.isDebugEnabled()) { + log.debug("## testGetServices"); + } /** PREPARE DATA **/ properties.setProperty("topia.service.test", - TestService.class.getName()); + TestService.class.getName()); // Calling the constructor with properties will load the services TopiaContextImpl context = new TopiaContextImpl(properties); @@ -169,7 +189,7 @@ // Even it's properly loaded the serviceEnabled method will return false properties.clear(); properties.setProperty("topia.service.fake", - FakeService.class.getName()); + FakeService.class.getName()); TopiaContextImpl otherContext = new TopiaContextImpl(properties); boolean test6 = otherContext.serviceEnabled(FakeService.class); @@ -193,7 +213,9 @@ @Test public void testContextHierarchy() throws Exception { - log.info("## testContextHierarchy"); + if (log.isDebugEnabled()) { + log.debug("## testContextHierarchy"); + } /** PREPARE DATA **/ TopiaContextImpl context = new TopiaContextImpl(properties); @@ -257,8 +279,8 @@ @Test public void testGetHibernateFactory() throws Exception { - if (log.isInfoEnabled()) { - log.info("## testGetHibernateFactory"); + if (log.isDebugEnabled()) { + log.debug("## testGetHibernateFactory"); } /** PREPARE DATA **/ @@ -276,12 +298,12 @@ log.debug("baseDir : " + basedir); } File persistenceDir = new File(basedir, - "target" + File.separator + - "test-classes" +File.separator + - "org" + File.separator + - "nuiton" + File.separator + - "topiatest" + File.separator + - "persistence"); + "target" + File.separator + + "test-classes" + File.separator + + "org" + File.separator + + "nuiton" + File.separator + + "topiatest" + File.separator + + "persistence"); if (log.isDebugEnabled()) { log.debug("persistenceDir : " + persistenceDir); } @@ -294,11 +316,8 @@ 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()); + persistenceDir.getAbsolutePath()); context.config = properties; Configuration test1 = context.getHibernateConfiguration(); @@ -322,7 +341,7 @@ // use property TOPIA_PERSISTENCE_CLASSES properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, - Entity1Impl.class.getName()); + Entity1Impl.class.getName()); context.config = properties; Configuration test2 = context.getHibernateConfiguration(); @@ -341,7 +360,7 @@ // use property TOPIA_PERSISTENCE_PROPERTIES_FILE to add default // properties from file properties.setProperty(TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE, - resourcesDir + File.separator + "TopiaContextImpl.properties"); + resourcesDir + File.separator + "TopiaContextImpl.properties"); context.config = properties; Configuration test3 = context.getHibernateConfiguration(); @@ -351,6 +370,103 @@ // Note : maybe add a test to load classes from services } + + @Test + public void replicateEntity() throws Exception { + + Properties configSource = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "replicateSource"); + + Properties configTarget = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "replicateTarget"); + + + TopiaContext contextSource = null; + TopiaContext contextTarget = null; + + try { + contextSource = TopiaContextFactory.getContext(configSource); + contextTarget = TopiaContextFactory.getContext(configTarget); + + TopiaContext txSource; + TopiaContext txTarget; + PersonDAO daoSource, daoTarget; + PetDAO petDAOSource, petDAOTarget; + Person personSource, personTarget; + Pet petSource, petTarget; + + txSource = contextSource.beginTransaction(); + daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); + petDAOSource = TopiaTestDAOHelper.getPetDAO(txSource); + + personSource = daoSource.create(Person.PROPERTY_FIRSTNAME, " firstName", + Person.PROPERTY_NAME, " name" + ); + + petSource = petDAOSource.create(Pet.PROPERTY_NAME, "name", + Pet.PROPERTY_TYPE, "type", + Pet.PROPERTY_PERSON, personSource + ); + + personSource.addPet(petSource); + + txSource.commitTransaction(); + + daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); + + personSource = daoSource.findByTopiaId(personSource.getTopiaId()); + Assert.assertNotNull(personSource); + + petSource = petDAOSource.findByTopiaId(petSource.getTopiaId()); + Assert.assertNotNull(petSource); + Assert.assertEquals(1, personSource.sizePet()); + Assert.assertEquals(petSource, personSource.getPet().iterator().next()); + + txTarget = contextTarget.beginTransaction(); + + txSource.replicateEntity(txTarget, petSource); + txSource.replicateEntity(txTarget, personSource); + + txTarget.commitTransaction(); + + daoTarget = TopiaTestDAOHelper.getPersonDAO(txTarget); + petDAOTarget = TopiaTestDAOHelper.getPetDAO(txTarget); + + personTarget = daoTarget.findByTopiaId(personSource.getTopiaId()); + Assert.assertNotNull(personTarget); + Assert.assertEquals(personSource, personTarget); + Assert.assertEquals(1, personTarget.sizePet()); + + petTarget = petDAOTarget.findByTopiaId(petSource.getTopiaId()); + Assert.assertNotNull(petTarget); + Assert.assertEquals(petSource, petTarget); + + Assert.assertEquals(petTarget, personTarget.getPet().iterator().next()); + + + } finally { + closeDb(contextSource); + closeDb(contextTarget); + } + + } + + protected static void closeDb(TopiaContext contextSource) { + if (contextSource != null && !contextSource.isClosed()) + try { + contextSource.clear(false); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Could not close db " + contextSource, e); + } + } + } + + // // @Test // public void testGetHibernateConfiguration() throws Exception { @@ -408,9 +524,6 @@ // public void testExportXML() throws Exception { // } // -// @Test -// public void testReplicate() throws Exception { -// } // // @Test // public void testReplicateEntity() throws Exception { Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -77,9 +77,10 @@ File testBasedir = TestHelper.getTestBasedir(TopiaTestCase.class); - config = TestHelper.initTopiaContextConfiguration(testBasedir, - "/TopiaContextImpl.properties", - "TopiaTestCaseDb"); + config = TestHelper.initTopiaContextConfiguration( + testBasedir, + "/TopiaContextImpl.properties", + "TopiaTestCaseDb"); // config = new Properties(); // config.setProperty("topia.persistence.classes", TopiaTestDAOHelper.getImplementationClassesAsString()); // @@ -95,8 +96,6 @@ public static void after() throws TopiaException { // destroy database context.clear(false); - - // TODO directory target/TopiaTestCase is not deleted } /** Create base with schema created. */ Modified: branches/topia-2.6.x/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- branches/topia-2.6.x/topia-service-migration/src/license/THIRD-PARTY.properties 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-migration/src/license/THIRD-PARTY.properties 2011-06-03 14:27:35 UTC (rev 2297) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:41 CET 2010 +#Fri Jun 03 13:51: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 Modified: branches/topia-2.6.x/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- branches/topia-2.6.x/topia-service-replication/src/license/THIRD-PARTY.properties 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-replication/src/license/THIRD-PARTY.properties 2011-06-03 14:27:35 UTC (rev 2297) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:43:27 CET 2010 +#Fri Jun 03 13:50:38 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: branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java =================================================================== --- branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -75,7 +75,9 @@ * removed in version 2.6 and never replaced */ @Deprecated - void register(ReplicationModel model, ReplicationNode ownerNode, ReplicationOperationPhase phase, + void register(ReplicationModel model, + ReplicationNode ownerNode, + ReplicationOperationPhase phase, Object... parameters) throws UnsupportedOperationException; @@ -91,8 +93,10 @@ * @param entities la liste des entités à traiter * @throws Exception pour toute erreur */ - void run(TopiaReplicationContext replicationContext, ReplicationOperationDef operationDef, - TopiaContextImplementor srcCtxt, TopiaContextImplementor dstCtxt, List<? extends TopiaEntity> entities) - throws Exception; + void run(TopiaReplicationContext replicationContext, + ReplicationOperationDef operationDef, + TopiaContextImplementor srcCtxt, + TopiaContextImplementor dstCtxt, + List<? extends TopiaEntity> entities) throws Exception; } Modified: branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -76,6 +76,12 @@ TopiaContextImplementor dstCtxt, List<? extends TopiaEntity> entities) throws TopiaException { + // fix http://nuiton.org/issues/1547 + //FIXME tchemit-2011-06-03 : while using hibernate 3.5.6, while duplicating entities we can have some associations in double sessions + //FIXME This hack works but it should be better to resolve the bug :( perharps this is not possible + //FIXME since we can not have a fresh empty hibernate session... + srcCtxt.getHibernate().clear(); + // replication des donnees vers la destination srcCtxt.replicateEntities(dstCtxt, entities); Modified: branches/topia-2.6.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- branches/topia-2.6.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2011-06-03 14:27:35 UTC (rev 2297) @@ -141,7 +141,7 @@ protected abstract Log getLog(); protected <E extends TopiaEntity> E update(E e) throws TopiaException { - return (E) ((TopiaContextImplementor) ctxt).findByTopiaId(e.getTopiaId()); + return (E) ctxt.findByTopiaId(e.getTopiaId()); } /** Modified: branches/topia-2.6.x/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- branches/topia-2.6.x/topia-service-security/src/license/THIRD-PARTY.properties 2011-06-03 13:42:37 UTC (rev 2296) +++ branches/topia-2.6.x/topia-service-security/src/license/THIRD-PARTY.properties 2011-06-03 14:27:35 UTC (rev 2297) @@ -1,24 +1,23 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - GNU Lesser General Public License -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:44:46 CET 2010 +#Fri Jun 03 13:51:11 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

1 0

r2296 - in branches/topia-2.6.x: . topia-service-replication
by tchemit＠users.nuiton.org June 3, 2011

June 3, 2011

Author: tchemit Date: 2011-06-03 15:42:37 +0200 (Fri, 03 Jun 2011) New Revision: 2296 Url: http://nuiton.org/repositories/revision/topia/2296 Log: put pom properties at the top + improve dependencies + use mavenpom 2.5.5 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2011-05-27 07:24:56 UTC (rev 2295) +++ branches/topia-2.6.x/pom.xml 2011-06-03 13:42:37 UTC (rev 2296) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -54,6 +54,33 @@  </modules> + <name>ToPIA</name> + <description> + Tools for Portable and Independent Architecture : + Framework de persistance et de distribution d'application. + </description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/topia</url> + + <properties> +  + <projectId>topia</projectId> + +  + <eugeneVersion>2.3.4</eugeneVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <processorPluginVersion>1.2.1</processorPluginVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> +  + <hibernateVersion>3.6.4.Final</hibernateVersion> + <sl4jVersion>1.6.1</sl4jVersion> + +  + <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + + </properties> + <dependencyManagement> <dependencies> @@ -95,13 +122,19 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> <scope>runtime</scope> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> + <version>3.12.1.GA</version> <scope>runtime</scope> </dependency> @@ -141,13 +174,7 @@    - <name>ToPIA</name> - <description> - Tools for Portable and Independent Architecture : - Framework de persistance et de distribution d'application. - </description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/topia</url> + <developers> @@ -263,25 +290,7 @@ <packaging>pom</packaging> - <properties> -  - <projectId>topia</projectId> -  - <eugeneVersion>2.3.4</eugeneVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> - <processorPluginVersion>1.2.1</processorPluginVersion> - <nuitonI18nVersion>2.4</nuitonI18nVersion> - <xmlrpcVersion>3.1.2</xmlrpcVersion> -  - <hibernateVersion>3.6.4.Final</hibernateVersion> - <sl4jVersion>1.6.1</sl4jVersion> - -  - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - - </properties> - <build> <pluginManagement> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2011-05-27 07:24:56 UTC (rev 2295) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2011-06-03 13:42:37 UTC (rev 2296) @@ -74,6 +74,11 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> +  <dependency> <groupId>com.h2database</groupId>

1 0