diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java index c5d8985..71e3288 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java @@ -1,5 +1,45 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ package br.gov.frameworkdemoiselle.internal.configuration; +import java.io.Serializable; + +import br.gov.frameworkdemoiselle.annotation.Name; +import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.security.Authenticator; import br.gov.frameworkdemoiselle.security.Authorizer; @@ -9,7 +49,19 @@ import br.gov.frameworkdemoiselle.security.Authorizer; * * @author SERPRO */ -public interface SecurityConfig { +@Configuration(prefix = "frameworkdemoiselle.security.") +public class SecurityConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @Name("enabled") + private boolean enabled = true; + + @Name("authenticator.class") + private Class authenticatorClass; + + @Name("authorizer.class") + private Class authorizerClass; /** * Tells whether or not the security is enabled for the current application. This value could be defined in the @@ -18,15 +70,27 @@ public interface SecurityConfig { * @return the value defined for the key frameworkdemoiselle.security.enabled in the * demoiselle.properties file. If there is no value defined, returns the default value true */ - boolean isEnabled(); + public boolean isEnabled() { + return this.enabled; + } - void setEnabled(boolean enabled); + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } - Class getAuthenticatorClass(); + public Class getAuthenticatorClass() { + return this.authenticatorClass; + } - void setAuthenticatorClass(Class authenticatorClass); + public void setAuthenticatorClass(Class authenticatorClass) { + this.authenticatorClass = authenticatorClass; + } - Class getAuthorizerClass(); + public Class getAuthorizerClass() { + return this.authorizerClass; + } - void setAuthorizerClass(Class authorizerClass); + public void setAuthorizerClass(Class authorizerClass) { + this.authorizerClass = authorizerClass; + } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java deleted file mode 100644 index 4bd6976..0000000 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.configuration; - -import java.io.Serializable; - -import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.configuration.Configuration; -import br.gov.frameworkdemoiselle.security.Authenticator; -import br.gov.frameworkdemoiselle.security.Authorizer; - -@Configuration(prefix = "frameworkdemoiselle.security.") -public class SecurityConfigImpl implements Serializable, SecurityConfig { - - private static final long serialVersionUID = 1L; - - @Name("enabled") - private boolean enabled = true; - - @Name("authenticator.class") - private Class authenticatorClass; - - @Name("authorizer.class") - private Class authorizerClass; - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#isEnabled() - */ - @Override - public boolean isEnabled() { - return this.enabled; - } - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#setEnabled(boolean) - */ - @Override - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#getAuthenticatorClass() - */ - @Override - public Class getAuthenticatorClass() { - return this.authenticatorClass; - } - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#setAuthenticatorClass(java.lang.Class) - */ - @Override - public void setAuthenticatorClass(Class authenticatorClass) { - this.authenticatorClass = authenticatorClass; - } - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#getAuthorizerClass() - */ - @Override - public Class getAuthorizerClass() { - return this.authorizerClass; - } - - /* - * (non-Javadoc) - * @see br.gov.frameworkdemoiselle.security.SecurityConfig#setAuthorizerClass(java.lang.Class) - */ - @Override - public void setAuthorizerClass(Class authorizerClass) { - this.authorizerClass = authorizerClass; - } -} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java index f7b58fa..1a5c6fd 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java @@ -45,7 +45,6 @@ import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap; import br.gov.frameworkdemoiselle.internal.bootstrap.AuthorizerBootstrap; import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig; -import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfigImpl; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.security.AfterLoginSuccessful; import br.gov.frameworkdemoiselle.security.AfterLogoutSuccessful; @@ -205,7 +204,7 @@ public class SecurityContextImpl implements SecurityContext { } private SecurityConfig getConfig() { - return Beans.getReference(SecurityConfigImpl.class); + return Beans.getReference(SecurityConfig.class); } public void checkLoggedIn() throws NotLoggedInException { diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java index 9d6a7a2..911c033 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java @@ -16,7 +16,7 @@ public class SecurityConfigTest { @Before public void setUp() throws Exception { - this.config = new SecurityConfigImpl(); + this.config = new SecurityConfig(); } @Test diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImplTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImplTest.java index 580ca51..68d4f66 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImplTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImplTest.java @@ -64,7 +64,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap; -import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfigImpl; +import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.security.Authenticator; import br.gov.frameworkdemoiselle.security.Authorizer; @@ -79,17 +79,17 @@ public class SecurityContextImplTest { private SecurityContextImpl context; - private SecurityConfigImpl config; + private SecurityConfig config; private ResourceBundle bundle; @Before public void setUpConfig() { context = new SecurityContextImpl(); - config = createMock(SecurityConfigImpl.class); + config = createMock(SecurityConfig.class); mockStatic(Beans.class); - expect(Beans.getReference(SecurityConfigImpl.class)).andReturn(config).anyTimes(); + expect(Beans.getReference(SecurityConfig.class)).andReturn(config).anyTimes(); } @Test -- libgit2 0.21.2