Index: topia2/src/java/org/codelutin/topia/persistence/TopiaDAO.java
diff -u topia2/src/java/org/codelutin/topia/persistence/TopiaDAO.java:1.8 topia2/src/java/org/codelutin/topia/persistence/TopiaDAO.java:1.9
--- topia2/src/java/org/codelutin/topia/persistence/TopiaDAO.java:1.8	Mon Sep  4 09:55:22 2006
+++ topia2/src/java/org/codelutin/topia/persistence/TopiaDAO.java	Thu Sep 28 15:46:10 2006
@@ -23,9 +23,9 @@
  * Created: 30 déc. 2005 03:00:57
  *
  * @author poussin
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  *
- * Last update: $Date: 2006/09/04 09:55:22 $
+ * Last update: $Date: 2006/09/28 15:46:10 $
  * by : $Author: ruchaud $
  */
 
@@ -38,10 +38,6 @@
 import org.codelutin.topia.TopiaException;
 import org.codelutin.topia.event.TopiaEntityListener;
 import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.hibernate.Criteria;
-import org.hibernate.FlushMode;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Projection;
 
 /**
  * @author poussin
@@ -218,59 +214,4 @@
     public abstract List<Entity> findAllContainsProperties(String propertyName, Collection values, Object... others)
     throws TopiaException;
 
-    /**
-     * Cherche en renvoie la premiere entite trouvee correspondant au criterion
-     * donne
-     */
-    public abstract Entity query(Criterion criterion) throws TopiaException;
-
-    /**
-     * Cherche en renvoie les entites trouvees correspondantes au criterion
-     * donne
-     */
-    public abstract List<Entity> queryAll(Criterion criterion) throws TopiaException;
-
-    /**
-     * Cherche en renvoie le premier objet trouve correspondant au criterion
-     * donne et apres projection
-     */
-    public abstract Object query(Projection projection, Criterion criterion) throws TopiaException;
-
-    /**
-     * Cherche en renvoie les objets trouves correspondants au criterion
-     * donne et apres projection
-     */
-    public abstract List queryAll(Projection projection, Criterion criterion) throws TopiaException;
-
-    /**
-     * Cherche en renvoie la projection demandee
-     */
-    public abstract Object project(Projection projection) throws TopiaException;
-
-    /**
-     * Cherche en renvoie les projection demandees
-     */
-    public abstract List projectAll(Projection projection) throws TopiaException;
-
-    /**
-     * Effectue une recherche de type 'like' sur tous les attributs 'likeable'
-     * de l'entite et renvoi le premier resultat.
-     * Si plusieurs valeurs sont passees, un or est effectue entre chaque champ
-     */
-    public abstract Entity like(Object ... values) throws TopiaException;
-
-    /**
-     * Effectue une recherche de type 'like' sur tous les attributs 'likeable'
-     * de l'entite.
-     * Si plusieurs valeurs sont passees, un or est effectue entre chaque champ
-     */
-    public abstract List<Entity> likeAll(Object ... values) throws TopiaException;
-
-    /**
-     * Renvoie un Criteria créé avec l'entityClass
-     * @param mode le FlushMode du Criteria
-     * @return le Criteria nouvellement créé
-     */
-    public abstract Criteria createCriteria(FlushMode mode) throws TopiaException;
-    
 } //TopiaDAO

Index: topia2/src/java/org/codelutin/topia/persistence/TopiaDAODelegator.java
diff -u topia2/src/java/org/codelutin/topia/persistence/TopiaDAODelegator.java:1.8 topia2/src/java/org/codelutin/topia/persistence/TopiaDAODelegator.java:1.9
--- topia2/src/java/org/codelutin/topia/persistence/TopiaDAODelegator.java:1.8	Mon Sep  4 09:55:22 2006
+++ topia2/src/java/org/codelutin/topia/persistence/TopiaDAODelegator.java	Thu Sep 28 15:46:10 2006
@@ -23,9 +23,9 @@
  * Created: 30 déc. 2005 22:28:48
  *
  * @author poussin
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  *
- * Last update: $Date: 2006/09/04 09:55:22 $
+ * Last update: $Date: 2006/09/28 15:46:10 $
  * by : $Author: ruchaud $
  */
 
