Index: topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.10 topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.11
--- topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.10	Thu Nov  8 20:14:59 2007
+++ topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java	Tue Jul 29 14:41:02 2008
@@ -25,9 +25,9 @@
  * 
  * @author Arnaud Thimel <thimel@codelutin.com>
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  * 
- * Mise a jour: $Date: 2007-11-08 20:14:59 $ par : $Author: thimel $
+ * Mise a jour: $Date: 2008-07-29 14:41:02 $ par : $Author: tchemit $
  */
 
 package org.codelutin.topia.generator;
@@ -94,20 +94,20 @@
 }*/
             }
         }
-        log.info("Full entities list : " + entitiesList);
-/*{
+//        log.info("Full entities list : " + entitiesList);
+/*
     public static final Class [] entitiesClasses = new Class []{
-}*/
-        for (Iterator i=model.getClasses().iterator(); i.hasNext();) {
-            ObjectModelClass clazz = (ObjectModelClass)i.next();
-            if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){
-/*{        <%=GeneratorUtil.getDOType(clazz, model)%>.class,
-}*/
-            }
-        }
-/*{    };
+    */
+        //for (Iterator i=model.getClasses().iterator(); i.hasNext();) {
+        //    ObjectModelClass clazz = (ObjectModelClass)i.next();
+        //    if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){
+/*        <%=GeneratorUtil.getDOType(clazz, model)%>.class,
+*/
+        //    }
+        //}
+//    };
         
-    /**
+/*{    /**
     *)
     protected <%=model.getName()%>DAOHelper() {
     }

Index: topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.20 topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.21
--- topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.20	Thu Dec 13 16:49:53 2007
+++ topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java	Tue Jul 29 14:41:02 2008
@@ -24,10 +24,10 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.20 $
+* @version $Revision: 1.21 $
 *
-* Mise a jour: $Date: 2007-12-13 16:49:53 $
-* par : $Author: ruchaud $
+* Mise a jour: $Date: 2008-07-29 14:41:02 $
+* par : $Author: tchemit $
 */
 
 package org.codelutin.topia.generator;
@@ -139,6 +139,7 @@
 
     public void delete(E entity) throws TopiaException {
 }*/
+        String providerFQN = getProperty("defaultPackage") + "." + model.getName() + "EntityProvider.getImpl";
         for (ObjectModelAttribute attr : clazz.getAttributes()) {
             ObjectModelAttribute reverse = attr.getReverseAttribute();
             if (!attr.hasAssociationClass() && reverse != null && reverse.isNavigable() 
@@ -153,7 +154,7 @@
                     "from <%=GeneratorUtil.getDBName(attr.getClassifier())%> main, <%=GeneratorUtil.getManyToManyTableName(attr)%> secondary " +
                     "where main.topiaid=secondary.<%=GeneratorUtil.getDBName(attr)%>" +
                     " and secondary.<%=GeneratorUtil.getReverseDBName(attr)%>='"+entity.getTopiaId()+"'")
-                    .addEntity("main", <%=attr.getType()%>Impl.class).list();
+                    .addEntity("main", <%=providerFQN%>(<%=attr.getType()%>.class)).list();
             for (<%=attr.getType()%> item : list) {
                 item.remove<%=Util.capitalize(attr.getReverseAttributeName())%>(entity);
             }