Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java
diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java:1.3 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java:1.4
--- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java:1.3	Thu Oct  5 07:49:44 2006
+++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaConfiguration.java	Wed Oct 18 08:46:34 2006
@@ -24,9 +24,9 @@
  * Created: 20 févr. 2006
  *
  * @author Arnaud Thimel <thimel@codelutin.com>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  *
- * Mise a jour: $Date: 2006/10/05 07:49:44 $
+ * Mise a jour: $Date: 2006/10/18 08:46:34 $
  * par : $Author: ruchaud $
  */
 
@@ -41,7 +41,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 
-import org.codelutin.topia.security.TopiaSecurityManagerImpl;
+import org.codelutin.topia.security.TopiaSecurityService;
 
 /**
  * Classe permettant de passer des paramètres entre le LoginModule et le
@@ -61,7 +61,7 @@
      * @param securityManagerPropertiesName
      *            le nom du fichier de propriétés
      */
-    public TopiaConfiguration(String name, TopiaSecurityManagerImpl securityManager) {
+    public TopiaConfiguration(String name, TopiaSecurityService securityManager) {
         super();
         appConfEntries = new HashMap<String, AppConfigurationEntry[]>();
         addEntry(name, securityManager);
@@ -76,7 +76,7 @@
      * @param securityHelper
      *            le nom du fichier de propriétés
      */
-    private void addEntry(String name, TopiaSecurityManagerImpl securityManager) {
+    private void addEntry(String name, TopiaSecurityService securityManager) {
         AppConfigurationEntry[] confEntries = getAppConfigurationEntry(name);
         if (confEntries != null) {
             int i = 0;
@@ -117,7 +117,7 @@
      *            le SecurityHelper
      * @return l'entry créée
      */
-    private AppConfigurationEntry createEntry(TopiaSecurityManagerImpl securityManager) {
+    private AppConfigurationEntry createEntry(TopiaSecurityService securityManager) {
         return createEntry(securityManager, null);
     }
 
@@ -130,7 +130,7 @@
      *            l'objet contenant les options précédentes
      * @return l'entry créée
      */
-    private AppConfigurationEntry createEntry(TopiaSecurityManagerImpl securityManager, Map options) {
+    private AppConfigurationEntry createEntry(TopiaSecurityService securityManager, Map options) {
         if (options == null)
             options = new HashMap<String, Object>();
         options.put(SECURITY_MANAGER_KEY, securityManager);

Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java
diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java:1.8 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java:1.9
--- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java:1.8	Thu Oct  5 14:22:07 2006
+++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaLoginModule.java	Wed Oct 18 08:46:34 2006
@@ -24,9 +24,9 @@
 * Created: 15 févr. 2006
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.8 $
+* @version $Revision: 1.9 $
 *
-* Mise a jour: $Date: 2006/10/05 14:22:07 $
+* Mise a jour: $Date: 2006/10/18 08:46:34 $
 * par : $Author: ruchaud $
 */
 
@@ -51,7 +51,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.security.TopiaSecurityManagerImpl;
+import org.codelutin.topia.security.TopiaSecurityServiceImpl;
 import org.codelutin.topia.security.entities.user.TopiaGroup;
 import org.codelutin.topia.security.entities.user.TopiaUser;
 import org.codelutin.topia.security.entities.user.TopiaUserDAO;
@@ -67,7 +67,7 @@
     private Subject subject;
     private CallbackHandler callbackHandler;
     private Set<Principal> principals;
-    private TopiaSecurityManagerImpl securityManager;
+    private TopiaSecurityServiceImpl securityManager;
 
     /* (non-Javadoc)
      * @see javax.security.auth.spi.LoginModule#initialize(
@@ -81,7 +81,7 @@
         this.subject = subject;
         this.callbackHandler = callbackHandler;
         this.principals = null;
-        this.securityManager = (TopiaSecurityManagerImpl)options.get(SECURITY_MANAGER_KEY);
+        this.securityManager = (TopiaSecurityServiceImpl)options.get(SECURITY_MANAGER_KEY);
     }
 
     /* (non-Javadoc)

Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java
diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.9 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.10
--- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.9	Fri Oct  6 09:08:34 2006
+++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java	Wed Oct 18 08:46:34 2006
@@ -24,9 +24,9 @@
  * Created: 17 févr. 2006
  *
  * @author Arnaud Thimel <thimel@codelutin.com>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  *
- * Mise a jour: $Date: 2006/10/06 09:08:34 $
+ * Mise a jour: $Date: 2006/10/18 08:46:34 $
  * par : $Author: ruchaud $
  */
 
@@ -46,7 +46,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.topia.TopiaException;
-import org.codelutin.topia.security.TopiaSecurityManagerImpl;
+import org.codelutin.topia.security.TopiaSecurityServiceImpl;
 
 /**
  * Implantation d'un policy avec une prise en compte des permissions à la volée.
@@ -56,11 +56,11 @@
 
     private Log log = LogFactory.getLog(TopiaPolicy.class);
 
-    private TopiaSecurityManagerImpl securityManagerImpl;
+    private TopiaSecurityServiceImpl securityManagerImpl;
 
     protected Policy parentPolicy;
 
-    public TopiaPolicy(TopiaSecurityManagerImpl securityManagerImpl) {
+    public TopiaPolicy(TopiaSecurityServiceImpl securityManagerImpl) {
         super();
         this.securityManagerImpl = securityManagerImpl;
     }

Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java
diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.5 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.6
--- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.5	Mon Sep 25 13:24:40 2006
+++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java	Wed Oct 18 08:46:34 2006
@@ -24,17 +24,17 @@
 * Created: 16 févr. 2006
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.5 $
+* @version $Revision: 1.6 $
 *
-* Mise a jour: $Date: 2006/09/25 13:24:40 $
+* Mise a jour: $Date: 2006/10/18 08:46:34 $
 * par : $Author: ruchaud $
 */
 
 package org.codelutin.topia.security.jaas;
 
-import java.security.Permission;
+import static org.codelutin.topia.security.util.TopiaSecurityUtil.actionsInt2String;
 
-import static org.codelutin.topia.security.util.TopiaSecurityUtil.*;
+import java.security.Permission;
 
 import org.codelutin.topia.security.entities.authorization.TopiaAuthorization;