Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.41 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.42 --- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.41 Fri Nov 23 10:57:19 2007 +++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Fri Nov 23 12:00:05 2007 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.41 $ +* @version $Revision: 1.42 $ * -* Mise a jour: $Date: 2007-11-23 10:57:19 $ +* Mise a jour: $Date: 2007-11-23 12:00:05 $ * par : $Author: chatellier $ */ @@ -321,8 +321,11 @@ String cascade = ""; if (attr.isComposite() || attr.hasAssociationClass()) { cascade += "cascade=\"all,delete-orphan\""; + + // 20071123 : dans le cas d'une relation composite, jamais d'inverse + isInverse = false; } - cascade += ""; + //cascade += ""; String lazy = "lazy=\""; if (attr.getTagValue("lazy") != null){ @@ -334,13 +337,13 @@ lazy += "\""; if (!isIndexed) { -/*{ <%=((isInverse)?"":"inverse=\"true\"")%> <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="true"> +/*{ <%=((!isInverse)?"":"inverse=\"true\"")%> <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="true"> }*/ }else { -/*{ <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="false"> +/*{ <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="false"> @@ -379,7 +382,7 @@ /*{ access="field"}*/ } if (isUnique) { -/*{ unique="true" not-null="true"}*/ +/*{ unique="true"}*/ } /*{ node="<%=getName(attr)%>/@topiaId" embed-xml="false"}*/