Index: topia-security/src/java/org/codelutin/topia/security/TopiaSecurityManagerImpl.java
diff -u topia-security/src/java/org/codelutin/topia/security/TopiaSecurityManagerImpl.java:1.12 topia-security/src/java/org/codelutin/topia/security/TopiaSecurityManagerImpl.java:1.13
--- topia-security/src/java/org/codelutin/topia/security/TopiaSecurityManagerImpl.java:1.12	Mon Oct 16 14:28:00 2006
+++ topia-security/src/java/org/codelutin/topia/security/TopiaSecurityManagerImpl.java	Tue Oct 17 13:50:40 2006
@@ -38,6 +38,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.topia.TopiaContext;
 import org.codelutin.topia.TopiaException;
+import org.codelutin.topia.TopiaServiceDAOHelper;
 import org.codelutin.topia.framework.TopiaContextImplementor;
 import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO;
 import org.codelutin.topia.security.entities.authorization.TopiaAuthorization;
@@ -62,6 +63,7 @@
 /**
  * Implantation du manager pour la sécurité. C'est le point d'accès à l'ensemble
  * des fonctionnalités de la sécurité.
+ * 
  * @author ruchaud
  */
 public class TopiaSecurityManagerImpl implements TopiaSecurityManager {
@@ -93,6 +95,21 @@
     public TopiaSecurityManagerImpl() {
     }
 
+    /* (non-Javadoc)
+     * @see org.codelutin.topia.framework.TopiaService#getServiceName()
+     */
+    public String getServiceName() {        
+        return TopiaSecurityHelper.SERVICE_NAME;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.codelutin.topia.security.TopiaSecurityManager#getPersistenceClasses()
+     */
+    public String getPersistenceClasses() {
+        return TOPIA_SECURITY_PERSISTENCE_CLASSES;
+    }
+
     /*
      * (non-Javadoc)
      * @see org.codelutin.topia.security.TopiaSecurityManager#init()
@@ -107,7 +124,7 @@
         rootContext.addTopiaEntityListener(propertyListener);
         
         policy.installPolicy();
-        Configuration.setConfiguration(new TopiaConfiguration("topia", this));
+        Configuration.setConfiguration(new TopiaConfiguration("topia", this));        
     }
 
     /*
@@ -121,21 +138,13 @@
         return securityContext;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.codelutin.topia.security.TopiaSecurityManager#getPersistenceClasses()
-     */
-    public String getPersistenceClasses() {
-        return TOPIA_SECURITY_PERSISTENCE_CLASSES;
-    }
-
     /**
      * Permet de récupérer le DAO dans le contexte de sécurité.
      * @return DAO du TopiaUser
      */
     public TopiaUserDAO getTopiaUserDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaUserDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaUserDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaUserDAO impossible", te);
         }
@@ -148,7 +157,7 @@
      */
     public TopiaGroupDAO getTopiaGroupDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaGroupDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaGroupDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaGroupDAO impossible", te);
         }
@@ -161,7 +170,7 @@
      */
     public TopiaAuthorizationDAO getTopiaAuthorizationDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaAuthorizationDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaAuthorizationDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaAuthorizationDAO impossible", te);
         }
@@ -174,7 +183,7 @@
      */
     public TopiaEntityAuthorizationDAO getTopiaEntityAuthorizationDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaEntityAuthorizationDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaEntityAuthorizationDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaEntityAuthorizationDAO impossible", te);
         }
@@ -187,7 +196,7 @@
      */
     public TopiaIdLinkDAO getTopiaIdLinkDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaIdLinkDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaIdLinkDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaLinkAuthorizationDAO impossible", te);
         }
@@ -200,7 +209,7 @@
      */
     public TopiaAssociationAuthorizationDAO getTopiaAssociationAuthorizationDAO() {
         try {
-            return TopiaSecurityDAOHelper.getTopiaAssociationAuthorizationDAO(getSecurityContext());
+            return TopiaServiceDAOHelper.getTopiaAssociationAuthorizationDAO(getSecurityContext());
         } catch (TopiaException te) {
             log.error("Recuperation du TopiaAssociationAuthorizationDAO impossible", te);
         }