Index: topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.21 topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.22
--- topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java:1.21	Thu Apr 27 08:28:40 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java	Wed May 10 13:38:32 2006
@@ -24,9 +24,9 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.21 $
+* @version $Revision: 1.22 $
 *
-* Mise a jour: $Date: 2006/04/27 08:28:40 $
+* Mise a jour: $Date: 2006/05/10 13:38:32 $
 * par : $Author: thimel $
 */
 
@@ -97,12 +97,12 @@
             ObjectModelClass superClass = (ObjectModelClass)clazz.getSuperclasses().iterator().next(); 
             String superClassname = superClass.getQualifiedName();
             if (log.isDebugEnabled()) {log.debug("superClass for " + clazz.getQualifiedName() + " is " + superClassname);}
-/*{    <union-subclass name="<%=GeneratorUtil.getDOType(clazz, model)%>" extends="<%=GeneratorUtil.getDOType(superClassname, model)%>" table="<%=GeneratorUtil.getDBName(clazz)%>" abstract="<%=(clazz.isAbstract()?"true":"false")%>">
+/*{    <union-subclass name="<%=GeneratorUtil.getDOType(clazz, model)%>" extends="<%=GeneratorUtil.getDOType(superClassname, model)%>" table="<%=GeneratorUtil.getDBName(clazz)%>" node="<%=GeneratorUtil.getDOType(clazz, model)%>" abstract="<%=(clazz.isAbstract()?"true":"false")%>">
 }*/        
         } else {
-/*{    <class name="<%=GeneratorUtil.getDOType(clazz, model)%>" table="<%=GeneratorUtil.getDBName(clazz)%>" abstract="<%=(clazz.isAbstract()?"true":"false")%>">
+/*{    <class name="<%=GeneratorUtil.getDOType(clazz, model)%>" table="<%=GeneratorUtil.getDBName(clazz)%>" node="<%=GeneratorUtil.getDOType(clazz, model)%>" abstract="<%=(clazz.isAbstract()?"true":"false")%>">
         <id name="topiaId" length="255" node="@topiaId">
-            <!-- on utilise des TopiaId maintenant  <generator class="uuid.hex"/> -->
+            <!-- on utilise des TopiaId maintenant <generator class="uuid.hex"/> -->
         </id>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
         <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
@@ -153,7 +153,7 @@
 // } */
 //                    } else {
                     
-/*{        <many-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>" column="<%=GeneratorUtil.getDBName(attr)%>"/>
+/*{        <many-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>" column="<%=GeneratorUtil.getDBName(attr)%>" node="<%=getName(attr, true)%>/@topiaId" embed-xml="false"/>
 }*/
 //                    }
                     //Ne sert plus grâce à l'utilisation de la navigabilité
@@ -230,7 +230,7 @@
 /*{        <property name="<%=getName(attr)%>" type="<%=getType(attr)%>" }*/
         String[] columnNames = this.columnNamesMap.get(type);
         if (columnNames == null || columnNames.length == 0) {
-/*{column="<%=GeneratorUtil.getDBName(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%>/>
+/*{column="<%=GeneratorUtil.getDBName(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%> node="<%=getName(attr)%>"/>
 }*/
         } else {
 /*{>
@@ -246,9 +246,10 @@
     }
 
     protected void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr) throws IOException {
-        boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model);
-/*{        <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%>/>
-}*/
+        generateHibernateManyToOne(output, attr, true);
+//        boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model);
+/// *{        <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" embed-xml="false"/>
+//} */
     }
 
     protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr) throws IOException {
@@ -262,16 +263,16 @@
             orderBy = "order-by=\"" + orderBy + "\"";
         }
         if (!isIndexed) {
-/*{        <bag name="<%=getName(attr)%>" <%=orderBy%> <%=((!isInverse)?"":"inverse=\"true\"")%> lazy="true" <%=((attr.isComposite() || attr.hasAssociationClass())?"cascade=\"delete,delete-orphan\"":"")%>>
+/*{        <bag name="<%=getName(attr)%>" <%=orderBy%> <%=((!isInverse)?"":"inverse=\"true\"")%> lazy="true" <%=((attr.isComposite() || attr.hasAssociationClass())?"cascade=\"delete,delete-orphan\"":"")%> node="<%=getName(attr)%>" embed-xml="true">
             <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/>
-            <one-to-many class="<%=getType(attr)%>"/>
+            <one-to-many class="<%=getType(attr)%>" node="topiaId" embed-xml="false"/>
         </bag>
 }*/
         }else {
-/*{        <list name="<%=getName(attr)%>"<%=((!isInverse)?"":" inverse=\"true\"")%> lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
+/*{        <list name="<%=getName(attr)%>"<%=((!isInverse)?"":" inverse=\"true\"")%> lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%> node="<%=getName(attr)%>" embed-xml="false">
         <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/>
         <index/>
-            <one-to-many class="<%=getType(attr)%>"/>
+        <one-to-many class="<%=getType(attr)%>" node="topiaId" embed-xml="false"/>
     </list>
 }*/
         }
@@ -279,21 +280,34 @@
 
     protected void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException {
         boolean isIndexed = attr.isIndexed();
-/*{        <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>">
+/*{        <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>" node="<%=getName(attr)%>" embed-xml="true">
             <key column="OWNER"/>
 }*/
         if (isIndexed) {
 /*{        <index/>
 }*/
         }
-/*{            <element type="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"/>
+/*{            <element type="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>" node="id"/>
         </<%=(isIndexed?"list":"bag")%>>
 }*/
     }
 
     protected void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr) throws IOException {
-        boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model);
-/*{        <many-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%>/>
+        generateHibernateManyToOne(output, attr, false);
+    }
+
+    protected void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr, boolean isUnique) throws IOException {
+/*{        <many-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"}*/
+        if (attr.isComposite() || attr.hasAssociationClass()) {
+/*{ cascade="delete"}*/
+        }
+        if (hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model)) {
+/*{ access="field"}*/
+        }
+        if (isUnique) {
+/*{ unique="true"}*/
+        }
+/*{ node="<%=getName(attr)%>/@topiaId" embed-xml="false"/>
 }*/
     }
 
@@ -304,14 +318,14 @@
         // Note(poussin) 20060306: pour moi il n'y a pas jamais d'inverse pour many-to-many
         // car on est dans une table intermediaire specifique.<%=((!Util.isFirstAttribute(attr))?"inverse=\"true\" ":"")%>
         boolean isIndexed = attr.isIndexed();
-/*{        <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%>>
+/*{        <<%=(isIndexed?"list":"bag")%> name="<%=getName(attr)%>" table="<%=getManyToManyTableName(attr)%>" lazy="true"<%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete,delete-orphan\"":"")%> node="<%=getName(attr)%>" embed-xml="true">
             <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/>
 }*/
         if (isIndexed) {
 /*{        <index/>
 }*/
         }
-/*{            <many-to-many class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>"/>
+/*{            <many-to-many class="<%=getType(attr)%>" column="<%=GeneratorUtil.getDBName(attr)%>" node="topiaId"/>
         </<%=(isIndexed?"list":"bag")%>>
 }*/
     }