Index: topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java diff -u topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java:1.4 topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java:1.5 --- topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java:1.4 Thu Dec 13 16:48:16 2007 +++ topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java Fri Dec 14 14:47:35 2007 @@ -24,9 +24,9 @@ * Created: 15 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.4 $ +* @version $Revision: 1.5 $ * -* Mise a jour: $Date: 2007-12-13 16:48:16 $ +* Mise a jour: $Date: 2007-12-14 14:47:35 $ * par : $Author: ruchaud $ */ @@ -65,10 +65,10 @@ private Log log = LogFactory.getLog(TaasLoginModule.class); - private Subject subject; - private CallbackHandler callbackHandler; - private Set principals; - private TaasService taasService; + protected Subject subject; + protected CallbackHandler callbackHandler; + protected Set principals; + protected TaasService taasService; /* (non-Javadoc) * @see javax.security.auth.spi.LoginModule#initialize( @@ -82,7 +82,7 @@ this.subject = subject; this.callbackHandler = callbackHandler; this.principals = null; - this.taasService = (TaasService)options.get(TaasService.CONF_KEY); + this.taasService = (TaasService)options.get(TaasService.SERVICE_NAME); } /* (non-Javadoc) Index: topia-service/src/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java diff -u topia-service/src/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java:1.1 topia-service/src/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java:1.2 --- topia-service/src/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java:1.1 Thu Nov 29 16:08:29 2007 +++ topia-service/src/java/org/codelutin/topia/taas/jaas/TaasConfiguration.java Fri Dec 14 14:47:35 2007 @@ -24,9 +24,9 @@ * Created: 20 févr. 2006 * * @author Arnaud Thimel - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2007-11-29 16:08:29 $ + * Mise a jour: $Date: 2007-12-14 14:47:35 $ * par : $Author: ruchaud $ */ @@ -77,7 +77,7 @@ if (confEntries != null) { int i = 0; for (; i < confEntries.length; i++) - if (TaasService.CONF_LOGIN_MODULE.equals(confEntries[i] + if (TaasService.SERVICE_LOGIN_MODULE.equals(confEntries[i] .getLoginModuleName())) break; if (i == confEntries.length) { @@ -92,10 +92,10 @@ .equals(confEntries[i].getControlFlag()) /* Ne contient pas la propriété */ || !confEntries[i].getOptions().containsKey( - TaasService.CONF_KEY) + TaasService.SERVICE_NAME) /* Propriété mal initialisée */ || !confEntries[i].getOptions() - .get(TaasService.CONF_KEY).equals(taasService)) + .get(TaasService.SERVICE_NAME).equals(taasService)) confEntries[i] = createEntry(taasService, confEntries[i] .getOptions()); } @@ -129,8 +129,8 @@ private AppConfigurationEntry createEntry(TaasService taasService, Map options) { if (options == null) options = new HashMap(); - options.put(TaasService.CONF_KEY, taasService); - return new AppConfigurationEntry(TaasService.CONF_LOGIN_MODULE, + options.put(TaasService.SERVICE_NAME, taasService); + return new AppConfigurationEntry(TaasService.SERVICE_LOGIN_MODULE, AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options); }