Author: sletellier Date: 2011-10-20 10:05:43 +0200 (Thu, 20 Oct 2011) New Revision: 2367 Url: http://nuiton.org/repositories/revision/topia/2367 Log: - Fix javadoc - Add static method getTaasPersistenceClasses - Add error log in TaasLoginModule - Use is for boolean getters Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -23,7 +23,7 @@ * #L% */ -/* * +/** * TopiaSecurityVetoableListener.java * * Created: 10 févr. 2006 @@ -32,7 +32,8 @@ * @version $Revision$ * * Mise a jour: $Date$ - * par : sletellier */ + * par : sletellier + */ package org.nuiton.topia.taas; @@ -118,6 +119,10 @@ @Override public Class<?>[] getPersistenceClasses() { + return getTaasPersistenceClasses(); + } + + public static Class<?>[] getTaasPersistenceClasses() { return new Class<?>[]{ TaasUserImpl.class, TaasPrincipalImpl.class, Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -72,10 +72,10 @@ public static final String DELETE_TEXT = "DELETE"; /** - * Applique un algorithme de hashage sur la chaine de carat�re pass�e en - * param�tre - * @param msg la chaine de carat�re sur laquelle on veut op�rer le hashage - * @return La chaine de caract�re une fois l'algorithme appliqu� + * Applique un algorithme de hashage sur la chaine de caratere passee en + * parametre + * @param msg la chaine de caratere sur laquelle on veut operer le hashage + * @return La chaine de caractere une fois l'algorithme applique */ public static String hash(String msg) { return digestSHAHex(msg); Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -37,7 +37,6 @@ package org.nuiton.topia.taas.jaas; - import java.util.Collection; import java.util.Date; import java.util.HashSet; @@ -87,6 +86,7 @@ @Override public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String,?> sharedState, Map<String,?> options) { + this.subject = subject; this.callbackHandler = callbackHandler; principals = null; @@ -144,7 +144,7 @@ TaasUserDAO userDAO = TopiaSecurityDAOHelper.getTaasUserDAO(transaction); TaasUser user = userDAO.findByLogin(login); - if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { + if(user != null && user.getPassword().equals(hashed) && user.isEnabled()) { privateCredential = user; // Update connection information @@ -169,7 +169,7 @@ } catch (Exception e) { LoginException le = new LoginException("Erreur lors de l'authentification" + login); le.initCause(e); - log.error(e); + log.error("Erreur lors de l'authentification", le); throw le; } finally { if (transaction != null) { @@ -177,14 +177,17 @@ transaction.commitTransaction(); transaction.closeContext(); } catch (TopiaException e) { - throw new LoginException("Erreur lors de l'authentification " + login); + LoginException le = new LoginException("Erreur lors de l'authentification" + login); + le.initCause(e); + log.error("Erreur lors de l'authentification", le); + throw le; } } } } catch(LoginException eee) { log.error("LoginException : ", eee); } catch(Throwable eee){ - log.error(eee); + log.error("Exception : ", eee); throw new LoginException(eee.getMessage()); } return true; @@ -239,5 +242,4 @@ callbackHandler = null; return true; } - } //TopiaLoginModule Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -64,7 +64,6 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import java.io.File; -import java.io.IOException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.List;