Index: topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java
diff -u topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java:1.2 topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java:1.3
--- topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java:1.2	Fri Sep 29 15:36:59 2006
+++ topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java	Mon Oct 16 14:15:46 2006
@@ -35,8 +35,8 @@
 import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
 import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization;
 import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO;
-import org.codelutin.topia.security.entities.authorization.TopiaLinkAuthorization;
-import org.codelutin.topia.security.entities.authorization.TopiaLinkAuthorizationDAO;
+import org.codelutin.topia.security.entities.authorization.TopiaIdLink;
+import org.codelutin.topia.security.entities.authorization.TopiaIdLinkDAO;
 import org.codelutin.topia.security.entities.user.TopiaGroup;
 import org.codelutin.topia.security.entities.user.TopiaGroupDAO;
 import org.codelutin.topia.security.entities.user.TopiaUser;
@@ -86,7 +86,7 @@
         TopiaUserDAO topiaUserDAO = TopiaSecurityDAOHelper.getTopiaUserDAO(childContext);
         TopiaGroupDAO topiaGroupDAO = TopiaSecurityDAOHelper.getTopiaGroupDAO(childContext);
         TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaEntityAuthorizationDAO(childContext);
-        TopiaLinkAuthorizationDAO topiaLinkAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaLinkAuthorizationDAO(childContext);
+        TopiaIdLinkDAO linkDAO = TopiaSecurityDAOHelper.getTopiaIdLinkDAO(childContext);
         TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaAssociationAuthorizationDAO(childContext);
         
         /* Création d'un admin */
@@ -181,10 +181,10 @@
         childContext.commitTransaction();
         
         /* Création d'une autorisation Link */
-        TopiaLinkAuthorization linkAuthorization = topiaLinkAuthorizationDAO.create();
-        linkAuthorization.setId(mylene.getTopiaId());
-        linkAuthorization.setTopiaAuthorization(authorizationForThimel);
-        linkAuthorization.update();
+        TopiaIdLink link = linkDAO.create();
+        link.setReplace(mylene.getTopiaId());
+        link.setBy(jacques.getTopiaId());
+        link.update();
         childContext.commitTransaction();
         
         /* Création d'une authorisation association */

Index: topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java
diff -u topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java:1.11 topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java:1.12
--- topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java:1.11	Tue Oct  3 08:33:50 2006
+++ topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java	Mon Oct 16 14:15:46 2006
@@ -36,12 +36,13 @@
 import org.codelutin.topia.TopiaContextFactory;
 import org.codelutin.topia.security.TopiaSecurityDAOHelper;
 import org.codelutin.topia.security.TopiaSecurityManager;
+import org.codelutin.topia.security.TopiaSecurityManagerImpl;
 import org.codelutin.topia.security.jaas.TopiaCallbackHandler;
 import org.codelutin.topia.security.test.entities.Person;
 import org.codelutin.topia.security.test.entities.PersonDAO;
 import org.codelutin.topia.security.test.entities.Pet;
 import org.codelutin.topia.security.test.entities.PetDAO;
-import org.codelutin.topia.security.util.TopiaSecurityFilterList;
+import org.codelutin.topia.security.util.TopiaSecurityFactoryFilter;
 
 /**
  * Tests unitaires.
@@ -52,9 +53,10 @@
 
     protected TopiaContext context = TopiaContextFactory.getContext(getProperties());
     protected TopiaSecurityManager securityManager = context.getSecurityManager();
+    protected TopiaSecurityFactoryFilter factoryFilter = new TopiaSecurityFactoryFilter((TopiaSecurityManagerImpl) securityManager);
     
     protected static String entitiesList = "org.codelutin.topia.security.test.entities.PersonImpl,org.codelutin.topia.security.test.entities.PetImpl";
-
+    
     protected static Properties getProperties() {
         Properties config = new Properties();
         //config.setProperty("hibernate.hbm2ddl.auto", "create");
@@ -98,7 +100,7 @@
 
         loginContext.logout();
     }
-
+    
     public void testAuthorizationThimel() throws Exception {
         /* Authentification de l'utilisateur Thimel */
         LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler(
@@ -115,20 +117,20 @@
                 PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
-                TopiaSecurityFilterList<Person> personsLOAD = new TopiaSecurityFilterList<Person>(findAllPerson, LOAD);
+                List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
                 assertEquals(2, personsLOAD.size());
                 
-                TopiaSecurityFilterList<Person> personsUPDATE = new TopiaSecurityFilterList<Person>(findAllPerson, UPDATE);
+                List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE);
                 assertEquals(0, personsUPDATE.size());
 
                 /* Annimaux */
                 PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
-                TopiaSecurityFilterList<Pet> petLOAD = new TopiaSecurityFilterList<Pet>(findAllPet, LOAD);
+                List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
                 assertEquals(0, petLOAD.size());
                 
-                TopiaSecurityFilterList<Pet> petUPDATE = new TopiaSecurityFilterList<Pet>(findAllPet, UPDATE);
+                List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE);
                 assertEquals(0, petUPDATE.size());
 
                 return null;
@@ -154,20 +156,20 @@
                 PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
-                TopiaSecurityFilterList<Person> personsLOAD = new TopiaSecurityFilterList<Person>(findAllPerson, LOAD);
+                List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
                 assertEquals(3, personsLOAD.size());
                 
-                TopiaSecurityFilterList<Person> personsUPDATE = new TopiaSecurityFilterList<Person>(findAllPerson, UPDATE);
+                List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE);
                 assertEquals(0, personsUPDATE.size());
 
                 /* Annimaux */
                 PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
-                TopiaSecurityFilterList<Pet> petLOAD = new TopiaSecurityFilterList<Pet>(findAllPet, LOAD);
+                List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
                 assertEquals(2, petLOAD.size());
                 
-                TopiaSecurityFilterList<Pet> petUPDATE = new TopiaSecurityFilterList<Pet>(findAllPet, UPDATE);
+                List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE);
                 assertEquals(1, petUPDATE.size());
 
                 return null;
@@ -193,20 +195,20 @@
                 PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
-                TopiaSecurityFilterList<Person> personsLOAD = new TopiaSecurityFilterList<Person>(findAllPerson, LOAD);
+                List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
                 assertEquals(3, personsLOAD.size());
                 
-                TopiaSecurityFilterList<Person> personsUPDATE = new TopiaSecurityFilterList<Person>(findAllPerson, UPDATE);
+                List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE);
                 assertEquals(3, personsUPDATE.size());
 
                 /* Annimaux */
                 PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
-                TopiaSecurityFilterList<Pet> petLOAD = new TopiaSecurityFilterList<Pet>(findAllPet, LOAD);
+                List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
                 assertEquals(3, petLOAD.size());
                 
-                TopiaSecurityFilterList<Pet> petUPDATE = new TopiaSecurityFilterList<Pet>(findAllPet, UPDATE);
+                List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE);
                 assertEquals(3, petUPDATE.size());
 
                 return null;