@@ -38,10 +38,6 @@
 import org.codelutin.topia.TopiaException;
 import org.codelutin.topia.event.TopiaEntityListener;
 import org.codelutin.topia.framework.TopiaContextImplementor;
-import org.hibernate.Criteria;
-import org.hibernate.FlushMode;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Projection;
 
 
 /**
@@ -240,49 +236,4 @@
         return getParentDAO().findAllContainsProperties(propertyName, values, others);
     }
 
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#like(java.lang.Object)
-     */
-    public Entity like(Object ... values) throws TopiaException {
-        return getParentDAO().like(values);
-    }
-
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#likeAll(java.lang.Object)
-     */
-    public List<Entity> likeAll(Object ... values) throws TopiaException {
-        return getParentDAO().likeAll(values);
-    }
-
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion)
-     */
-    public Entity query(Criterion criterion) throws TopiaException {
-        return getParentDAO().query(criterion);
-    }
-
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion)
-     */
-    public List<Entity> queryAll(Criterion criterion) throws TopiaException {
-        return getParentDAO().queryAll(criterion);
-    }
-
-    public Object query(Projection projection, Criterion criterion) throws TopiaException {
-        return getParentDAO().query(projection, criterion);
-    }
-    public List queryAll(Projection projection, Criterion criterion) throws TopiaException {
-        return getParentDAO().queryAll(projection, criterion);
-    }
-    public Object project(Projection projection) throws TopiaException {
-        return getParentDAO().project(projection);
-    }
-    public List projectAll(Projection projection) throws TopiaException {
-        return getParentDAO().projectAll(projection);
-    }
-    public Criteria createCriteria(FlushMode mode) throws TopiaException {
-        return getParentDAO().createCriteria(mode);
-    }
-
-
 } //TopiaDAODelegator

Index: topia2/src/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java
diff -u topia2/src/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java:1.12 topia2/src/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java:1.13
--- topia2/src/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java:1.12	Wed Aug 30 10:42:36 2006
+++ topia2/src/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java	Thu Sep 28 15:46:10 2006
@@ -23,10 +23,10 @@
  * Created: 31 déc. 2005 13:10:34
  *
  * @author poussin
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
  *
- * Last update: $Date: 2006/08/30 10:42:36 $
- * by : $Author: thimel $
+ * Last update: $Date: 2006/09/28 15:46:10 $
+ * by : $Author: ruchaud $
  */
 
 package org.codelutin.topia.persistence;
@@ -614,22 +614,7 @@
         return result;
     }
 
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#like(java.lang.Object)
-     */
-    public Entity like(Object ... values) throws TopiaException {
-        Criterion criterion = computeCriterions(values);
-        return query(criterion);
-    }
-
-    /* (non-Javadoc)
-     * @see org.codelutin.topia.persistence.TopiaDAO#likeAll(java.lang.Object)
-     */
-    public List<Entity> likeAll(Object ... values) throws TopiaException {
-        Criterion criterion = computeCriterions(values);
-        return queryAll(criterion);
-    }
-
+    @Deprecated
     private Criterion computeCriterions(Object ... values) {
         if (values == null) {
             return null;
@@ -641,6 +626,7 @@
         return criterion;
     }
 
+    @Deprecated
     private Criterion computeCriterion(Object value) {
         Criterion criterion = null;
         SearchFields fields = entityClass.getAnnotation(SearchFields.class);
@@ -693,6 +679,7 @@
         return criterion;
     }
 
+    @Deprecated
     private Criterion or(Criterion crit1, Criterion crit2) {
         if (crit1 == null) {
             return crit2;