diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticatorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticatorTest.java
index 05012a3..6d0eb58 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticatorTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticatorTest.java
@@ -1,74 +1,74 @@
-package br.gov.frameworkdemoiselle.internal.implementation;
-
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertTrue;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-
-import java.util.Locale;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-/**
- * @author SERPRO
- * @see DefaultAuthenticator
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(CoreBundle.class)
-public class DefaultAuthenticatorTest {
-
-	private DefaultAuthenticator authenticator;
-
-	@Before
-	public void setUp() throws Exception {
-		authenticator = new DefaultAuthenticator();
-
-		mockStatic(CoreBundle.class);
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		expect(CoreBundle.get()).andReturn(bundle);
-
-		replay(CoreBundle.class);
-	}
-
-	@After
-	public void tearDown() {
-		authenticator = null;
-	}
-
-	@Test
-	public void testAuthenticate() {
-		try {
-			authenticator.authenticate();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testUnAuthenticate() {
-		try {
-			authenticator.unAuthenticate();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testGetUser() {
-		try {
-			authenticator.getUser();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-}
+//package br.gov.frameworkdemoiselle.internal.implementation;
+//
+//import static org.easymock.EasyMock.expect;
+//import static org.junit.Assert.assertTrue;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//
+//import java.util.Locale;
+//
+//import org.junit.After;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.DemoiselleException;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+///**
+// * @author SERPRO
+// * @see DefaultAuthenticator
+// */
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest(CoreBundle.class)
+//public class DefaultAuthenticatorTest {
+//
+//	private DefaultAuthenticator authenticator;
+//
+//	@Before
+//	public void setUp() throws Exception {
+//		authenticator = new DefaultAuthenticator();
+//
+//		mockStatic(CoreBundle.class);
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		expect(CoreBundle.get()).andReturn(bundle);
+//
+//		replay(CoreBundle.class);
+//	}
+//
+//	@After
+//	public void tearDown() {
+//		authenticator = null;
+//	}
+//
+//	@Test
+//	public void testAuthenticate() {
+//		try {
+//			authenticator.authenticate();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testUnAuthenticate() {
+//		try {
+//			authenticator.unAuthenticate();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testGetUser() {
+//		try {
+//			authenticator.getUser();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//}
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java
index 334e5ce..514410a 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java
@@ -1,65 +1,65 @@
-package br.gov.frameworkdemoiselle.internal.implementation;
-
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertTrue;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-
-import java.util.Locale;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-/**
- * @author SERPRO
- * @see DefaultAuthorizer
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(CoreBundle.class)
-public class DefaultAuthorizerTest {
-
-	private DefaultAuthorizer authorizer;
-
-	@Before
-	public void setUp() throws Exception {
-		authorizer = new DefaultAuthorizer();
-
-		mockStatic(CoreBundle.class);
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		expect(CoreBundle.get()).andReturn(bundle);
-
-		replay(CoreBundle.class);
-	}
-
-	@After
-	public void tearDown() {
-		authorizer = null;
-	}
-
-	@Test
-	public void testHasRole() {
-		try {
-			authorizer.hasRole(null);
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testHasPermission() {
-		try {
-			authorizer.hasPermission(null, null);
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-}
+//package br.gov.frameworkdemoiselle.internal.implementation;
+//
+//import static org.easymock.EasyMock.expect;
+//import static org.junit.Assert.assertTrue;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//
+//import java.util.Locale;
+//
+//import org.junit.After;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.DemoiselleException;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+///**
+// * @author SERPRO
+// * @see DefaultAuthorizer
+// */
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest(CoreBundle.class)
+//public class DefaultAuthorizerTest {
+//
+//	private DefaultAuthorizer authorizer;
+//
+//	@Before
+//	public void setUp() throws Exception {
+//		authorizer = new DefaultAuthorizer();
+//
+//		mockStatic(CoreBundle.class);
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		expect(CoreBundle.get()).andReturn(bundle);
+//
+//		replay(CoreBundle.class);
+//	}
+//
+//	@After
+//	public void tearDown() {
+//		authorizer = null;
+//	}
+//
+//	@Test
+//	public void testHasRole() {
+//		try {
+//			authorizer.hasRole(null);
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testHasPermission() {
+//		try {
+//			authorizer.hasPermission(null, null);
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//}
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java
index 181af51..e193096 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java
@@ -1,136 +1,136 @@
-/*
- * 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 <http://www.gnu.org/licenses/>
- * 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 <http://www.gnu.org/licenses/>
- * 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.implementation;
-
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertTrue;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-
-import java.util.Locale;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-/**
- * @author SERPRO
- * @see DefaultTransaction
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(CoreBundle.class)
-public class DefaultTransactionTest {
-
-	private DefaultTransaction tx;
-
-	@Before
-	public void setUp() throws Exception {
-		tx = new DefaultTransaction();
-
-		mockStatic(CoreBundle.class);
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		expect(CoreBundle.get()).andReturn(bundle);
-
-		replay(CoreBundle.class);
-	}
-
-	@After
-	public void tearDown() {
-		tx = null;
-	}
-
-	@Test
-	public void testBegin() {
-		try {
-			tx.begin();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testCommit() {
-		try {
-			tx.commit();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testIsActive() {
-		try {
-			tx.isActive();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testIsMarkedRollback() {
-		try {
-			tx.isMarkedRollback();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testRollback() {
-		try {
-			tx.rollback();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-
-	@Test
-	public void testSetRollbackOnly() {
-		try {
-			tx.setRollbackOnly();
-		} catch (Exception e) {
-			assertTrue(e instanceof DemoiselleException);
-		}
-	}
-}
+///*
+// * 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 <http://www.gnu.org/licenses/>
+// * 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 <http://www.gnu.org/licenses/>
+// * 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.implementation;
+//
+//import static org.easymock.EasyMock.expect;
+//import static org.junit.Assert.assertTrue;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//
+//import java.util.Locale;
+//
+//import org.junit.After;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.DemoiselleException;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+///**
+// * @author SERPRO
+// * @see DefaultTransaction
+// */
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest(CoreBundle.class)
+//public class DefaultTransactionTest {
+//
+//	private DefaultTransaction tx;
+//
+//	@Before
+//	public void setUp() throws Exception {
+//		tx = new DefaultTransaction();
+//
+//		mockStatic(CoreBundle.class);
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		expect(CoreBundle.get()).andReturn(bundle);
+//
+//		replay(CoreBundle.class);
+//	}
+//
+//	@After
+//	public void tearDown() {
+//		tx = null;
+//	}
+//
+//	@Test
+//	public void testBegin() {
+//		try {
+//			tx.begin();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testCommit() {
+//		try {
+//			tx.commit();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testIsActive() {
+//		try {
+//			tx.isActive();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testIsMarkedRollback() {
+//		try {
+//			tx.isMarkedRollback();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testRollback() {
+//		try {
+//			tx.rollback();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//
+//	@Test
+//	public void testSetRollbackOnly() {
+//		try {
+//			tx.setRollbackOnly();
+//		} catch (Exception e) {
+//			assertTrue(e instanceof DemoiselleException);
+//		}
+//	}
+//}
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 24fe033..9e0447a 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
@@ -1,356 +1,356 @@
-package br.gov.frameworkdemoiselle.internal.implementation;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-import static org.powermock.reflect.Whitebox.setInternalState;
-
-import java.util.Locale;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig;
-import br.gov.frameworkdemoiselle.security.Authenticator;
-import br.gov.frameworkdemoiselle.security.Authorizer;
-import br.gov.frameworkdemoiselle.security.NotLoggedInException;
-import br.gov.frameworkdemoiselle.security.User;
-import br.gov.frameworkdemoiselle.util.Beans;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ CoreBundle.class, Beans.class })
-public class SecurityContextImplTest {
-
-	private SecurityContextImpl context;
-
-	private SecurityConfig config;
-
-	@Before
-	public void setUp() {
-		context = new SecurityContextImpl();
-
-		config = createMock(SecurityConfig.class);
-		setInternalState(context, "config", config);
-	}
-
-	@Test
-	public void testHasPermissionWithSecurityDisabled() {
-
-		expect(config.isEnabled()).andReturn(false);
-
-		replay(config);
-
-		try {
-			assertTrue(context.hasPermission(null, null));
-		} catch (NotLoggedInException e) {
-			fail();
-		}
-
-	}
-
-	@Test
-	public void testHasPermissionWithSecurityEnabledAndNotLoggedIn() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		setInternalState(context, "bundle", bundle);
-		setInternalState(context, "authenticator", authenticator);
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-		replay(config, authenticator);
-
-		try {
-			context.hasPermission(null, null);
-			fail();
-		} catch (NotLoggedInException e) {
-			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
-		}
-
-	}
-
-	@Test
-	public void testHasPermissionWithSecurityEnabledAndLoggedIn() {
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-		replay(config);
-
-		loginSuccessfully();
-
-		Authorizer authorizer = createMock(Authorizer.class);
-		expect(authorizer.hasPermission(null, null)).andReturn(true);
-
-		setInternalState(context, "authorizer", authorizer);
-
-		replay(authorizer);
-
-		try {
-			assertTrue(context.hasPermission(null, null));
-		} catch (NotLoggedInException e) {
-			fail();
-		}
-
-	}
-
-	private void loginSuccessfully() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.authenticate()).andReturn(true);
-
-		BeanManager manager = createMock(BeanManager.class);
-		mockStatic(Beans.class);
-		expect(Beans.getBeanManager()).andReturn(manager);
-		manager.fireEvent(EasyMock.anyObject(Class.class));
-		PowerMock.expectLastCall();
-
-		User user = createMock(User.class);
-		expect(authenticator.getUser()).andReturn(user).anyTimes();
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replayAll(authenticator, user, Beans.class, manager);
-
-		context.login();
-		assertTrue(context.isLoggedIn());
-	}
-
-	@Test
-	public void testHasRoleWithSecurityDisabled() {
-
-		expect(config.isEnabled()).andReturn(false);
-
-		replay(config);
-
-		try {
-			assertTrue(context.hasRole(null));
-		} catch (NotLoggedInException e) {
-			fail();
-		}
-
-	}
-
-	@Test
-	public void testHasRoleWithSecurityEnabledAndNotLoggedIn() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		setInternalState(context, "bundle", bundle);
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replay(config, authenticator);
-
-		try {
-			context.hasRole(null);
-			fail();
-		} catch (NotLoggedInException e) {
-			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
-		}
-
-	}
-
-	@Test
-	public void testHasRoleWithSecurityEnabledAndLoggedIn() {
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-		replay(config);
-
-		loginSuccessfully();
-
-		Authorizer authorizer = createMock(Authorizer.class);
-		expect(authorizer.hasRole(null)).andReturn(true);
-
-		setInternalState(context, "authorizer", authorizer);
-
-		replay(authorizer);
-
-		try {
-			assertTrue(context.hasRole(null));
-		} catch (NotLoggedInException e) {
-			fail();
-		}
-
-	}
-
-	@Test
-	public void testIsLoggedInWithSecurityEnabled() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replay(config, authenticator);
-
-		assertFalse(context.isLoggedIn());
-	}
-
-	@Test
-	public void testIsLoggedInWithSecurityDisabled() {
-
-		expect(config.isEnabled()).andReturn(false);
-
-		replay(config);
-
-		assertTrue(context.isLoggedIn());
-
-	}
-
-	@Test
-	public void testLoginWithSecurityDisabled() {
-
-		expect(config.isEnabled()).andReturn(false).times(2);
-
-		replay(config);
-
-		context.login();
-
-		assertTrue(context.isLoggedIn());
-
-	}
-
-	@Test
-	public void testLoginWithAuthenticationFail() {
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.authenticate()).andReturn(false);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replayAll(authenticator, config);
-
-		context.login();
-
-		assertFalse(context.isLoggedIn());
-	}
-
-	@Test
-	public void testLogOutWithSecurityDisabled() {
-
-		expect(config.isEnabled()).andReturn(false).times(2);
-
-		replay(config);
-
-		try {
-			context.logout();
-			assertTrue(context.isLoggedIn());
-		} catch (NotLoggedInException e) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testLogOutWithoutPreviousLogin() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		setInternalState(context, "bundle", bundle);
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replay(config, authenticator);
-
-		try {
-			context.logout();
-			fail();
-		} catch (NotLoggedInException e) {
-			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
-		}
-	}
-
-	@Test
-	public void testLogOutAfterSuccessfulLogin() {
-		mockStatic(Beans.class);
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.authenticate()).andReturn(true);
-		authenticator.unAuthenticate();
-		PowerMock.expectLastCall();
-
-		User user = createMock(User.class);
-		expect(authenticator.getUser()).andReturn(user);
-		expect(authenticator.getUser()).andReturn(null);
-
-		BeanManager manager = createMock(BeanManager.class);
-		expect(Beans.getBeanManager()).andReturn(manager).times(2);
-		manager.fireEvent(EasyMock.anyObject(Class.class));
-		PowerMock.expectLastCall().times(2);
-
-		setInternalState(context, "authenticator", authenticator);
-
-		replayAll(Beans.class, authenticator, user, manager, config);
-
-		context.login();
-		context.logout();
-
-		assertFalse(context.isLoggedIn());
-	}
-
-	@Test
-	public void testGetUserWhenSecurityIsDisabled() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		expect(config.isEnabled()).andReturn(false).anyTimes();
-		replay(config, authenticator, Beans.class);
-
-		setInternalState(context, "authenticator", authenticator);
-
-		assertNotNull(context.getUser());
-		assertNotNull(context.getUser().getId());
-		assertNull(context.getUser().getAttribute(null));
-		context.getUser().setAttribute(null, null);
-	}
-
-	@Test
-	public void testGetUserWhenSecurityIsEnabled() {
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(null).anyTimes();
-
-		expect(config.isEnabled()).andReturn(true);
-		replay(config, authenticator, Beans.class);
-
-		setInternalState(context, "authenticator", authenticator);
-
-		assertNull(context.getUser());
-	}
-
-	@Test
-	public void testGetUserWhenSecurityIsEnabledAndUserIsNotNull() {
-		User user = createMock(User.class);
-
-		Authenticator authenticator = createMock(Authenticator.class);
-		expect(authenticator.getUser()).andReturn(user).anyTimes();
-
-		expect(config.isEnabled()).andReturn(true).anyTimes();
-		replay(config, user, authenticator, Beans.class);
-
-		setInternalState(context, "authenticator", authenticator);
-
-		assertEquals(context.getUser(), user);
-	}
-}
+//package br.gov.frameworkdemoiselle.internal.implementation;
+//
+//import static junit.framework.Assert.assertEquals;
+//import static junit.framework.Assert.assertFalse;
+//import static junit.framework.Assert.assertNotNull;
+//import static junit.framework.Assert.assertNull;
+//import static junit.framework.Assert.assertTrue;
+//import static junit.framework.Assert.fail;
+//import static org.easymock.EasyMock.createMock;
+//import static org.easymock.EasyMock.expect;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//import static org.powermock.api.easymock.PowerMock.replayAll;
+//import static org.powermock.reflect.Whitebox.setInternalState;
+//
+//import java.util.Locale;
+//
+//import javax.enterprise.inject.spi.BeanManager;
+//
+//import org.easymock.EasyMock;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.api.easymock.PowerMock;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig;
+//import br.gov.frameworkdemoiselle.security.Authenticator;
+//import br.gov.frameworkdemoiselle.security.Authorizer;
+//import br.gov.frameworkdemoiselle.security.NotLoggedInException;
+//import br.gov.frameworkdemoiselle.security.User;
+//import br.gov.frameworkdemoiselle.util.Beans;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({ CoreBundle.class, Beans.class })
+//public class SecurityContextImplTest {
+//
+//	private SecurityContextImpl context;
+//
+//	private SecurityConfig config;
+//
+//	@Before
+//	public void setUp() {
+//		context = new SecurityContextImpl();
+//
+//		config = createMock(SecurityConfig.class);
+//		setInternalState(context, "config", config);
+//	}
+//
+//	@Test
+//	public void testHasPermissionWithSecurityDisabled() {
+//
+//		expect(config.isEnabled()).andReturn(false);
+//
+//		replay(config);
+//
+//		try {
+//			assertTrue(context.hasPermission(null, null));
+//		} catch (NotLoggedInException e) {
+//			fail();
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testHasPermissionWithSecurityEnabledAndNotLoggedIn() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		setInternalState(context, "bundle", bundle);
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//		replay(config, authenticator);
+//
+//		try {
+//			context.hasPermission(null, null);
+//			fail();
+//		} catch (NotLoggedInException e) {
+//			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testHasPermissionWithSecurityEnabledAndLoggedIn() {
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//		replay(config);
+//
+//		loginSuccessfully();
+//
+//		Authorizer authorizer = createMock(Authorizer.class);
+//		expect(authorizer.hasPermission(null, null)).andReturn(true);
+//
+//		setInternalState(context, "authorizer", authorizer);
+//
+//		replay(authorizer);
+//
+//		try {
+//			assertTrue(context.hasPermission(null, null));
+//		} catch (NotLoggedInException e) {
+//			fail();
+//		}
+//
+//	}
+//
+//	private void loginSuccessfully() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.authenticate()).andReturn(true);
+//
+//		BeanManager manager = createMock(BeanManager.class);
+//		mockStatic(Beans.class);
+//		expect(Beans.getBeanManager()).andReturn(manager);
+//		manager.fireEvent(EasyMock.anyObject(Class.class));
+//		PowerMock.expectLastCall();
+//
+//		User user = createMock(User.class);
+//		expect(authenticator.getUser()).andReturn(user).anyTimes();
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replayAll(authenticator, user, Beans.class, manager);
+//
+//		context.login();
+//		assertTrue(context.isLoggedIn());
+//	}
+//
+//	@Test
+//	public void testHasRoleWithSecurityDisabled() {
+//
+//		expect(config.isEnabled()).andReturn(false);
+//
+//		replay(config);
+//
+//		try {
+//			assertTrue(context.hasRole(null));
+//		} catch (NotLoggedInException e) {
+//			fail();
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testHasRoleWithSecurityEnabledAndNotLoggedIn() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		setInternalState(context, "bundle", bundle);
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replay(config, authenticator);
+//
+//		try {
+//			context.hasRole(null);
+//			fail();
+//		} catch (NotLoggedInException e) {
+//			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testHasRoleWithSecurityEnabledAndLoggedIn() {
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//		replay(config);
+//
+//		loginSuccessfully();
+//
+//		Authorizer authorizer = createMock(Authorizer.class);
+//		expect(authorizer.hasRole(null)).andReturn(true);
+//
+//		setInternalState(context, "authorizer", authorizer);
+//
+//		replay(authorizer);
+//
+//		try {
+//			assertTrue(context.hasRole(null));
+//		} catch (NotLoggedInException e) {
+//			fail();
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testIsLoggedInWithSecurityEnabled() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replay(config, authenticator);
+//
+//		assertFalse(context.isLoggedIn());
+//	}
+//
+//	@Test
+//	public void testIsLoggedInWithSecurityDisabled() {
+//
+//		expect(config.isEnabled()).andReturn(false);
+//
+//		replay(config);
+//
+//		assertTrue(context.isLoggedIn());
+//
+//	}
+//
+//	@Test
+//	public void testLoginWithSecurityDisabled() {
+//
+//		expect(config.isEnabled()).andReturn(false).times(2);
+//
+//		replay(config);
+//
+//		context.login();
+//
+//		assertTrue(context.isLoggedIn());
+//
+//	}
+//
+//	@Test
+//	public void testLoginWithAuthenticationFail() {
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.authenticate()).andReturn(false);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replayAll(authenticator, config);
+//
+//		context.login();
+//
+//		assertFalse(context.isLoggedIn());
+//	}
+//
+//	@Test
+//	public void testLogOutWithSecurityDisabled() {
+//
+//		expect(config.isEnabled()).andReturn(false).times(2);
+//
+//		replay(config);
+//
+//		try {
+//			context.logout();
+//			assertTrue(context.isLoggedIn());
+//		} catch (NotLoggedInException e) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testLogOutWithoutPreviousLogin() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		setInternalState(context, "bundle", bundle);
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replay(config, authenticator);
+//
+//		try {
+//			context.logout();
+//			fail();
+//		} catch (NotLoggedInException e) {
+//			assertTrue(e.getMessage().equals(bundle.getString("user-not-authenticated")));
+//		}
+//	}
+//
+//	@Test
+//	public void testLogOutAfterSuccessfulLogin() {
+//		mockStatic(Beans.class);
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.authenticate()).andReturn(true);
+//		authenticator.unAuthenticate();
+//		PowerMock.expectLastCall();
+//
+//		User user = createMock(User.class);
+//		expect(authenticator.getUser()).andReturn(user);
+//		expect(authenticator.getUser()).andReturn(null);
+//
+//		BeanManager manager = createMock(BeanManager.class);
+//		expect(Beans.getBeanManager()).andReturn(manager).times(2);
+//		manager.fireEvent(EasyMock.anyObject(Class.class));
+//		PowerMock.expectLastCall().times(2);
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		replayAll(Beans.class, authenticator, user, manager, config);
+//
+//		context.login();
+//		context.logout();
+//
+//		assertFalse(context.isLoggedIn());
+//	}
+//
+//	@Test
+//	public void testGetUserWhenSecurityIsDisabled() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		expect(config.isEnabled()).andReturn(false).anyTimes();
+//		replay(config, authenticator, Beans.class);
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		assertNotNull(context.getUser());
+//		assertNotNull(context.getUser().getId());
+//		assertNull(context.getUser().getAttribute(null));
+//		context.getUser().setAttribute(null, null);
+//	}
+//
+//	@Test
+//	public void testGetUserWhenSecurityIsEnabled() {
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(null).anyTimes();
+//
+//		expect(config.isEnabled()).andReturn(true);
+//		replay(config, authenticator, Beans.class);
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		assertNull(context.getUser());
+//	}
+//
+//	@Test
+//	public void testGetUserWhenSecurityIsEnabledAndUserIsNotNull() {
+//		User user = createMock(User.class);
+//
+//		Authenticator authenticator = createMock(Authenticator.class);
+//		expect(authenticator.getUser()).andReturn(user).anyTimes();
+//
+//		expect(config.isEnabled()).andReturn(true).anyTimes();
+//		replay(config, user, authenticator, Beans.class);
+//
+//		setInternalState(context, "authenticator", authenticator);
+//
+//		assertEquals(context.getUser(), user);
+//	}
+//}
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptorTest.java
index 7069256..8f79a40 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptorTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptorTest.java
@@ -1,410 +1,410 @@
-package br.gov.frameworkdemoiselle.internal.interceptor;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.fail;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-
-import java.util.Locale;
-
-import javax.enterprise.inject.Instance;
-import javax.interceptor.InvocationContext;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.internal.implementation.CoreBundle;
-import br.gov.frameworkdemoiselle.security.NotLoggedInException;
-import br.gov.frameworkdemoiselle.security.RequiredPermission;
-import br.gov.frameworkdemoiselle.security.SecurityContext;
-import br.gov.frameworkdemoiselle.security.SecurityException;
-import br.gov.frameworkdemoiselle.security.User;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(CoreBundle.class)
-public class RequiredPermissionInterceptorTest {
-
-	private RequiredPermissionInterceptor interceptor;
-
-	private InvocationContext ic;
-
-	private SecurityContext securityContext;
-
-	class UnnamedClass {
-
-		@RequiredPermission
-		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
-		}
-
-		@RequiredPermission(operation = "insert")
-		public void requiredPermissionWithDeclaredOperation() {
-		}
-
-		@RequiredPermission(resource = "contact")
-		public void requiredPermissionWithDeclaredResource() {
-		}
-
-		@RequiredPermission(resource = "contact", operation = "insert")
-		public void requiredPermissionWithDeclaredResourceAndOperation() {
-		}
-	}
-
-	@Name("contact2")
-	class NamedClass {
-
-		@RequiredPermission
-		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
-		}
-
-		@RequiredPermission(operation = "insert")
-		public void requiredPermissionWithDeclaredOperation() {
-		}
-
-		@RequiredPermission(resource = "contact")
-		public void requiredPermissionWithDeclaredResource() {
-		}
-
-		@RequiredPermission(resource = "contact", operation = "insert")
-		public void requiredPermissionWithDeclaredResourceAndOperation() {
-		}
-	}
-
-	@Name("contact2")
-	class NamedClassWithNamedMethods {
-
-		@Name("delete")
-		@RequiredPermission
-		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
-		}
-
-		@Name("delete")
-		@RequiredPermission(operation = "insert")
-		public void requiredPermissionWithDeclaredOperation() {
-		}
-
-		@Name("delete")
-		@RequiredPermission(resource = "contact")
-		public void requiredPermissionWithDeclaredResource() {
-		}
-
-		@Name("delete")
-		@RequiredPermission(resource = "contact", operation = "insert")
-		public void requiredPermissionWithDeclaredResourceAndOperation() {
-		}
-	}
-
-	@RequiredPermission
-	class ClassAnnotedWithRequiredPermission {
-
-		public void withoutRequiredPermissionAnnotation() {
-		}
-
-		@RequiredPermission(operation = "insert")
-		public void requiredPermissionWithDeclaredOperation() {
-		}
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		@SuppressWarnings("unchecked")
-		Instance<SecurityContext> securityContextInstance = createMock(Instance.class);
-		Logger logger = createMock(Logger.class);
-
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		User user = createMock(User.class);
-
-		mockStatic(CoreBundle.class);
-		expect(CoreBundle.get()).andReturn(bundle);
-
-		this.securityContext = createMock(SecurityContext.class);
-		this.ic = createMock(InvocationContext.class);
-
-		expect(user.getId()).andReturn("UserName").anyTimes();
-		expect(this.securityContext.getUser()).andReturn(user).anyTimes();
-		expect(securityContextInstance.get()).andReturn(securityContext).anyTimes();
-		expect(this.ic.proceed()).andReturn(null);
-		replay(securityContextInstance, user, CoreBundle.class);
-
-		this.interceptor = new RequiredPermissionInterceptor(securityContextInstance, bundle, logger);
-	}
-
-	private void prepareMock(Object target, String methodName, String expectedResource, String expectedOperation,
-			boolean hasPermission, boolean isLoggedUser) throws Exception {
-
-		expect(this.securityContext.isLoggedIn()).andReturn(isLoggedUser).anyTimes();
-
-		this.securityContext.hasPermission(expectedResource, expectedOperation);
-
-		if (isLoggedUser) {
-			expectLastCall().andReturn(hasPermission);
-		} else {
-			expectLastCall().andThrow(new NotLoggedInException(""));
-		}
-
-		expect(this.ic.getTarget()).andReturn(target).anyTimes();
-		expect(this.ic.getMethod()).andReturn(target.getClass().getMethod(methodName)).anyTimes();
-		replay(this.ic, this.securityContext);
-	}
-
-	/* Testing UnnamedClass */
-
-	@Test
-	public void testManageUnnamedClassAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
-			String expectedResource = target.getClass().getSimpleName();
-			String expectedOperation = methodName;
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithDeclaredOperation";
-			String expectedResource = target.getClass().getSimpleName();
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithDeclaredResource";
-			String expectedResource = "contact";
-			String expectedOperation = methodName;
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredResourceAndOperation() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
-			String expectedResource = "contact";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	/* Testing NamedClass */
-
-	@Test
-	public void testManageNamedClassAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod() throws Exception {
-		try {
-			Object target = new NamedClass();
-			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
-			String expectedResource = "contact2";
-			String expectedOperation = methodName;
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
-		try {
-			Object target = new NamedClass();
-			String methodName = "requiredPermissionWithDeclaredOperation";
-			String expectedResource = "contact2";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
-		try {
-			Object target = new NamedClass();
-			String methodName = "requiredPermissionWithDeclaredResource";
-			String expectedResource = "contact";
-			String expectedOperation = methodName;
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassAtRequiredPermissionWithDeclaredResourceAndOperation() throws Exception {
-		try {
-			Object target = new NamedClass();
-			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
-			String expectedResource = "contact";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	/* Testing NamedClassWithNamedMethods */
-
-	@Test
-	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod()
-			throws Exception {
-		try {
-			Object target = new NamedClassWithNamedMethods();
-			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
-			String expectedResource = "contact2";
-			String expectedOperation = "delete";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
-		try {
-			Object target = new NamedClassWithNamedMethods();
-			String methodName = "requiredPermissionWithDeclaredOperation";
-			String expectedResource = "contact2";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
-		try {
-			Object target = new NamedClassWithNamedMethods();
-			String methodName = "requiredPermissionWithDeclaredResource";
-			String expectedResource = "contact";
-			String expectedOperation = "delete";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredResourceAndOperation()
-			throws Exception {
-		try {
-			Object target = new NamedClassWithNamedMethods();
-			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
-			String expectedResource = "contact";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	/* Testing ClassAnnotedWithRequiredPermission */
-
-	@Test
-	public void testManageClassAnnotedWithRequiredPermissionAtWithoutRequiredPermissionAnnotation() throws Exception {
-		try {
-			Object target = new ClassAnnotedWithRequiredPermission();
-			String methodName = "withoutRequiredPermissionAnnotation";
-			String expectedResource = target.getClass().getSimpleName();
-			String expectedOperation = methodName;
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	@Test
-	public void testManageClassAnnotedWithRequiredPermissionAtRequiredPermissionWithDeclaredOperation()
-			throws Exception {
-		try {
-			Object target = new ClassAnnotedWithRequiredPermission();
-			String methodName = "requiredPermissionWithDeclaredOperation";
-			String expectedResource = target.getClass().getSimpleName();
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
-
-			interceptor.manage(this.ic);
-		} catch (SecurityException cause) {
-			fail();
-		}
-	}
-
-	/* Other tests */
-
-	@Test
-	public void testManagePermissionNotAllowed() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
-			String expectedResource = "contact";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (SecurityException cause) {
-		}
-	}
-
-	@Test
-	public void testUserNotLoggedIn() throws Exception {
-		try {
-			Object target = new UnnamedClass();
-			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
-			String expectedResource = "contact";
-			String expectedOperation = "insert";
-			prepareMock(target, methodName, expectedResource, expectedOperation, true, false);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (SecurityException cause) {
-		}
-	}
-
-}
+//package br.gov.frameworkdemoiselle.internal.interceptor;
+//
+//import static org.easymock.EasyMock.createMock;
+//import static org.easymock.EasyMock.expect;
+//import static org.easymock.EasyMock.expectLastCall;
+//import static org.junit.Assert.fail;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//
+//import java.util.Locale;
+//
+//import javax.enterprise.inject.Instance;
+//import javax.interceptor.InvocationContext;
+//
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//import org.slf4j.Logger;
+//
+//import br.gov.frameworkdemoiselle.annotation.Name;
+//import br.gov.frameworkdemoiselle.internal.implementation.CoreBundle;
+//import br.gov.frameworkdemoiselle.security.NotLoggedInException;
+//import br.gov.frameworkdemoiselle.security.RequiredPermission;
+//import br.gov.frameworkdemoiselle.security.SecurityContext;
+//import br.gov.frameworkdemoiselle.security.SecurityException;
+//import br.gov.frameworkdemoiselle.security.User;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest(CoreBundle.class)
+//public class RequiredPermissionInterceptorTest {
+//
+//	private RequiredPermissionInterceptor interceptor;
+//
+//	private InvocationContext ic;
+//
+//	private SecurityContext securityContext;
+//
+//	class UnnamedClass {
+//
+//		@RequiredPermission
+//		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
+//		}
+//
+//		@RequiredPermission(operation = "insert")
+//		public void requiredPermissionWithDeclaredOperation() {
+//		}
+//
+//		@RequiredPermission(resource = "contact")
+//		public void requiredPermissionWithDeclaredResource() {
+//		}
+//
+//		@RequiredPermission(resource = "contact", operation = "insert")
+//		public void requiredPermissionWithDeclaredResourceAndOperation() {
+//		}
+//	}
+//
+//	@Name("contact2")
+//	class NamedClass {
+//
+//		@RequiredPermission
+//		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
+//		}
+//
+//		@RequiredPermission(operation = "insert")
+//		public void requiredPermissionWithDeclaredOperation() {
+//		}
+//
+//		@RequiredPermission(resource = "contact")
+//		public void requiredPermissionWithDeclaredResource() {
+//		}
+//
+//		@RequiredPermission(resource = "contact", operation = "insert")
+//		public void requiredPermissionWithDeclaredResourceAndOperation() {
+//		}
+//	}
+//
+//	@Name("contact2")
+//	class NamedClassWithNamedMethods {
+//
+//		@Name("delete")
+//		@RequiredPermission
+//		public void requiredPermissionWithoutDeclaredResourceAndOperation() {
+//		}
+//
+//		@Name("delete")
+//		@RequiredPermission(operation = "insert")
+//		public void requiredPermissionWithDeclaredOperation() {
+//		}
+//
+//		@Name("delete")
+//		@RequiredPermission(resource = "contact")
+//		public void requiredPermissionWithDeclaredResource() {
+//		}
+//
+//		@Name("delete")
+//		@RequiredPermission(resource = "contact", operation = "insert")
+//		public void requiredPermissionWithDeclaredResourceAndOperation() {
+//		}
+//	}
+//
+//	@RequiredPermission
+//	class ClassAnnotedWithRequiredPermission {
+//
+//		public void withoutRequiredPermissionAnnotation() {
+//		}
+//
+//		@RequiredPermission(operation = "insert")
+//		public void requiredPermissionWithDeclaredOperation() {
+//		}
+//	}
+//
+//	@Before
+//	public void setUp() throws Exception {
+//		@SuppressWarnings("unchecked")
+//		Instance<SecurityContext> securityContextInstance = createMock(Instance.class);
+//		Logger logger = createMock(Logger.class);
+//
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		User user = createMock(User.class);
+//
+//		mockStatic(CoreBundle.class);
+//		expect(CoreBundle.get()).andReturn(bundle);
+//
+//		this.securityContext = createMock(SecurityContext.class);
+//		this.ic = createMock(InvocationContext.class);
+//
+//		expect(user.getId()).andReturn("UserName").anyTimes();
+//		expect(this.securityContext.getUser()).andReturn(user).anyTimes();
+//		expect(securityContextInstance.get()).andReturn(securityContext).anyTimes();
+//		expect(this.ic.proceed()).andReturn(null);
+//		replay(securityContextInstance, user, CoreBundle.class);
+//
+//		this.interceptor = new RequiredPermissionInterceptor(securityContextInstance, bundle, logger);
+//	}
+//
+//	private void prepareMock(Object target, String methodName, String expectedResource, String expectedOperation,
+//			boolean hasPermission, boolean isLoggedUser) throws Exception {
+//
+//		expect(this.securityContext.isLoggedIn()).andReturn(isLoggedUser).anyTimes();
+//
+//		this.securityContext.hasPermission(expectedResource, expectedOperation);
+//
+//		if (isLoggedUser) {
+//			expectLastCall().andReturn(hasPermission);
+//		} else {
+//			expectLastCall().andThrow(new NotLoggedInException(""));
+//		}
+//
+//		expect(this.ic.getTarget()).andReturn(target).anyTimes();
+//		expect(this.ic.getMethod()).andReturn(target.getClass().getMethod(methodName)).anyTimes();
+//		replay(this.ic, this.securityContext);
+//	}
+//
+//	/* Testing UnnamedClass */
+//
+//	@Test
+//	public void testManageUnnamedClassAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
+//			String expectedResource = target.getClass().getSimpleName();
+//			String expectedOperation = methodName;
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithDeclaredOperation";
+//			String expectedResource = target.getClass().getSimpleName();
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResource";
+//			String expectedResource = "contact";
+//			String expectedOperation = methodName;
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageUnnamedClassAtRequiredPermissionWithDeclaredResourceAndOperation() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
+//			String expectedResource = "contact";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	/* Testing NamedClass */
+//
+//	@Test
+//	public void testManageNamedClassAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod() throws Exception {
+//		try {
+//			Object target = new NamedClass();
+//			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
+//			String expectedResource = "contact2";
+//			String expectedOperation = methodName;
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
+//		try {
+//			Object target = new NamedClass();
+//			String methodName = "requiredPermissionWithDeclaredOperation";
+//			String expectedResource = "contact2";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
+//		try {
+//			Object target = new NamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResource";
+//			String expectedResource = "contact";
+//			String expectedOperation = methodName;
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassAtRequiredPermissionWithDeclaredResourceAndOperation() throws Exception {
+//		try {
+//			Object target = new NamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
+//			String expectedResource = "contact";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	/* Testing NamedClassWithNamedMethods */
+//
+//	@Test
+//	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithoutDeclaredResourceAndOperationMethod()
+//			throws Exception {
+//		try {
+//			Object target = new NamedClassWithNamedMethods();
+//			String methodName = "requiredPermissionWithoutDeclaredResourceAndOperation";
+//			String expectedResource = "contact2";
+//			String expectedOperation = "delete";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredOperationMethod() throws Exception {
+//		try {
+//			Object target = new NamedClassWithNamedMethods();
+//			String methodName = "requiredPermissionWithDeclaredOperation";
+//			String expectedResource = "contact2";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredResourceMethod() throws Exception {
+//		try {
+//			Object target = new NamedClassWithNamedMethods();
+//			String methodName = "requiredPermissionWithDeclaredResource";
+//			String expectedResource = "contact";
+//			String expectedOperation = "delete";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageNamedClassWithNamedMethodsAtRequiredPermissionWithDeclaredResourceAndOperation()
+//			throws Exception {
+//		try {
+//			Object target = new NamedClassWithNamedMethods();
+//			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
+//			String expectedResource = "contact";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	/* Testing ClassAnnotedWithRequiredPermission */
+//
+//	@Test
+//	public void testManageClassAnnotedWithRequiredPermissionAtWithoutRequiredPermissionAnnotation() throws Exception {
+//		try {
+//			Object target = new ClassAnnotedWithRequiredPermission();
+//			String methodName = "withoutRequiredPermissionAnnotation";
+//			String expectedResource = target.getClass().getSimpleName();
+//			String expectedOperation = methodName;
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	@Test
+//	public void testManageClassAnnotedWithRequiredPermissionAtRequiredPermissionWithDeclaredOperation()
+//			throws Exception {
+//		try {
+//			Object target = new ClassAnnotedWithRequiredPermission();
+//			String methodName = "requiredPermissionWithDeclaredOperation";
+//			String expectedResource = target.getClass().getSimpleName();
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, true);
+//
+//			interceptor.manage(this.ic);
+//		} catch (SecurityException cause) {
+//			fail();
+//		}
+//	}
+//
+//	/* Other tests */
+//
+//	@Test
+//	public void testManagePermissionNotAllowed() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
+//			String expectedResource = "contact";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (SecurityException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testUserNotLoggedIn() throws Exception {
+//		try {
+//			Object target = new UnnamedClass();
+//			String methodName = "requiredPermissionWithDeclaredResourceAndOperation";
+//			String expectedResource = "contact";
+//			String expectedOperation = "insert";
+//			prepareMock(target, methodName, expectedResource, expectedOperation, true, false);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (SecurityException cause) {
+//		}
+//	}
+//
+//}
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptorTest.java
index e7840c7..c633cf8 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptorTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptorTest.java
@@ -1,310 +1,310 @@
-package br.gov.frameworkdemoiselle.internal.interceptor;
-
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.fail;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-
-import java.util.Locale;
-
-import javax.enterprise.inject.Instance;
-import javax.interceptor.InvocationContext;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.internal.implementation.CoreBundle;
-import br.gov.frameworkdemoiselle.security.AuthorizationException;
-import br.gov.frameworkdemoiselle.security.NotLoggedInException;
-import br.gov.frameworkdemoiselle.security.RequiredRole;
-import br.gov.frameworkdemoiselle.security.SecurityContext;
-import br.gov.frameworkdemoiselle.security.User;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(CoreBundle.class)
-public class RequiredRoleInterceptorTest {
-
-	private RequiredRoleInterceptor interceptor;
-
-	private InvocationContext ic;
-
-	private SecurityContext securityContext;
-
-	class ClassNotAnnoted {
-
-		@RequiredRole("simpleRoleName")
-		public void requiredRoleWithSingleRole() {
-		}
-
-		@RequiredRole({ "firstRole", "secondRole", "thirdRole", "fourthRole", "fifthRole" })
-		public void requiredRoleWithArrayOfRoles() {
-		}
-
-		@RequiredRole({ "firstRole, secondRole" })
-		public void requiredRoleWithArrayOfSingleRoleComma() {
-		}
-
-		@RequiredRole("firstRole, secondRole")
-		public void requiredRoleWithSingleRoleComma() {
-		}
-
-		@RequiredRole("")
-		public void requiredRoleWithEmptyValue() {
-		}
-
-		@RequiredRole({})
-		public void requiredRoleWithEmptyArray() {
-		}
-
-		@RequiredRole({ "" })
-		public void requiredRoleWithArrayOfEmptyString() {
-		}
-
-		public void methodNotAnnoted() {
-		}
-	}
-
-	@RequiredRole("classRole")
-	class ClassAnnotedWithRequiredRole {
-
-		public void withoutRole() {
-		}
-
-		@RequiredRole("simpleRoleName")
-		public void requiredRoleWithSingleRole() {
-		}
-	}
-
-	@Before
-	public void setUp() throws Exception {
-
-		@SuppressWarnings("unchecked")
-		Instance<SecurityContext> securityContextInstance = EasyMock.createMock(Instance.class);
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		Logger logger = EasyMock.createMock(Logger.class);
-		User user = EasyMock.createMock(User.class);
-
-		this.securityContext = EasyMock.createMock(SecurityContext.class);
-		this.ic = EasyMock.createMock(InvocationContext.class);
-
-		mockStatic(CoreBundle.class);
-		expect(CoreBundle.get()).andReturn(bundle);
-
-		expect(user.getId()).andReturn("UserName").anyTimes();
-		expect(this.securityContext.getUser()).andReturn(user).anyTimes();
-		expect(securityContextInstance.get()).andReturn(securityContext).anyTimes();
-		expect(this.ic.proceed()).andReturn(null);
-		replay(securityContextInstance, user, CoreBundle.class);
-
-		this.interceptor = new RequiredRoleInterceptor(securityContextInstance, bundle, logger);
-	}
-
-	private void prepareMock(Object target, String methodName, String[] expectedRoles, boolean hasHole,
-			boolean isLoggedUser) throws Exception {
-
-		expect(this.securityContext.isLoggedIn()).andReturn(isLoggedUser).anyTimes();
-
-		for (String role : expectedRoles) {
-			this.securityContext.hasRole(role);
-			if (isLoggedUser) {
-				EasyMock.expectLastCall().andReturn(hasHole);
-			} else {
-				EasyMock.expectLastCall().andThrow(new NotLoggedInException(""));
-			}
-		}
-
-		expect(this.ic.getTarget()).andReturn(target).anyTimes();
-		expect(this.ic.getMethod()).andReturn(target.getClass().getMethod(methodName)).anyTimes();
-		replay(this.ic, this.securityContext);
-	}
-
-	/*
-	 * Testing ClassNotAnnoted
-	 */
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithSingleRole() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithSingleRole";
-		String[] expectedRoles = { "simpleRoleName" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfRoles() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithArrayOfRoles";
-		String[] expectedRoles = { "firstRole", "secondRole", "thirdRole", "fourthRole", "fifthRole" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfSingleRoleComma() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithArrayOfSingleRoleComma";
-		String[] expectedRoles = { "firstRole, secondRole" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithSingleRoleComma() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithSingleRoleComma";
-		String[] expectedRoles = { "firstRole, secondRole" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithEmptyValue() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "requiredRoleWithEmptyValue";
-			String[] expectedRoles = { "" };
-			prepareMock(target, methodName, expectedRoles, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (AuthorizationException cause) {
-		}
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithEmptyArray() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "requiredRoleWithEmptyArray";
-			String[] expectedRoles = { "" };
-			prepareMock(target, methodName, expectedRoles, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (AuthorizationException cause) {
-		}
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfEmptyString() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "requiredRoleWithArrayOfEmptyString";
-			String[] expectedRoles = { "" };
-			prepareMock(target, methodName, expectedRoles, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (AuthorizationException cause) {
-		}
-	}
-
-	@Test
-	public void testManageClassNotAnnotedAtMethodNotAnnoted() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "methodNotAnnoted";
-			String[] expectedRoles = { "" };
-			prepareMock(target, methodName, expectedRoles, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (AuthorizationException cause) {
-		}
-	}
-
-	/*
-	 * Testing ClassAnnoted
-	 */
-	@Test
-	public void testManageClassAnnotedWithRequiredRoleAtWithoutRole() throws Exception {
-		Object target = new ClassAnnotedWithRequiredRole();
-		String methodName = "withoutRole";
-		String[] expectedRoles = { "classRole" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testManageClassAnnotedWithRequiredRoleAtRequiredRoleWithSingleRole() throws Exception {
-		Object target = new ClassAnnotedWithRequiredRole();
-		String methodName = "requiredRoleWithSingleRole";
-		String[] expectedRoles = { "simpleRoleName" };
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	/*
-	 * Other tests
-	 */
-
-	@Test
-	public void testDoesNotHaveSingleRole() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "requiredRoleWithSingleRole";
-			String[] expectedRoles = { "simpleRoleName" };
-			prepareMock(target, methodName, expectedRoles, false, true);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (AuthorizationException cause) {
-		}
-	}
-
-	@Test
-	public void testUserNotLoggedIn() throws Exception {
-		try {
-			Object target = new ClassNotAnnoted();
-			String methodName = "requiredRoleWithSingleRole";
-			String[] expectedRoles = { "simpleRoleName" };
-			prepareMock(target, methodName, expectedRoles, true, false);
-
-			interceptor.manage(this.ic);
-			fail();
-		} catch (NotLoggedInException cause) {
-		}
-	}
-
-	@Test
-	public void testDoesNotHaveOneOrMoreRolesOfArray() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithArrayOfRoles";
-		String[] expectedRoles = { "thirdRole", "fourthRole", "fifthRole" };
-
-		expect(this.securityContext.hasRole("firstRole")).andReturn(false);
-		expect(this.securityContext.hasRole("secondRole")).andReturn(false);
-
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-	@Test
-	public void testHasMoreRolesThenArray() throws Exception {
-		Object target = new ClassNotAnnoted();
-		String methodName = "requiredRoleWithArrayOfRoles";
-		String[] expectedRoles = { "thirdRole", "fourthRole", "fifthRole" };
-
-		expect(this.securityContext.hasRole("firstRole")).andReturn(false);
-		expect(this.securityContext.hasRole("secondRole")).andReturn(false);
-		expect(this.securityContext.hasRole("sixthRole")).andReturn(true);
-
-		prepareMock(target, methodName, expectedRoles, true, true);
-
-		interceptor.manage(this.ic);
-	}
-
-}
+//package br.gov.frameworkdemoiselle.internal.interceptor;
+//
+//import static org.easymock.EasyMock.expect;
+//import static org.junit.Assert.fail;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replay;
+//
+//import java.util.Locale;
+//
+//import javax.enterprise.inject.Instance;
+//import javax.interceptor.InvocationContext;
+//
+//import org.easymock.EasyMock;
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//import org.slf4j.Logger;
+//
+//import br.gov.frameworkdemoiselle.internal.implementation.CoreBundle;
+//import br.gov.frameworkdemoiselle.security.AuthorizationException;
+//import br.gov.frameworkdemoiselle.security.NotLoggedInException;
+//import br.gov.frameworkdemoiselle.security.RequiredRole;
+//import br.gov.frameworkdemoiselle.security.SecurityContext;
+//import br.gov.frameworkdemoiselle.security.User;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest(CoreBundle.class)
+//public class RequiredRoleInterceptorTest {
+//
+//	private RequiredRoleInterceptor interceptor;
+//
+//	private InvocationContext ic;
+//
+//	private SecurityContext securityContext;
+//
+//	class ClassNotAnnoted {
+//
+//		@RequiredRole("simpleRoleName")
+//		public void requiredRoleWithSingleRole() {
+//		}
+//
+//		@RequiredRole({ "firstRole", "secondRole", "thirdRole", "fourthRole", "fifthRole" })
+//		public void requiredRoleWithArrayOfRoles() {
+//		}
+//
+//		@RequiredRole({ "firstRole, secondRole" })
+//		public void requiredRoleWithArrayOfSingleRoleComma() {
+//		}
+//
+//		@RequiredRole("firstRole, secondRole")
+//		public void requiredRoleWithSingleRoleComma() {
+//		}
+//
+//		@RequiredRole("")
+//		public void requiredRoleWithEmptyValue() {
+//		}
+//
+//		@RequiredRole({})
+//		public void requiredRoleWithEmptyArray() {
+//		}
+//
+//		@RequiredRole({ "" })
+//		public void requiredRoleWithArrayOfEmptyString() {
+//		}
+//
+//		public void methodNotAnnoted() {
+//		}
+//	}
+//
+//	@RequiredRole("classRole")
+//	class ClassAnnotedWithRequiredRole {
+//
+//		public void withoutRole() {
+//		}
+//
+//		@RequiredRole("simpleRoleName")
+//		public void requiredRoleWithSingleRole() {
+//		}
+//	}
+//
+//	@Before
+//	public void setUp() throws Exception {
+//
+//		@SuppressWarnings("unchecked")
+//		Instance<SecurityContext> securityContextInstance = EasyMock.createMock(Instance.class);
+//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+//		Logger logger = EasyMock.createMock(Logger.class);
+//		User user = EasyMock.createMock(User.class);
+//
+//		this.securityContext = EasyMock.createMock(SecurityContext.class);
+//		this.ic = EasyMock.createMock(InvocationContext.class);
+//
+//		mockStatic(CoreBundle.class);
+//		expect(CoreBundle.get()).andReturn(bundle);
+//
+//		expect(user.getId()).andReturn("UserName").anyTimes();
+//		expect(this.securityContext.getUser()).andReturn(user).anyTimes();
+//		expect(securityContextInstance.get()).andReturn(securityContext).anyTimes();
+//		expect(this.ic.proceed()).andReturn(null);
+//		replay(securityContextInstance, user, CoreBundle.class);
+//
+//		this.interceptor = new RequiredRoleInterceptor(securityContextInstance, bundle, logger);
+//	}
+//
+//	private void prepareMock(Object target, String methodName, String[] expectedRoles, boolean hasHole,
+//			boolean isLoggedUser) throws Exception {
+//
+//		expect(this.securityContext.isLoggedIn()).andReturn(isLoggedUser).anyTimes();
+//
+//		for (String role : expectedRoles) {
+//			this.securityContext.hasRole(role);
+//			if (isLoggedUser) {
+//				EasyMock.expectLastCall().andReturn(hasHole);
+//			} else {
+//				EasyMock.expectLastCall().andThrow(new NotLoggedInException(""));
+//			}
+//		}
+//
+//		expect(this.ic.getTarget()).andReturn(target).anyTimes();
+//		expect(this.ic.getMethod()).andReturn(target.getClass().getMethod(methodName)).anyTimes();
+//		replay(this.ic, this.securityContext);
+//	}
+//
+//	/*
+//	 * Testing ClassNotAnnoted
+//	 */
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithSingleRole() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithSingleRole";
+//		String[] expectedRoles = { "simpleRoleName" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfRoles() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithArrayOfRoles";
+//		String[] expectedRoles = { "firstRole", "secondRole", "thirdRole", "fourthRole", "fifthRole" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfSingleRoleComma() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithArrayOfSingleRoleComma";
+//		String[] expectedRoles = { "firstRole, secondRole" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithSingleRoleComma() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithSingleRoleComma";
+//		String[] expectedRoles = { "firstRole, secondRole" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithEmptyValue() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "requiredRoleWithEmptyValue";
+//			String[] expectedRoles = { "" };
+//			prepareMock(target, methodName, expectedRoles, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (AuthorizationException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithEmptyArray() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "requiredRoleWithEmptyArray";
+//			String[] expectedRoles = { "" };
+//			prepareMock(target, methodName, expectedRoles, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (AuthorizationException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtRequiredRoleWithArrayOfEmptyString() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "requiredRoleWithArrayOfEmptyString";
+//			String[] expectedRoles = { "" };
+//			prepareMock(target, methodName, expectedRoles, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (AuthorizationException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testManageClassNotAnnotedAtMethodNotAnnoted() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "methodNotAnnoted";
+//			String[] expectedRoles = { "" };
+//			prepareMock(target, methodName, expectedRoles, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (AuthorizationException cause) {
+//		}
+//	}
+//
+//	/*
+//	 * Testing ClassAnnoted
+//	 */
+//	@Test
+//	public void testManageClassAnnotedWithRequiredRoleAtWithoutRole() throws Exception {
+//		Object target = new ClassAnnotedWithRequiredRole();
+//		String methodName = "withoutRole";
+//		String[] expectedRoles = { "classRole" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testManageClassAnnotedWithRequiredRoleAtRequiredRoleWithSingleRole() throws Exception {
+//		Object target = new ClassAnnotedWithRequiredRole();
+//		String methodName = "requiredRoleWithSingleRole";
+//		String[] expectedRoles = { "simpleRoleName" };
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	/*
+//	 * Other tests
+//	 */
+//
+//	@Test
+//	public void testDoesNotHaveSingleRole() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "requiredRoleWithSingleRole";
+//			String[] expectedRoles = { "simpleRoleName" };
+//			prepareMock(target, methodName, expectedRoles, false, true);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (AuthorizationException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testUserNotLoggedIn() throws Exception {
+//		try {
+//			Object target = new ClassNotAnnoted();
+//			String methodName = "requiredRoleWithSingleRole";
+//			String[] expectedRoles = { "simpleRoleName" };
+//			prepareMock(target, methodName, expectedRoles, true, false);
+//
+//			interceptor.manage(this.ic);
+//			fail();
+//		} catch (NotLoggedInException cause) {
+//		}
+//	}
+//
+//	@Test
+//	public void testDoesNotHaveOneOrMoreRolesOfArray() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithArrayOfRoles";
+//		String[] expectedRoles = { "thirdRole", "fourthRole", "fifthRole" };
+//
+//		expect(this.securityContext.hasRole("firstRole")).andReturn(false);
+//		expect(this.securityContext.hasRole("secondRole")).andReturn(false);
+//
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//	@Test
+//	public void testHasMoreRolesThenArray() throws Exception {
+//		Object target = new ClassNotAnnoted();
+//		String methodName = "requiredRoleWithArrayOfRoles";
+//		String[] expectedRoles = { "thirdRole", "fourthRole", "fifthRole" };
+//
+//		expect(this.securityContext.hasRole("firstRole")).andReturn(false);
+//		expect(this.securityContext.hasRole("secondRole")).andReturn(false);
+//		expect(this.securityContext.hasRole("sixthRole")).andReturn(true);
+//
+//		prepareMock(target, methodName, expectedRoles, true, true);
+//
+//		interceptor.manage(this.ic);
+//	}
+//
+//}
diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java
index e3680ad..f2f47ff 100644
--- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java
+++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java
@@ -1,134 +1,134 @@
-/*
- * 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 <http://www.gnu.org/licenses/>
- * 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 <http://www.gnu.org/licenses/>
- * 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.implementation;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.expect;
-import static org.powermock.api.easymock.PowerMock.createMock;
-import static org.powermock.api.easymock.PowerMock.expectLastCall;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.faces.context.ExceptionHandler;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.security.NotLoggedInException;
-import br.gov.frameworkdemoiselle.util.Beans;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Beans.class, CoreBundle.class })
-public class AuthenticationExceptionHandlerTest {
-
-	private AuthenticationExceptionHandler handler;
-
-	private ExceptionQueuedEventContext eventContext;
-
-	private Collection<ExceptionQueuedEvent> events;
-
-	@Before
-	public void setUp() {
-
-		mockStatic(Beans.class);
-
-		events = new ArrayList<ExceptionQueuedEvent>();
-		ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class);
-		handler = new AuthenticationExceptionHandler(jsfExceptionHandler);
-		eventContext = createMock(ExceptionQueuedEventContext.class);
-		ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class);
-		
-		expect(event.getSource()).andReturn(eventContext);
-		expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2);
-
-		events.add(event);
-		
-	}
-
-	@Test
-	public void testHandleNotLoggedInException() {
-
-		NotLoggedInException exception = new NotLoggedInException("");
-		
-		SecurityObserver observer = createMock(SecurityObserver.class);
-		expect(Beans.getReference(SecurityObserver.class)).andReturn(observer);
-		expect(eventContext.getException()).andReturn(exception);
-		
-		observer.redirectToLoginPage();
-		expectLastCall();
-
-		replayAll();
-
-		handler.handle();
-
-		assertTrue(events.isEmpty());
-
-		verifyAll();
-
-	}
-	
-	@Test
-	public void testHandleAnyException() {
-
-		Exception exception = new Exception();
-
-		expect(eventContext.getException()).andReturn(exception);
-
-		handler.getWrapped().handle();
-		expectLastCall();
-		
-		replayAll();
-
-		handler.handle();
-
-		assertFalse(events.isEmpty());
-
-		verifyAll();
-
-	}
-
-}
+///*
+// * 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 <http://www.gnu.org/licenses/>
+// * 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 <http://www.gnu.org/licenses/>
+// * 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.implementation;
+//
+//import static junit.framework.Assert.assertFalse;
+//import static junit.framework.Assert.assertTrue;
+//import static org.easymock.EasyMock.expect;
+//import static org.powermock.api.easymock.PowerMock.createMock;
+//import static org.powermock.api.easymock.PowerMock.expectLastCall;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replayAll;
+//import static org.powermock.api.easymock.PowerMock.verifyAll;
+//
+//import java.util.ArrayList;
+//import java.util.Collection;
+//
+//import javax.faces.context.ExceptionHandler;
+//import javax.faces.event.ExceptionQueuedEvent;
+//import javax.faces.event.ExceptionQueuedEventContext;
+//
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.security.NotLoggedInException;
+//import br.gov.frameworkdemoiselle.util.Beans;
+//
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({ Beans.class, CoreBundle.class })
+//public class AuthenticationExceptionHandlerTest {
+//
+//	private AuthenticationExceptionHandler handler;
+//
+//	private ExceptionQueuedEventContext eventContext;
+//
+//	private Collection<ExceptionQueuedEvent> events;
+//
+//	@Before
+//	public void setUp() {
+//
+//		mockStatic(Beans.class);
+//
+//		events = new ArrayList<ExceptionQueuedEvent>();
+//		ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class);
+//		handler = new AuthenticationExceptionHandler(jsfExceptionHandler);
+//		eventContext = createMock(ExceptionQueuedEventContext.class);
+//		ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class);
+//		
+//		expect(event.getSource()).andReturn(eventContext);
+//		expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2);
+//
+//		events.add(event);
+//		
+//	}
+//
+//	@Test
+//	public void testHandleNotLoggedInException() {
+//
+//		NotLoggedInException exception = new NotLoggedInException("");
+//		
+//		SecurityObserver observer = createMock(SecurityObserver.class);
+//		expect(Beans.getReference(SecurityObserver.class)).andReturn(observer);
+//		expect(eventContext.getException()).andReturn(exception);
+//		
+//		observer.redirectToLoginPage();
+//		expectLastCall();
+//
+//		replayAll();
+//
+//		handler.handle();
+//
+//		assertTrue(events.isEmpty());
+//
+//		verifyAll();
+//
+//	}
+//	
+//	@Test
+//	public void testHandleAnyException() {
+//
+//		Exception exception = new Exception();
+//
+//		expect(eventContext.getException()).andReturn(exception);
+//
+//		handler.getWrapped().handle();
+//		expectLastCall();
+//		
+//		replayAll();
+//
+//		handler.handle();
+//
+//		assertFalse(events.isEmpty());
+//
+//		verifyAll();
+//
+//	}
+//
+//}
diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java
index 8af3a74..d0291f0 100644
--- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java
+++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java
@@ -1,171 +1,171 @@
-/*
- * 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 <http://www.gnu.org/licenses/>
- * 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 <http://www.gnu.org/licenses/>
- * 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.implementation;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.expect;
-import static org.powermock.api.easymock.PowerMock.createMock;
-import static org.powermock.api.easymock.PowerMock.expectLastCall;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.PhaseId;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.security.AuthorizationException;
-import br.gov.frameworkdemoiselle.util.Faces;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ FacesContext.class,  CoreBundle.class, Faces.class })
-public class AuthorizationExceptionHandlerTest {
-
-	private AuthorizationExceptionHandler handler;
-
-	private ExceptionQueuedEventContext eventContext;
-
-	private Collection<ExceptionQueuedEvent> events;
-	
-	private FacesContext facesContext;
-
-	@Before
-	public void setUp() {
-		
-		mockStatic(FacesContext.class);
-
-		events = new ArrayList<ExceptionQueuedEvent>();
-		ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class);
-		handler = new AuthorizationExceptionHandler(jsfExceptionHandler);
-		eventContext = createMock(ExceptionQueuedEventContext.class);
-		ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class);
-		facesContext = PowerMock.createMock(FacesContext.class);
-
-		expect(event.getSource()).andReturn(eventContext);
-		events.add(event);
-		expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2);
-		expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes();
-
-
-	}
-
-	@Test
-	public void testHandleAnAuthorizationExceptionNotOnRenderResponse() {
-
-		mockStatic(Faces.class);
-		
-//		ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle"));
-		
-		AuthorizationException exception = new AuthorizationException("");
-		PhaseId phaseId = PowerMock.createMock(PhaseId.class);
-
-		expect(eventContext.getException()).andReturn(exception);
-		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
-		
-		Faces.addMessage(exception);
-		expectLastCall();
-
-		replayAll();
-
-		handler.handle();
-
-		assertTrue(events.isEmpty());
-
-		verifyAll();
-
-	}
-	
-	@Test
-	public void testHandleAnAuthorizationExceptionOnRenderResponse() {
-
-//		ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle"));
-		
-		AuthorizationException exception = new AuthorizationException("");
-		PhaseId phaseId = PhaseId.RENDER_RESPONSE;
-
-		expect(eventContext.getException()).andReturn(exception);
-		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
-		
-		handler.getWrapped().handle();
-		expectLastCall();
-
-		replayAll();
-
-		handler.handle();
-
-		assertFalse(events.isEmpty());
-
-		verifyAll();
-
-	}
-	
-	@Test
-	public void testHandleAnyException() {
-		
-		Exception exception = new Exception();
-		PhaseId phaseId = PowerMock.createMock(PhaseId.class);
-
-		expect(eventContext.getException()).andReturn(exception);
-		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
-
-		handler.getWrapped().handle();
-		expectLastCall();
-
-		replayAll();
-
-		handler.handle();
-
-		assertFalse(events.isEmpty());
-
-		verifyAll();
-		
-	}
-
-}
+///*
+// * 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 <http://www.gnu.org/licenses/>
+// * 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 <http://www.gnu.org/licenses/>
+// * 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.implementation;
+//
+//import static junit.framework.Assert.assertFalse;
+//import static junit.framework.Assert.assertTrue;
+//import static org.easymock.EasyMock.expect;
+//import static org.powermock.api.easymock.PowerMock.createMock;
+//import static org.powermock.api.easymock.PowerMock.expectLastCall;
+//import static org.powermock.api.easymock.PowerMock.mockStatic;
+//import static org.powermock.api.easymock.PowerMock.replayAll;
+//import static org.powermock.api.easymock.PowerMock.verifyAll;
+//
+//import java.util.ArrayList;
+//import java.util.Collection;
+//
+//import javax.faces.context.ExceptionHandler;
+//import javax.faces.context.FacesContext;
+//import javax.faces.event.ExceptionQueuedEvent;
+//import javax.faces.event.ExceptionQueuedEventContext;
+//import javax.faces.event.PhaseId;
+//
+//import org.junit.Before;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.powermock.api.easymock.PowerMock;
+//import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+//
+//import br.gov.frameworkdemoiselle.security.AuthorizationException;
+//import br.gov.frameworkdemoiselle.util.Faces;
+//
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({ FacesContext.class,  CoreBundle.class, Faces.class })
+//public class AuthorizationExceptionHandlerTest {
+//
+//	private AuthorizationExceptionHandler handler;
+//
+//	private ExceptionQueuedEventContext eventContext;
+//
+//	private Collection<ExceptionQueuedEvent> events;
+//	
+//	private FacesContext facesContext;
+//
+//	@Before
+//	public void setUp() {
+//		
+//		mockStatic(FacesContext.class);
+//
+//		events = new ArrayList<ExceptionQueuedEvent>();
+//		ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class);
+//		handler = new AuthorizationExceptionHandler(jsfExceptionHandler);
+//		eventContext = createMock(ExceptionQueuedEventContext.class);
+//		ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class);
+//		facesContext = PowerMock.createMock(FacesContext.class);
+//
+//		expect(event.getSource()).andReturn(eventContext);
+//		events.add(event);
+//		expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2);
+//		expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes();
+//
+//
+//	}
+//
+//	@Test
+//	public void testHandleAnAuthorizationExceptionNotOnRenderResponse() {
+//
+//		mockStatic(Faces.class);
+//		
+////		ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle"));
+//		
+//		AuthorizationException exception = new AuthorizationException("");
+//		PhaseId phaseId = PowerMock.createMock(PhaseId.class);
+//
+//		expect(eventContext.getException()).andReturn(exception);
+//		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
+//		
+//		Faces.addMessage(exception);
+//		expectLastCall();
+//
+//		replayAll();
+//
+//		handler.handle();
+//
+//		assertTrue(events.isEmpty());
+//
+//		verifyAll();
+//
+//	}
+//	
+//	@Test
+//	public void testHandleAnAuthorizationExceptionOnRenderResponse() {
+//
+////		ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle"));
+//		
+//		AuthorizationException exception = new AuthorizationException("");
+//		PhaseId phaseId = PhaseId.RENDER_RESPONSE;
+//
+//		expect(eventContext.getException()).andReturn(exception);
+//		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
+//		
+//		handler.getWrapped().handle();
+//		expectLastCall();
+//
+//		replayAll();
+//
+//		handler.handle();
+//
+//		assertFalse(events.isEmpty());
+//
+//		verifyAll();
+//
+//	}
+//	
+//	@Test
+//	public void testHandleAnyException() {
+//		
+//		Exception exception = new Exception();
+//		PhaseId phaseId = PowerMock.createMock(PhaseId.class);
+//
+//		expect(eventContext.getException()).andReturn(exception);
+//		expect(facesContext.getCurrentPhaseId()).andReturn(phaseId);
+//
+//		handler.getWrapped().handle();
+//		expectLastCall();
+//
+//		replayAll();
+//
+//		handler.handle();
+//
+//		assertFalse(events.isEmpty());
+//
+//		verifyAll();
+//		
+//	}
+//
+//}
--
libgit2 0.21.2