From 4cef0dd9593fe2570bbeef79ecb326f9aee81a6d Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Tue, 25 Sep 2012 08:56:30 -0300
Subject: [PATCH] Retornando a configuração de segurança para o pacote internal

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java       | 32 ++++++++++++++++++++++++++++++++
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java   |  1 -
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java |  2 +-
 impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityConfig.java                     | 29 -----------------------------
 impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java   |  1 -
 5 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java
 delete mode 100644 impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityConfig.java

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
new file mode 100644
index 0000000..c5d8985
--- /dev/null
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfig.java
@@ -0,0 +1,32 @@
+package br.gov.frameworkdemoiselle.internal.configuration;
+
+import br.gov.frameworkdemoiselle.security.Authenticator;
+import br.gov.frameworkdemoiselle.security.Authorizer;
+
+/**
+ * A <code>SecurityConfig</code> object is responsible for specifying which security configurations should be used for a
+ * particular application.
+ * 
+ * @author SERPRO
+ */
+public interface SecurityConfig {
+
+	/**
+	 * Tells whether or not the security is enabled for the current application. This value could be defined in the
+	 * <b>demoiselle.properties</b> file, using the key <i>frameworkdemoiselle.security.enabled</i>.
+	 * 
+	 * @return the value defined for the key <i>frameworkdemoiselle.security.enabled</i> in the
+	 *         <b>demoiselle.properties</b> file. If there is no value defined, returns the default value <tt>true</tt>
+	 */
+	boolean isEnabled();
+
+	void setEnabled(boolean enabled);
+
+	Class<? extends Authenticator> getAuthenticatorClass();
+
+	void setAuthenticatorClass(Class<? extends Authenticator> authenticatorClass);
+
+	Class<? extends Authorizer> getAuthorizerClass();
+
+	void setAuthorizerClass(Class<? extends Authorizer> 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
index 0ec0747..a8c7365 100644
--- 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
@@ -41,7 +41,6 @@ import java.io.Serializable;
 import br.gov.frameworkdemoiselle.configuration.Configuration;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.Authorizer;
-import br.gov.frameworkdemoiselle.security.SecurityConfig;
 
 @Configuration(prefix = "frameworkdemoiselle.security")
 public class SecurityConfigImpl implements Serializable, SecurityConfig {
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 b62aa9d..45b6ade 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
@@ -40,6 +40,7 @@ import javax.inject.Named;
 
 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;
@@ -47,7 +48,6 @@ import br.gov.frameworkdemoiselle.security.AfterLogoutSuccessful;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.Authorizer;
 import br.gov.frameworkdemoiselle.security.NotLoggedInException;
-import br.gov.frameworkdemoiselle.security.SecurityConfig;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.security.User;
 import br.gov.frameworkdemoiselle.util.Beans;
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityConfig.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityConfig.java
deleted file mode 100644
index 04f9a62..0000000
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package br.gov.frameworkdemoiselle.security;
-
-/**
- * A <code>SecurityConfig</code> object is responsible for specifying which security configurations should be used for a
- * particular application.
- * 
- * @author SERPRO
- */
-public interface SecurityConfig {
-
-	/**
-	 * Tells whether or not the security is enabled for the current application. This value could be defined in the
-	 * <b>demoiselle.properties</b> file, using the key <i>frameworkdemoiselle.security.enabled</i>.
-	 * 
-	 * @return the value defined for the key <i>frameworkdemoiselle.security.enabled</i> in the
-	 *         <b>demoiselle.properties</b> file. If there is no value defined, returns the default value <tt>true</tt>
-	 */
-	boolean isEnabled();
-
-	void setEnabled(boolean enabled);
-
-	Class<? extends Authenticator> getAuthenticatorClass();
-
-	void setAuthenticatorClass(Class<? extends Authenticator> authenticatorClass);
-
-	Class<? extends Authorizer> getAuthorizerClass();
-
-	void setAuthorizerClass(Class<? extends Authorizer> authorizerClass);
-}
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 978ac3c..1efe927 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
@@ -5,7 +5,6 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
-import br.gov.frameworkdemoiselle.security.SecurityConfig;
 
 
 public class SecurityConfigTest {
--
libgit2 0.21.2