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

r2311 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 07 Jul '11

07 Jul '11

Author: tchemit Date: 2011-07-07 19:38:36 +0200 (Thu, 07 Jul 2011) New Revision: 2311 Url: http://nuiton.org/repositories/revision/topia/2311 Log: Evolution #1625: Add TopiaTransactionAware Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java 2011-07-07 17:38:36 UTC (rev 2311) @@ -0,0 +1,58 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin, Tony Chemit + * %% + * 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.topia.framework; + +import org.nuiton.topia.TopiaContext; + +/** + * Use this contract on a object which use a {@code TopiaContext} as a + * transaction. + * <p/> + * The method {@link #getTransaction()} returns the internal transaction used. + * <p/> + * the method {@link #setTransaction(TopiaContext)} put the internal + * transaction. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.1 + */ +public interface TopiaTransactionAware { + + /** + * Obtains the internal transaction. + * <p/> + * If no transaction was opened, can return the {@code null} object. + * + * @return the current transaction (can be null or closed...). + */ + TopiaContext getTransaction(); + + /** + * Put in the instance, the given transaction. + * + * @param transaction the transaction to push + */ + void setTransaction(TopiaContext transaction); +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2310 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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 21 Jun '11

21 Jun '11

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 21 Jun '11

21 Jun '11

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 21 Jun '11

21 Jun '11

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 21 Jun '11

21 Jun '11

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