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.3 topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java:1.4
--- topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java:1.3	Mon Oct 16 14:15:46 2006
+++ topia-security/src/test/org/codelutin/topia/security/test/ScriptInitialisationDataBase.java	Tue Oct 17 13:50:40 2006
@@ -30,7 +30,7 @@
 import org.codelutin.topia.TopiaContext;
 import org.codelutin.topia.TopiaContextFactory;
 import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.security.TopiaSecurityDAOHelper;
+import org.codelutin.topia.TopiaServiceDAOHelper;
 import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization;
 import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
 import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization;
@@ -80,14 +80,14 @@
         TopiaContext childContext = context.beginTransaction();
         
         /* DAOs */
-        PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
-        PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
+        PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext);
+        PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext);
         
-        TopiaUserDAO topiaUserDAO = TopiaSecurityDAOHelper.getTopiaUserDAO(childContext);
-        TopiaGroupDAO topiaGroupDAO = TopiaSecurityDAOHelper.getTopiaGroupDAO(childContext);
-        TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaEntityAuthorizationDAO(childContext);
-        TopiaIdLinkDAO linkDAO = TopiaSecurityDAOHelper.getTopiaIdLinkDAO(childContext);
-        TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaAssociationAuthorizationDAO(childContext);
+        TopiaUserDAO topiaUserDAO = TopiaServiceDAOHelper.getTopiaUserDAO(childContext);
+        TopiaGroupDAO topiaGroupDAO = TopiaServiceDAOHelper.getTopiaGroupDAO(childContext);
+        TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaServiceDAOHelper.getTopiaEntityAuthorizationDAO(childContext);
+        TopiaIdLinkDAO linkDAO = TopiaServiceDAOHelper.getTopiaIdLinkDAO(childContext);
+        TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaServiceDAOHelper.getTopiaAssociationAuthorizationDAO(childContext);
         
         /* Création d'un admin */
         TopiaUser admin = topiaUserDAO.create();

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.12 topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java:1.13
--- topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java:1.12	Mon Oct 16 14:15:46 2006
+++ topia-security/src/test/org/codelutin/topia/security/test/TopiaSecurityTest.java	Tue Oct 17 13:50:40 2006
@@ -34,7 +34,9 @@
 
 import org.codelutin.topia.TopiaContext;
 import org.codelutin.topia.TopiaContextFactory;
-import org.codelutin.topia.security.TopiaSecurityDAOHelper;
+import org.codelutin.topia.TopiaNotFoundException;
+import org.codelutin.topia.TopiaServiceDAOHelper;
+import org.codelutin.topia.security.TopiaSecurityHelper;
 import org.codelutin.topia.security.TopiaSecurityManager;
 import org.codelutin.topia.security.TopiaSecurityManagerImpl;
 import org.codelutin.topia.security.jaas.TopiaCallbackHandler;
@@ -52,10 +54,19 @@
 public class TopiaSecurityTest extends TestCase {
 
     protected TopiaContext context = TopiaContextFactory.getContext(getProperties());
-    protected TopiaSecurityManager securityManager = context.getSecurityManager();
+    protected TopiaSecurityManager securityManager = TopiaSecurityHelper.get(context);
     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 String entitiesList =
+        "org.codelutin.topia.security.test.entities.PersonImpl," +
+        "org.codelutin.topia.security.test.entities.PetImpl";
+
+    
+    /**
+     * 
+     */
+    public TopiaSecurityTest() throws TopiaNotFoundException {     
+    }
     
     protected static Properties getProperties() {
         Properties config = new Properties();
@@ -114,7 +125,7 @@
                 TopiaContext childContext = context.beginTransaction();
                 
                 /* Personnes */
-                PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
+                PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
                 List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
@@ -124,7 +135,7 @@
                 assertEquals(0, personsUPDATE.size());
 
                 /* Annimaux */
-                PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
+                PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
                 List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
@@ -153,7 +164,7 @@
                 TopiaContext childContext = context.beginTransaction();
                 
                 /* Personnes */
-                PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
+                PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
                 List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
@@ -163,7 +174,7 @@
                 assertEquals(0, personsUPDATE.size());
 
                 /* Annimaux */
-                PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
+                PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
                 List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
@@ -192,7 +203,7 @@
                 TopiaContext childContext = context.beginTransaction();
                 
                 /* Personnes */
-                PersonDAO personDAO = TopiaSecurityDAOHelper.getPersonDAO(childContext);
+                PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext);
                 List<Person> findAllPerson = personDAO.findAll();
                 
                 List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD);
@@ -202,7 +213,7 @@
                 assertEquals(3, personsUPDATE.size());
 
                 /* Annimaux */
-                PetDAO petDAO = TopiaSecurityDAOHelper.getPetDAO(childContext);
+                PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext);
                 List<Pet> findAllPet = petDAO.findAll();
                 
                 List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD);
@@ -217,4 +228,5 @@
 
         loginContext.logout();
     }
+
 }