From ca09e480acd53d2821527c79a4477592624a5436 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Wed, 12 Dec 2012 15:13:32 -0300 Subject: [PATCH] Utilização do logger e resource bundle --- impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java | 30 ++++++++++++++++++++---------- impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java | 10 +++++----- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java b/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java index 34752bc..ae9c75e 100644 --- a/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java +++ b/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java @@ -52,8 +52,11 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import org.slf4j.Logger; + import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.internal.configuration.JAASConfig; +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.util.ResourceBundle; import br.gov.frameworkdemoiselle.util.Strings; @@ -64,7 +67,9 @@ public class JAASAuthenticator implements Authenticator { private static final long serialVersionUID = 1L; - private ResourceBundle bundle; + private static ResourceBundle bundle; + + private static Logger logger; private User user; @@ -97,8 +102,7 @@ public class JAASAuthenticator implements Authenticator { } } catch (LoginException cause) { - // TODO Colocar no log - result = false; + getLogger().info(cause.getMessage()); } return result; @@ -162,20 +166,26 @@ public class JAASAuthenticator implements Authenticator { ((PasswordCallback) callbacks[i]).setPassword(credentials.getPassword().toCharArray()); } else { - // TODO Utilizar o logger... - - System.out.println(getBundle().getString("unsupported-callback", callbacks[i])); + getLogger().error(getBundle().getString("unsupported-callback", callbacks[i])); } } } }; } - private ResourceBundle getBundle() { - if (this.bundle == null) { - this.bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle"); + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle"); + } + + return bundle; + } + + private static Logger getLogger() { + if (logger == null) { + logger = LoggerProducer.create(JAASAuthenticator.class); } - return this.bundle; + return logger; } } diff --git a/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java b/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java index a0fc942..c49044c 100644 --- a/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java +++ b/impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java @@ -55,7 +55,7 @@ public class JAASAuthorizer implements Authorizer { private static final long serialVersionUID = 1L; - private ResourceBundle bundle; + private static ResourceBundle bundle; @Override public boolean hasRole(String role) { @@ -92,11 +92,11 @@ public class JAASAuthorizer implements Authorizer { RequiredPermission.class.getSimpleName())); } - private ResourceBundle getBundle() { - if (this.bundle == null) { - this.bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle"); + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle"); } - return this.bundle; + return bundle; } } -- libgit2 0.21.2