Author: athimel Date: 2012-05-22 17:38:56 +0200 (Tue, 22 May 2012) New Revision: 2494 Url: http://nuiton.org/repositories/revision/topia/2494 Log: Fix generation about naturalId Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-22 14:15:30 UTC (rev 2493) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-22 15:38:56 UTC (rev 2494) @@ -55,6 +55,8 @@ public static final String TAG_TABLE = "table"; + public static final String TAG_DISCRIMINATOR_COLUMN = "discriminator-column"; + public static final String TAG_UNIQUE_CONTRAINT = "unique-constraint"; public static final String TAG_COLUMN_NAME = "column-name"; @@ -253,6 +255,13 @@ }*/ } + // -- tag 'discriminator-column' + + addAttribute(xmlAttributes, ATTRIBUTE_LENGTH, "255"); +/*{<%=flushTag(TAG_DISCRIMINATOR_COLUMN, true, xmlAttributes)%> +}*/ + + /*{<%=closeTag(TAG_ENTITY)%> }*/ Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-22 15:38:56 UTC (rev 2494) @@ -0,0 +1,32 @@ +package org.nuiton.topia.tck.it; + +/** + * Class that contains the natural ids of NaturalizedEntity. + * TODO AThimel 22/05/2012 This has to be generated ? To discuss + * TODO AThimel 22/05/2012 Find a better name + * + * @author Arnaud Thimel <thimel@codelutin.com> + */ +public class naturalId { + + protected Integer naturalIdNotNull; + + protected String naturalIdNull; + + public Integer getNaturalIdNotNull() { + return naturalIdNotNull; + } + + public void setNaturalIdNotNull(Integer naturalIdNotNull) { + this.naturalIdNotNull = naturalIdNotNull; + } + + public String getNaturalIdNull() { + return naturalIdNull; + } + + public void setNaturalIdNull(String naturalIdNull) { + this.naturalIdNull = naturalIdNull; + } + +}