Merge branch '2.3' of https://github.com/demoiselle/framework into 2.3

eudes.andrade
2 parents 7be6e849 385f3b58
Showing 77 changed files with 5138 additions and 3276 deletions Show diff stats
archetype/jsf-jpa/src/main/resources/archetype-resources/src/test/resources/META-INF/persistence.xml
documentation/reference/pt-BR/authorgroup.xml
documentation/reference/pt-BR/configuracao.xml
documentation/reference/pt-BR/excecao.xml
documentation/reference/pt-BR/master.xml
documentation/reference/pt-BR/paginacao.xml
documentation/reference/pt-BR/properties.xml
documentation/reference/pt-BR/security.xml
documentation/reference/pt-BR/transacao.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Shutdown.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Startup.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractStrategyBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ApplicationLifecycleEvent.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AsbratctLifecycleBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AuthenticatorBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AuthorizerBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/BeforeApplicationFinalization.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/BeforeApplicationInitialization.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java
@@ -13,7 +13,7 @@
 			<property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
 			<property name="javax.persistence.jdbc.user" value="sa" />
 			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:hsql:." />
+			<property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:." />
  
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
@@ -34,4 +34,12 @@
 		<firstname>Wilson</firstname>
 		<surname>Guimarães</surname>
 	</author>
+	<author>
+		<firstname>Emerson</firstname>
+		<surname>Oliveira</surname>
+	</author>
+	<author>
+		<firstname>Luciano</firstname>
+		<surname>Borges</surname>
+	</author>	
 </authorgroup>
@@ -47,6 +47,25 @@
 	</section>
  
 	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de configuração no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.ConfigurationInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section> 
+	
+	<section>
 		<title>As classes de configuração</title>
 		<para>
 			A primeira etapa para a utilização do mecanismo de configuração em uma aplicação consiste em criar uma classe específica
@@ -11,6 +11,25 @@
 		Oferecemos à você uma alternativa para resolver estes problemas, mas você estará livre para usá-la: isoladamente,
 		misturando com a forma verbosa ou até mesmo não usá-la.
 	</para>
+	
+	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de exceção no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section>
  
 	<section>
 		<title>Tratadores de exceção</title>
@@ -41,7 +41,8 @@
 		<xi:include href="logger.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 		<xi:include href="templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 		<xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		<!-- <xi:include href="paginacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+		<xi:include href="paginacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<xi:include href="properties.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	</part>
 	<!-- parte 2 -->
 <!--	<part id="2">-->
@@ -52,4 +53,4 @@
 	<!-- apêndices -->
 	<xi:include href="instalacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
  
-</book>
 \ No newline at end of file
+</book>
@@ -3,202 +3,289 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
 <chapter id="paginacao">
  
-   <title>Paginação</title>
+   	<title>Paginação</title>
  
-   <para>
-      Neste capítulo serão considerados os seguintes assuntos:
-      <itemizedlist>
-         <listitem>motivação para o uso de um mecanismo padronizado para <emphasis>paginação</emphasis>;</listitem>
-         <listitem>funcionamento e uso da estrutura <literal>Pagination</literal> e do contexto de paginação (<literal>PaginationContext</literal>).</listitem>
-      </itemizedlist>
-   </para>
-
-   <section>
-      <title>Introdução ao mecanismo</title>
-      <para>
-         A apresentação de conjuntos de registros de médio a grande porte em formato de tabelas em aplicações Web geralmente requer um
-         <emphasis>mecanismo de paginação</emphasis>, o qual permite ao cliente ver apenas um pedaço do resultado final, podendo este
-         navegar para frente e para trás através dos registros. A menos que o conjunto de registros seja garantidamente pequeno, qualquer
-         aplicação do tipo Web com funcionalidades de busca precisa ser dotada de paginação.
-      </para>
-      <para>
-         O mecanismo de paginação para as aplicações fornecido pelo <emphasis>Demoiselle Framework</emphasis> consiste em um algoritmo de
-         direcionado ao banco de dados (i.e., Database-Driven Pagination). Essa abordagem, apesar de requerer instruções SQL específicas
-         para obter porções determinadas de registros, é a mais utilizada por ser mais eficiente e produzir menos redundância dos dados.
-      </para>
-      <para>
-         É fornecido em tempo de execução um <emphasis>contexto de paginação</emphasis>, o qual tem escopo de sessão e armazena a informação
-         de paginação de cada entidade (i.e., bean) que necessite de tal mecanismo. Esse contexto é compartilhado entre as diversas camadas
-         da aplicação, especificamente entre as camadas de visão e persistência. Dessa maneira, a paginação dos dados é transparente para a
-         camada intermediária (i.e., negócio) e não interfere na modelagem das classes de um projeto.
-      </para>
-   </section>
-
-   <section>
-      <title>Códigos de suporte</title>
-      <para>
-         // TODO: explicar Pagination e PaginationContext
-      </para>
-      <para>
-         Veremos na seção seguinte como implementar a paginação em uma aplicação Java.
- 
-  - Farão parte do código de suporte para paginação:
-      * a classe Pagination: usada para manipular a paginação dos dados resultantes, contendo os campos currentPage (página atual, selecionada na camada de visão), pageSize (tamanho da página, a quantidade de registros que ela comportará) e totalResults (a quantidade de resultados existentes na base de dados);
-      * a classe PaginationContext: contexto usado para armazenar e fornecer estruturas do tipo Pagination;
-      * a classe PaginationConfig: armazenador de configurações referentes à paginação.
-         
-- Códigos internos de suporte no Core:
-
-      <programlisting role="JAVA"><![CDATA[
-
-public class Pagination {
-
-    private int currentPage;
-    private int pageSize;
-
-    private Long totalResults;
-    private Integer totalPages;
-
-    // ...
-}
-
-@SessionScoped
-public class PaginationContext {
-
-    private final Map<Class<?>, Pagination> map;
-
-    public Pagination getPagination(Class<?> clazz) { ... }
-
-    public Pagination getPagination(Class<?> clazz, boolean create) { ... }
-
-}
-
-@Configuration
-public class PaginationConfig {
-
-    @Key("default_page_size")
-    private int defaultPageSize = 10;
-
-    @Key("max_page_links")
-    private int maxPageLinks = 5;
-
-}
-
-    - Códigos internos de suporte em JPA:
-
-public class JPACrud<T, I> implements Crud<T, I> {
-
-    @Inject
-    private PaginationContext paginationContext;
-
-    // ...
-
-    public List<T> findAll() {
-
-        final String jpql = "select this from " + getBeanClass().getSimpleName() + " this";
-        final Query query = getEntityManager().createQuery(jpql);
-        
-        final Pagination pagination = paginationContext.getPagination(getBeanClass());
-        if (pagination != null) {
-            if (pagination.getTotalPages() == null) {
-                pagination.setTotalResults(this.countAll());
-            }
-            query.setFirstResult(pagination.getFirstResult());
-            query.setMaxResults(pagination.getPageSize());
-        }
-
-        // ...
-    }
-
-}
-
-    - Códigos internos de suporte em JSF:
-
-public abstract class AbstractListPageBean<T, I> extends AbstractPage implements ListPageBean<T, I> {
-
-    @Inject
-    private PaginationContext paginationContext;
-
-    @Inject
-    private PaginationConfig paginationConfig;
-
-    // ...
-
-    public Pagination getPagination() {
-        return paginationContext.getPagination(getBeanClass(), true);
-    }
-
-    public int getPageSize() {
-        return paginationConfig.getDefaultPageSize();
-    }
-
-    public int getMaxPageLinks() {
-        return paginationConfig.getMaxPageLinks();
-    }
-
-}
-
-frameworkdemoiselle.pagination.default_page_size=50
-frameworkdemoiselle.pagination.max_page_links=10
-         
-]]></programlisting>
-      </para>
-   </section>
+   	<para>
+      	Neste capítulo serão considerados os seguintes assuntos:
+      	<itemizedlist>
+         	<listitem><para>Motivação para o uso de um mecanismo padronizado para <emphasis>paginação</emphasis>;</para></listitem>
+         	<listitem><para>Funcionamento e uso da estrutura <literal>Pagination</literal> e do contexto de paginação 
+         	(<literal>PaginationContext</literal>).</para></listitem>
+      	</itemizedlist>
+   	</para>
+
+   	<section>
+      	<title>Introdução ao mecanismo</title>
+      	<para>
+         	A apresentação de conjuntos de registros de médio a grande porte em formato de tabelas em aplicações Web geralmente requer um
+         	<emphasis>mecanismo de paginação</emphasis>, o qual permite ao cliente ver apenas um pedaço do resultado final, podendo este
+         	navegar para frente e para trás através dos registros. A menos que o conjunto de registros seja garantidamente pequeno, qualquer
+         	aplicação do tipo Web com funcionalidades de busca precisa ser dotada de paginação.
+      	</para>
+      	<para>
+         	O mecanismo de paginação para as aplicações fornecido pelo <emphasis>Demoiselle Framework</emphasis> consiste em um algoritmo
+         	direcionado ao banco de dados (i.e., Database-Driven Pagination). Essa abordagem, apesar de requerer instruções SQL específicas
+         	para obter porções determinadas de registros, é a mais utilizada por ser mais eficiente e produzir menos redundância de dados, 
+         	diminuindo assim tráfego de rede, consumo de memória e reduzindo o tempo de resposta.
+      	</para>
+      	<para>
+         	É fornecido em tempo de execução um <emphasis>contexto de paginação</emphasis>, o qual tem escopo de sessão e armazena a informação
+         	de paginação de cada entidade (i.e., bean) que necessite de tal mecanismo. Esse contexto é compartilhado entre as diversas camadas
+         	da aplicação, especificamente entre as camadas de visão e persistência. Dessa maneira, a paginação dos dados é transparente para a
+         	camada intermediária (i.e., negócio) e não interfere na modelagem das classes de um projeto.
+      	</para>
+   	</section>
+
+   	<section>
+      	<title>Códigos de suporte</title>
+	     <!-- 
+	      <para>
+	         // TODO: explicar Pagination e PaginationContext
+	      </para>
+	      --> 
+      	<para>
+      		O <emphasis>mecanismo de paginação</emphasis> do <emphasis>Demoiselle Framework</emphasis> permite que os parâmetros para a consulta 
+      		no banco sejam configurados de forma bastante prática. Por outro lado, a consulta paginada ao banco já é feita pela extensão 
+      		<literal>demoiselle-jpa</literal>. Dessa forma, basta ajustar os parametros da paginação, e pedir as consultas normalmente. 
+      		O resultado da consulta é então passado para algum componente de iteração de dados com suporte ao mecanismo conhecido como <emphasis>Lazy 
+      		Load</emphasis> (ou <emphasis>Lazy Loading</emphasis>).
+      	</para>
+      	<para> 
+      		Farão parte do código de suporte para paginação:
+      		<itemizedlist>
+      			<listitem>
+      				<para>
+      					A classe <literal>Pagination</literal>: usada para manipular a paginação dos dados resultantes, contendo os campos <literal>currentPage</literal>
+      					(página atual, selecionada na camada de visão), <literal>pageSize</literal> (tamanho da página, a quantidade de registros que ela comportará) 
+      					e <literal>totalResults</literal> (a quantidade de resultados existentes na base de dados);
+      				</para>
+      			</listitem>  
+      			<listitem> 
+      				<para>		
+      					A classe <literal>PaginationContext</literal>: contexto usado para armazenar e fornecer estruturas do tipo <literal>Pagination</literal>;
+      				</para>
+      			</listitem>
+      			<listitem>
+      				<para>
+      					A classe <literal>PaginationConfig</literal>: armazenador de configurações referentes à paginação.
+      				</para>
+      			</listitem>
+      		</itemizedlist>
+      	</para>
+  	  
+  	  	<para>Códigos internos de suporte no Core:</para>      
+
+      	<programlisting role="JAVA"><![CDATA[
+			public class Pagination {
+			
+			    private int currentPage;
+			    private int pageSize;
+			
+			    private Long totalResults;
+			    private Integer totalPages;
+			
+			    // ...
+			}
+			
+			@SessionScoped
+			public class PaginationContext {
+			
+			    private final Map<Class<?>, Pagination> map;
+			
+			    public Pagination getPagination(Class<?> clazz) { ... }
+			
+			    public Pagination get -->Pagination(Class<?> clazz, boolean create) { ... }
+			
+			}
+			
+			@Configuration
+			public class PaginationConfig {
+			
+			    @Key("default_page_size")
+			    private int defaultPageSize = 10;
+			
+			    @Key("max_page_links")
+			    private int maxPageLinks = 5;
+			
+			}
+	  	]]></programlisting>
+
+      	<para>Códigos internos de suporte em JPA:</para>
+
+		  <programlisting role="JAVA"><![CDATA[
+			public class JPACrud<T, I> implements Crud<T, I> {
+			
+			    @Inject
+			    private PaginationContext paginationContext;
+			
+			    // ...
+			
+			    public List<T> findAll() {
+			
+			    	final String jpql = "select this from " + getBeanClass().getSimpleName() + " this";
+			    	final Query query = getEntityManager().createQuery(jpql);
+			        
+			    	final Pagination pagination = paginationContext.getPagination(getBeanClass());
+			        if (pagination != null) {
+			            if (pagination.getTotalPages() == null) {
+			                pagination.setTotalResults(this.countAll());
+			            }
+			            query.setFirstResult(pagination.getFirstResult());
+			            query.setMaxResults(pagination.getPageSize());
+			        }
+			
+			        // ...
+			    }
+			
+			}
+	  	]]></programlisting>	
+
+      	<para>Códigos internos de suporte em JSF:</para>
+    
+		<programlisting role="JAVA"><![CDATA[
+			public abstract class AbstractListPageBean<T, I> extends AbstractPage 
+					implements ListPageBean<T, I> {
+			
+			    @Inject
+			    private PaginationContext paginationContext;
+			
+			    @Inject
+			    private PaginationConfig paginationConfig;
+			
+			    // ...
+			
+			    public Pagination getPagination() {
+			        return paginationContext.getPagination(getBeanClass(), true);
+			    }
+			
+			    public int getPageSize() {
+			        return paginationConfig.getDefaultPageSize();
+			    }
+			
+			    public int getMaxPageLinks() {
+			        return paginationConfig.getMaxPageLinks();
+			    }
+			
+			}         
+	  	]]></programlisting>
+   	</section>
  
-   <section>
-      <title>Implementação na aplicação</title>
-      <!-- 
-      <para>
-         A fim de utilizar o mecanismo inerente do <emphasis>Demoiselle Framework</emphasis>, é preciso simplesmente anotar os métodos
-         contendo as instruções desejadas com <literal>@Startup</literal>, para a <emphasis>inicialização</emphasis>, ou
-         <literal>@Shutdown</literal>, para a <emphasis>finalização</emphasis>.
-      </para>
-      <tip>
-         <para>
-            O mecanismo de inicialização do <emphasis>Demoiselle Framework</emphasis> é independente da natureza da aplicação Java, isto é,
-            visa tanto aplicações do tipo Web quanto do tipo desktop (ex: Swing).
-         </para>
-      </tip>
-      <para>
-         As instruções contidas em um método anotado com <literal>@Startup</literal> serão executadas automaticamente quando a aplicação
-         Java for inicializada, seja ela hospedada em um contêiner Web ou executada através de um método <literal>main()</literal>.
-         Nenhum outro arquivo ou classe precisa ser definido. A anotação <literal>@Startup</literal> permite a indicação do argumento
-         <literal>priority</literal>, um número inteiro que serve para definir a prioridade de execução do respectivo método na existência
-         de mais de um inicializador para a aplicação.
-      </para>
-      <para>
-         De maneira análoga, um método anotado com <literal>@Shutdown</literal> será executado no momento de finalização de uma aplicação,
-         obedecendo também à ordem de prioridade definida com o argumento <literal>priority</literal>.
-      </para>
-       -->
-      <para>
-         Eis um exemplo de implementação de paginação em uma aplicação:
-      </para>
-      <programlisting role="JAVA"><![CDATA[
-    @Inject
-	private PaginationContext paginationContext;
-]]></programlisting>
-      <programlisting role="JAVA"><![CDATA[
-    Pagination pagination = paginationContext.getPagination(Audit.class);
-]]></programlisting>
-      <tip>
-         <para>
-         	O método <literal>getPagination()</literal> do contexto <literal>PaginationContext</literal> é sobrecarregado, podendo aceitar
-         	os seguintes argumentos: <literal>Class</literal> ou <literal>Class</literal> e <literal>boolean</literal>.
-         </para>
-      </tip>
-      <note>
-         <para>
-            A JPA 2.0, através da Query API, suporta controle de paginação independente de fornecedor de banco de dados.
-            Para controlar a paginação, a interface <literal>Query</literal> define os métodos <literal>setFirstResult()</literal> e
-            <literal>setMaxResults()</literal> para especificar o primeiro resultado a ser recebido e o número máximo de resultados a
-            serem retornados em relação àquele ponto. Internamente, são usadas instruções específicas do SGBD (ex: LIMIT e OFFSET no
-            PostgreSQL).
-         </para>
-      </note>
+   	<section>
+   		<title>Implementação na aplicação</title>
+      	<para>
+         	Veremos nessa seção como implementar a paginação em uma aplicação Java. Para esse exmplo tomamos como base a aplicação de Bookmarks 
+         	fornecida pelo arquétipo <emphasis>JSF com JPA</emphasis> do <emphasis>Demoiselle Framework</emphasis> (para maiores detalhes 
+         	ver <link linkend="estrutura">Arquétipos</link>). Iremos utilizar o componente <literal>DataTable</literal> do <emphasis>PrimeFaces</emphasis>,
+         	que oferece o mecanismo de <emphasis>Lazy Loading</emphasis> conhecido como <literal>LazyDataModel</literal>, muito útil para paginação 
+         	e classificação de dados.
+      	</para>
+      	<para>
+         	Primeiro é preciso configurar um objeto <literal>LazyDataModel</literal> no construtor do <emphasis>Managed Bean</emphasis> 
+         	(<emphasis>BookmarkList</emphasis> nesse exemplo): instancia-lo e sobrescrever o método abstrado <literal>load</literal>, que recebe
+         	vários argumentos. Esses argumentos são recuperados na página <literal>jsf</literal> que carrega a instância do objeto <literal>LazyDataModel</literal>.
+      	</para>
+      	<para>
+      		Dentro do método <literal>load</literal> iremos pegar do contexto de paginação uma instância da implementação da interface <literal>Pagination</literal>
+      		e ajustar alguns dos seus parâmetros para: indicar a partir de qual item a paginação deve iniciar, e o tamanho (quantidade de itens) de cada página.
+      		Esses dados são usados no método  <literal>findAll()</literal>, da classe <literal>JPACrud</literal> (extensão JPA), que utiliza o contexto de 
+      		paginação para pegar os parametros e fazer a consulta no banco buscando apenas os itens que estão dentro da pagina que o parametro 
+      		<literal>first</literal> indicar. O resultado é passado para a instancia do <literal>LazyDataModel</literal>, que é responsável por exibir 
+      		os dados de forma apropriada.
+      	</para>
+      	<para>
+      		À classe <emphasis>BookmarkList</emphasis> devem ser adicionados os seguintes trechos de código: 
+      	</para>
+      	
+      	<programlisting role="JAVA"><![CDATA[
+    		// ...
+    		import java.util.Map;
+    		import br.gov.frameworkdemoiselle.pagination.Pagination;
+    		
+    		// ...
+    		private LazyDataModel<Bookmark> lazyModel;
+
+			public BookmarkListMB() {
+				lazyModel = new LazyDataModel<Bookmark>() {
+
+					@Override
+					public List<Bookmark> load (int first, int pageSize, String sortField, 
+							SortOrder sortOrder, Map<String, String> filters){
+				
+						Pagination pagination = getPagination();
+						pagination.setPageSize(pageSize);
+						pagination.setFirstResult(first);
+
+						List<Bookmark> itemsList = bc.findAll();
+				
+						lazyModel.setRowCount(pagination.getTotalResults());
+				
+						return itemsList;
+					}
+				};
+			}
+    		
+    		// ...
+    		
+    		public LazyDataModel<Bookmark> getLazyModel() {
+				return lazyModel;
+			}
+			
+			// ...
+		]]></programlisting>
+		
+		<para>
+			No arquivo <literal>messages.properties</literal> adicione as linhas:
+		</para>		
+      	
+      	<programlisting role="JAVA"><![CDATA[
+      		page.first=0
+   	 		page.rows=4
+			page.max.links=3
+		]]></programlisting>
+      	
+      	<para>
+      		Na página JSF <literal>bookmark_list.xhtml</literal>, substitua a linha:
+      	</para>
+      	
+      	<programlisting role="JAVA"><![CDATA[
+   	 		<p:dataTable id="list" var="bean" value="#{bookmarkListMB.resultList}">
+		]]></programlisting>
+		
+		<para>
+			por:
+		</para>
+		
+		<programlisting role="JAVA"><![CDATA[
+   	 		<p:dataTable id="list" var="bean" 
+				value="#{bookmarkListMB.lazyModel}" lazy="true" paginator="true" 
+				first="#{messages['page.first']}" rows="#{messages['page.rows']}"
+				pageLinks="#{messages['page.max.links']}">
+		]]></programlisting>
+		
+		<para>
+			Com essas alterações simples, a aplicação Bookmarks passa a utilizar o mecanismo de paginação oferecido pelo <emphasis>Demoiselle Framework</emphasis>.
+		</para>
+		
+      	<tip>
+         	<para>
+         		O método <literal>getPagination()</literal> do contexto <literal>PaginationContext</literal> é sobrecarregado, podendo aceitar
+         		os seguintes argumentos: <literal>Class</literal> ou <literal>Class</literal> e <literal>boolean</literal>.
+         	</para>
+      	</tip>
+      	<note>
+         	<para>
+            	A JPA 2.0, através da Query API, suporta controle de paginação independente de fornecedor de banco de dados.
+            	Para controlar a paginação, a interface <literal>Query</literal> define os métodos <literal>setFirstResult()</literal> e
+            	<literal>setMaxResults()</literal> para especificar o primeiro resultado a ser recebido e o número máximo de resultados a
+            	serem retornados em relação àquele ponto. Internamente, são usadas instruções específicas do SGBD (ex: LIMIT e OFFSET no
+            	PostgreSQL).
+         	</para>
+      	</note>
    </section>
  
-   <section>
+</chapter>
+   
+<!--<section>
       <title>Um exemplo usando PrimeFaces</title>
       <para>
          Eis um interessante caso de uso de paginação: ????.
@@ -259,7 +346,8 @@ public class AuditMB extends AbstractListPageBean&lt;Audit, Long&gt; {
     value="#{auditMB.lazyModel}" lazy="true" paginator="true"
     rows="#{auditMB.pageSize}" pageLinks="#{auditMB.maxPageLinks}">]]></programlisting>
    </section>
-
+    -->
+<!--  
    <section>
       <title>Referências</title>
       <itemizedlist>
@@ -267,8 +355,8 @@ public class AuditMB extends AbstractListPageBean&lt;Audit, Long&gt; {
          <listitem>Implementing Search Result Pagination in a Web Application (http://www.developer.com/java/other/article.php/3696226/)</listitem>
          <listitem>A Pagination Technique Using Spring (http://www.developer.com/java/web/article.php/10935_3830886_1/)</listitem>
          <listitem>Spring JDBC Pagination Tutorial (http://www.codefutures.com/tutorials/spring-pagination/)</listitem>
-         <listitem>PrimeFaces DataTable - Lazy Loading (http://www.primefaces.org/showcase/ui/datatableLazy.jsf)</listitem>
+         <listitem>PrimeFaces DataTable - Lazy Loading (http://www.primefaces.org/showcase/ui/datatableLazy.jsf)</listitem> 
       </itemizedlist>
    </section>
-   
-</chapter>
+   -->
+
@@ -0,0 +1,188 @@
+<?xml version='1.0' encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"  [ ]>
+<chapter id="properties">
+
+	<title>Demoiselle Properties</title>
+	
+	<para>
+		Em um projeto com o <emphasis>Demoiselle Framework</emphasis>, algumas propriedades e configurações 
+		do <emphasis>Framework</emphasis> podem ser ajustadas no arquivo <literal>demoiselle.properties</literal>. 
+		Além disso, a partir da versão 2.3.0 também é nesse arquivo que devem ser definidas as estratégias de 
+		<emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>.
+	</para>
+	<para>
+		A seguir listamos as propriedades e configurações do <emphasis>Demoiselle Framework</emphasis> que o usuário pode modificar,
+		acompanhados de alguns exemplos ilustrativos. Também mostraremos como escolher as estratégias para
+		<emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>, oferecidas pelo
+		<emphasis>Demoiselle</emphasis>.
+	</para>	
+		
+	<section>
+		<title>Configurações do Core</title>
+		<para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.pagination.page.size</literal> - Configura o número de linhas que será 
+						exibido na grade de uma página. Por padrão, esse número é 10.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.pagination.page.size = 15</literal>, ajusta em 15
+						a quantidade de linhas em uma grade
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.pagination.max.page.links</literal> - Configura a quantidade de links que 
+						será exibido em uma página. Por padrão, esse valor é 5.    
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.pagination.max.page.links = 20</literal>, configura em 20
+						o número de links que podem ser exibidos em uma página.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.enabled</literal> - Configura a habilitação das funcionalidades do 
+						<emphasis>Demoiselle</emphasis> relacionadas a segurança (como autenticação de usuário e verificação de
+						permissão de acesso à recursos). Por padrão, essas funcionalidades ficam habilitadas.   						
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.security.enabled = false</literal>, desabilita as 
+						funcionalidades de segurança do <emphasis>Demoiselle</emphasis>. 
+					</para>
+				</listitem>
+			</itemizedlist>
+		</para>
+	</section>	
+	
+	<section>
+		<title>Configurações da extensão JSF</title>
+		<para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.login.page</literal> - Configura a página de login. Por padrão, a página 
+						configurada é <emphasis>“/login”</emphasis>.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.security.login.page = “/inicial”</literal>, configura a 
+						página <emphasis>“/inicial”</emphasis> como a página de login.
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.redirect.after.login</literal> - Configura a página que será acessada após 
+						o login. Por padrão, a página configurada é <emphasis>“/index”</emphasis>.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.after.login = "/menu"</literal>, configura 
+						a página <emphasis>“/menu”</emphasis> para ser acessada no redirecionamento após o login do usuário.						 
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.redirect.after.logout</literal> - Configura a página para a qual a aplicação 
+						será direcionada após o logout do usuário. Por padrão, a página configurada é <emphasis>“/login”</emphasis>.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.after.logout = "/index"</literal>, configura
+						a página "/index" para ser acessada no redirecionamento após o logout do usuário.
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.redirect.enebled</literal> - Configura a habilitação do redirecionamento da página
+						após <emphasis>login</emphasis> e <emphasis>logout</emphasis>. Por padrão, o valor dessa propriedade é <emphasis>true</emphasis>.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.enebled = false</literal>, desabilita os 
+						redirecionamentos de páginas após <emphasis>login</emphasis> e <emphasis>logout</emphasis>.
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.handle.application.exception</literal> - Define se a extensão vai capturar ou não alguma exceção 
+						lançada pela aplicação. Por padrão, essa configuração vem marcada como “true”, que diz para a extensão capturar a exceção.
+					</para>
+					<para>
+						Exemplo de configuração: <emphasis>frameworkdemoiselle.handle.application.exception = false</emphasis>, desabilita a captura
+						de exceções lançadas pela aplicação.  
+					</para>
+				</listitem>
+				
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.handle.aplication.exception.page</literal> - Configura a página para a qual a aplicação será 
+						direcionada em caso de exceção. Por padrão, a página configurada é <emphasis>“/application_error”</emphasis>.
+					</para>
+					<para>
+						Exemplo de configuração: <emphasis>framework.handle.aplication.exception.page = “/exception_x_page”</emphasis>, redireciona a 
+						aplicação para a página <emphasis>/exception_x_page</emphasis> caso ocorra alguma exceção.
+					</para>
+				</listitem>
+			</itemizedlist>
+		</para>
+	</section>
+	
+	<section>
+		<title>Configurações da Extensão JPA</title>
+		<para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.persistence.unit.name</literal> - Quando é definida mais de uma unidade de persitencia 
+						no arquivo <literal>persistence.xml</literal>, muitas vezes é conveniente escolher uma unidade padrão, ao invés de 
+						definir as unidades	individualmente em cada <emphasis>Entity Manager</emphasis>. Esse parametro é utilizado para 
+						indicar qual é a unidade de persistência que deve ser utilizada quando no <emphasis>Entity Manager</emphasis> não 
+						houver essa definição.
+					</para>
+					<para>
+						Exemplo de configuração: <literal>frameworkdemoiselle.persistence.unit.name = database1-ds</literal>, configura a 
+						unidade de persistencia <literal>database1-ds</literal> como padrão da aplicação.   
+					</para>
+				</listitem>
+			</itemizedlist>
+		</para>
+	</section>
+	
+	<section>
+		<title>Escolhendo Estratégias</title>
+		<para>
+			Para escolher as estratégias de <emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>
+			devem ser configuradas as propriedades: <literal>frameworkdemoiselle.transaction.class</literal>, 
+			<literal>frameworkdemoiselle.security.authorizer.class</literal> e <literal>frameworkdemoiselle.security.authenticator.class</literal>
+			, respectivamente.
+		</para>
+		<para>
+			Para utilizar as estratégias fornecidas pelo próprio <emphasis>Framework Demoiselle</emphasis>, você deve configurar essas 
+			propriedades da seguinte forma:
+			<itemizedlist>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.transaction.class = br.gov.frameworkdemoiselle.transaction.JPATransaction</literal>, 
+						para transações <emphasis>JPA</emphasis>, e <literal>frameworkdemoiselle.transaction.class = 
+						br.gov.frameworkdemoiselle.transaction.JTATransaction</literal>, para transações <emphasis>JTA</emphasis>;
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.authorizer.class = br.gov.serpro.inscricao.security.Autorizador</literal>;
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<literal>frameworkdemoiselle.security.authenticator.class = br.gov.serpro.inscricao.security.Autenticador</literal>.
+					</para>
+				</listitem>
+			</itemizedlist>
+		As instruções para você construir e utilizar sua própria estratégia estãodescritas nos capítulos <link linkend="transacao">Transação</link> 
+		e <link linkend="security">Segurança</link>.
+		</para>
+	</section>
+</chapter>
@@ -18,6 +18,26 @@
 	</para>
  
 	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir od interceptadores de segurança no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor</class>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section> 
+	
+	<section>
 		<title>Autenticação</title>
 		<para>
 			O mecanismo de autenticação busca verificar a identidade do usuário de um sistema. A forma mais conhecida, e comum,
@@ -201,20 +221,12 @@ public class MeuAuthorizer implements Authorizer {
  
 }]]></programlisting>
 		<para>
-			Feito isso deve-se definir no arquivo META-INF/beans.xml, as classes criadas:
+			Feito isso deve-se definir no arquivo <filename>demoiselle.properties</filename>, as classes criadas:
 		</para>
-		<programlisting role="XML"><![CDATA[<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	                       http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-
-	<alternatives> 
-		<class>projeto.MeuAuthenticator</class> 
-		<class>projeto.MeuAuthorizer</class> 
-	</alternatives> 
-
-</beans>]]></programlisting>
+		<programlisting>
+			frameworkdemoiselle.security.authenticator.class=projeto.MeuAuthenticator 
+			frameworkdemoiselle.security.authorizer.class=projeto.MeuAuthorizer 
+		</programlisting>
 		<para>
 			À partir desse momento, a aplicação já possui uma implementação de segurança definida.		
 		</para>
@@ -22,6 +22,25 @@
 		Neste capítulo apresentaremos para você como usar a nossa solução de controle de transação, as estratégias
 		prontas que oferecemos e a criação de sua própria estratégia.   
     </para>
+    
+    <section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de transação no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section>
  
 	<section>
 		<title>Métodos transacionais</title>
@@ -99,19 +118,11 @@ public class AbacaxiException {
 		</para>
 		<para>
 			A transação JPA é simples de configurar e não exige nenhum recurso externo à sua aplicação.
-			Basta definir no arquivo <filename>META-INF/beans.xml</filename> a seguinte configuração:
+			Basta definir no arquivo <filename>demoiselle.properties</filename> a seguinte configuração:
 		</para>
-		<programlisting role="XML"><![CDATA[<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	                       http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-
-	<alternatives>
-		<class>br.gov.frameworkdemoiselle.transaction.JPATransaction</class>
-	</alternatives>
-
-</beans>]]></programlisting>
+		<programlisting>
+			frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JPATransaction
+		</programlisting>
 	<tip><para> Caso não esteja utilizando o arquétipo JSF-JPA fornecidos pelo Demoiselle, confira se a dependência para a 
 	extensão está indicada corretamente no arquivo POM.XML.</para>  
 	 <programlisting role="XML"><![CDATA[<dependency>
@@ -132,23 +143,13 @@ public class AbacaxiException {
 		<para>
 			A estratégia JTA não serve apenas para persistência em banco de dados, serve também para integrar com
 			tecnologias que façam acesso ao contexto JTA, como é o caso do EJB. Para ativar esta estratégia defina no
-			arquivo <filename>META-INF/beans.xml</filename> a seguinte configuração:
+			arquivo <filename>demoiselle.properties</filename> a seguinte configuração:
 		</para>
-		<programlisting role="XML"><![CDATA[<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	                       http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-
-	<alternatives>
-		<class>br.gov.frameworkdemoiselle.transaction.JTATransaction</class>
-	</alternatives>
-
-</beans>]]></programlisting>
+		<programlisting>frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JTATransaction</programlisting>
 		<para>
 			Feito isto, o controle transacional será delegado para a transação acessível via JNDI com o nome
 			<literal>UserTransaction</literal>. A estratégia acessa o objeto da seguinte maneira:
-			<literal>context.lookup("UserTransaction")</literal>. Portanto, para você utilizar esta estratégia,
+			<literal>Beans.getReference(UserTransaction.class)</literal>. Portanto, para você utilizar esta estratégia,
 			você precisa de um container JEE ou de um servidor JTA qualquer.
 		</para>
 		<para>
@@ -156,18 +157,20 @@ public class AbacaxiException {
 			JTA gerenciada. Veja um exemplo utilizando o servidor de aplicações JBoss-AS6 e com o provider Hibernate (embutido no JBoss-AS) como implementação JPA:
 		</para>
 		<programlisting role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
-             xmlns="http://java.sun.com/xml/ns/persistence"
+<persistence version="2.0" 
+             xmlns="http://java.sun.com/xml/ns/persistence" 
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	         xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-	                             http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+	         xsi:schemaLocation="http://java.sun.com/xml/ns/persistence 
+	         http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
  
-	<persistence-unit name="contactlist-ds">
-		<jta-data-source>java:/DefaultDS</jta-data-source>
+	<persistence-unit name="bookmark-ds" transaction-type="JTA">
+		<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
 		<properties>
-			<property name="hibernate.transaction.factory_class"
-			          value="org.hibernate.transaction.JTATransactionFactory" />
-			<property name="jta.UserTransaction" value="UserTransaction" />
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="update" />
+			<property name="hibernate.transaction.jta.platform" 
+			value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
 		</properties>
 	</persistence-unit>
 </persistence>]]></programlisting>
@@ -221,19 +224,11 @@ public class MegaTransaction implements Transaction {
 }
 ]]></programlisting>
 		<para>
-			Basta agora definir no arquivo <filename>META-INF/beans.xml</filename> a sua estratégia:
+			Basta agora definir no arquivo <filename>demoiselle.properties</filename> a sua estratégia:
 		</para>
-		<programlisting role="XML"><![CDATA[<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	                       http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-
-	<alternatives>
-		<class>projeto.MegaTransaction</class>
-	</alternatives>
-
-</beans>]]></programlisting>
+		<programlisting>
+			frameworkdemoiselle.transaction.class=projeto.MegaTransaction
+		</programlisting>
 	</section>
  
 </chapter>
@@ -0,0 +1,66 @@
+/*
+ * 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.annotation;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * @author SERPRO
+ */
+@Target(METHOD)
+@Retention(RUNTIME)
+public @interface Priority {
+
+	/**
+	 * Most important priority value.
+	 */
+	public static int MAX_PRIORITY = Integer.MIN_VALUE;
+
+	/**
+	 * Less important priority value.
+	 */
+	public static int MIN_PRIORITY = Integer.MAX_VALUE;
+
+	/**
+	 * An integer value defines the priority order.
+	 */
+	int value();
+}
@@ -52,7 +52,8 @@ import java.lang.annotation.Target;
  * <pre>
  * public class Finalizer {
  * 
- * 	&#064;Shutdown(priority = 5)
+ * 	&#064;Shutdown
+ * 	&#064;Priority(5)
  *    public void finalize() {
  *       ...
  *    }
@@ -60,6 +61,7 @@ import java.lang.annotation.Target;
  * 
  * 
  * 
+ * 
  * </pre>
  * 
  * </blockquote>
@@ -75,17 +77,29 @@ public @interface Shutdown {
  
 	/**
 	 * Most important priority value.
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	public static int MAX_PRIORITY = Integer.MIN_VALUE;
  
 	/**
 	 * Less important priority value.
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	public static int MIN_PRIORITY = Integer.MAX_VALUE;
  
 	/**
 	 * An integer value defines method execution order (i.e., priority).
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	int priority() default MIN_PRIORITY;
  
 }
@@ -52,13 +52,16 @@ import java.lang.annotation.Target;
  * <pre>
  * public class Initializer {
  * 
- * 	&#064;Startup(priority = 1)
+ * 	&#064;Startup
+ * 	&#064;Priority(1)
  *    public void initialize() {
  *       ...
  *    }
  * }
  * 
  * 
+ * 
+ * 
  * </pre>
  * 
  * </blockquote>
@@ -74,17 +77,29 @@ public @interface Startup {
  
 	/**
 	 * Most important priority value.
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	public static int MAX_PRIORITY = Integer.MIN_VALUE;
  
 	/**
 	 * Less important priority value.
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	public static int MIN_PRIORITY = Integer.MAX_VALUE;
  
 	/**
 	 * An integer value defines method execution order (i.e., priority).
+	 * 
+	 * @deprecated
+	 * @see Priority
 	 */
+	@Deprecated
 	int priority() default MIN_PRIORITY;
  
 }
@@ -1,134 +0,0 @@
-/*
- * Demoiselle Framework
- * Copyright (C) 2010 SERPRO
- * ----------------------------------------------------------------------------
- * This file is part of Demoiselle Framework.
- * 
- * Demoiselle Framework is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License version 3
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License version 3
- * along with this program; if not,  see <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.bootstrap;
-
-import java.io.FileNotFoundException;
-import java.net.URL;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
-import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
-import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
-import br.gov.frameworkdemoiselle.util.Reflections;
-import br.gov.frameworkdemoiselle.util.Strings;
-
-public abstract class AbstractStrategyBootstrap<T, D extends T> extends AbstractBootstrap {
-
-	private Class<T> type;
-
-	private Class<D> defaultClass;
-
-	private Class<? extends T> selected;
-
-	private Class<T> getType() {
-		if (this.type == null) {
-			this.type = Reflections.getGenericTypeArgument(this.getClass(), 0);
-		}
-
-		return this.type;
-	}
-
-	private Class<D> getDefaultClass() {
-		if (this.defaultClass == null) {
-			this.defaultClass = Reflections.getGenericTypeArgument(this.getClass(), 1);
-		}
-
-		return this.defaultClass;
-	}
-
-	public void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery event) {
-		selected = loadSelected();
-	}
-
-	public <A> void processAnnotatedType(@Observes final ProcessAnnotatedType<A> event) {
-		Class<A> annotated = event.getAnnotatedType().getJavaClass();
-
-		if (Reflections.isOfType(annotated, getType()) && annotated != selected) {
-			event.veto();
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private Class<T> loadSelected() {
-		Class<T> result = null;
-		String canonicalName = null;
-		String typeName = getType().getSimpleName().toLowerCase();
-		String key = null;
-
-		try {
-			URL url = ConfigurationLoader.getResourceAsURL("demoiselle.properties");
-			Configuration config = new PropertiesConfiguration(url);
-			canonicalName = config.getString(getConfigKey(), getDefaultClass().getCanonicalName());
-
-			ClassLoader classLoader;
-			
-			try {
-				classLoader = ConfigurationLoader.getClassLoaderForResource(canonicalName.replaceAll("\\.",
-						"/") + ".class");
-			} catch (FileNotFoundException e) {
-				classLoader = Thread.currentThread().getContextClassLoader();
-			}
-
-			result = (Class<T>) Class.forName(canonicalName, false, classLoader);
-			result.asSubclass(getType());
-
-		} catch (org.apache.commons.configuration.ConfigurationException cause) {
-			throw new ConfigurationException(getBundle().getString("file-not-found", "demoiselle.properties"));
-
-		} catch (ClassNotFoundException cause) {
-			key = Strings.getString("{0}-class-not-found", typeName);
-			throw new ConfigurationException(getBundle().getString(key, canonicalName));
-
-		} catch (ClassCastException cause) {
-			key = Strings.getString("{0}-class-must-be-of-type", typeName);
-			throw new ConfigurationException(getBundle().getString(key, canonicalName, getType()));
-
-		} catch (FileNotFoundException e) {
-			throw new ConfigurationException(getBundle().getString("file-not-found", "demoiselle.properties"));
-		}
-
-		return result;
-	}
-
-	public abstract String getConfigKey();
-
-}
@@ -0,0 +1,6 @@
+package br.gov.frameworkdemoiselle.internal.bootstrap;
+
+public interface ApplicationLifecycleEvent {
+
+	boolean removeProcessors();
+}
@@ -0,0 +1,160 @@
+/*
+ * 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.bootstrap;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
+import br.gov.frameworkdemoiselle.internal.context.CustomContext;
+import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.internal.processor.AnnotatedMethodProcessor;
+import br.gov.frameworkdemoiselle.util.Reflections;
+
+public abstract class AsbratctLifecycleBootstrap<A extends Annotation> extends AbstractBootstrap {
+
+	private Class<A> annotationClass;
+
+	@SuppressWarnings("rawtypes")
+	private final List<AnnotatedMethodProcessor> processors = Collections
+			.synchronizedList(new ArrayList<AnnotatedMethodProcessor>());
+
+	private final List<CustomContext> tempContexts = new ArrayList<CustomContext>();
+
+	private AfterBeanDiscovery afterBeanDiscoveryEvent;
+
+	protected abstract <T> AnnotatedMethodProcessor<T> newProcessorInstance(AnnotatedMethod<T> annotatedMethod,
+			BeanManager beanManager);
+
+	protected Class<A> getAnnotationClass() {
+		if (this.annotationClass == null) {
+			this.annotationClass = Reflections.getGenericTypeArgument(this.getClass(), 0);
+		}
+
+		return this.annotationClass;
+	}
+
+	public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event, final BeanManager beanManager) {
+		final AnnotatedType<T> annotatedType = event.getAnnotatedType();
+
+		for (AnnotatedMethod<?> am : annotatedType.getMethods()) {
+			if (am.isAnnotationPresent(getAnnotationClass())) {
+				@SuppressWarnings("unchecked")
+				AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) am;
+				processors.add(newProcessorInstance(annotatedMethod, beanManager));
+			}
+		}
+	}
+
+	public void loadTempContexts(@Observes final AfterBeanDiscovery event) {
+		// Não registrar o contexto de aplicação pq ele já é registrado pela implementação do CDI
+		tempContexts.add(new ThreadLocalContext(ViewScoped.class));
+		tempContexts.add(new ThreadLocalContext(SessionScoped.class));
+		tempContexts.add(new ThreadLocalContext(ConversationScoped.class));
+		tempContexts.add(new ThreadLocalContext(RequestScoped.class));
+
+		afterBeanDiscoveryEvent = event;
+	}
+
+	private boolean x = true;
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected synchronized void proccessEvent(final ApplicationLifecycleEvent event) {
+		getLogger().debug(
+				getBundle("demoiselle-core-bundle").getString("executing-all", annotationClass.getSimpleName()));
+
+		Collections.sort(processors);
+		Throwable failure = null;
+
+		if (x) {
+			for (CustomContext tempContext : tempContexts) {
+				addContext(tempContext, afterBeanDiscoveryEvent);
+			}
+
+			x = false;
+		}
+
+		for (Iterator<AnnotatedMethodProcessor> iter = processors.iterator(); iter.hasNext();) {
+			AnnotatedMethodProcessor<?> processor = iter.next();
+
+			try {
+				ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(processor.getAnnotatedMethod()
+						.getDeclaringType().getJavaClass().getCanonicalName());
+
+				if (Thread.currentThread().getContextClassLoader().equals(classLoader)) {
+					processor.process();
+
+					if (event.removeProcessors()) {
+						iter.remove();
+					}
+				}
+
+			} catch (Throwable cause) {
+				failure = cause;
+			}
+		}
+
+		if (processors.isEmpty()) {
+			unloadTempContexts();
+		}
+
+		if (failure != null) {
+			throw new DemoiselleException(failure);
+		}
+	}
+
+	private void unloadTempContexts() {
+		for (CustomContext tempContext : tempContexts) {
+			disableContext(tempContext);
+		}
+	}
+}
@@ -1,48 +0,0 @@
-/*
- * Demoiselle Framework
- * Copyright (C) 2010 SERPRO
- * ----------------------------------------------------------------------------
- * This file is part of Demoiselle Framework.
- * 
- * Demoiselle Framework is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License version 3
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License version 3
- * along with this program; if not,  see <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.bootstrap;
-
-import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator;
-import br.gov.frameworkdemoiselle.security.Authenticator;
-
-public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator, DefaultAuthenticator> {
-
-	public String getConfigKey() {
-		return "frameworkdemoiselle.security.authenticator.class";
-	}
-	
-}
@@ -1,48 +0,0 @@
-/*
- * Demoiselle Framework
- * Copyright (C) 2010 SERPRO
- * ----------------------------------------------------------------------------
- * This file is part of Demoiselle Framework.
- * 
- * Demoiselle Framework is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License version 3
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License version 3
- * along with this program; if not,  see <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.bootstrap;
-
-import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthorizer;
-import br.gov.frameworkdemoiselle.security.Authorizer;
-
-public class AuthorizerBootstrap extends AbstractStrategyBootstrap<Authorizer, DefaultAuthorizer> {
-
-	public String getConfigKey() {
-		return "frameworkdemoiselle.security.authorizer.class";
-	}
-			
-}
@@ -0,0 +1,5 @@
+package br.gov.frameworkdemoiselle.internal.bootstrap;
+
+public interface BeforeApplicationFinalization extends ApplicationLifecycleEvent {
+
+}
@@ -0,0 +1,5 @@
+package br.gov.frameworkdemoiselle.internal.bootstrap;
+
+public interface BeforeApplicationInitialization extends ApplicationLifecycleEvent {
+
+}
@@ -36,119 +36,26 @@
  */
 package br.gov.frameworkdemoiselle.internal.bootstrap;
  
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
  
-import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Shutdown;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.CustomContext;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.internal.processor.AnnotatedMethodProcessor;
 import br.gov.frameworkdemoiselle.internal.processor.ShutdownProcessor;
  
 /**
  * This class run at application shutdown
  */
-public class ShutdownBootstrap extends AbstractBootstrap {
-
-	private static final Class<? extends Annotation> annotationClass = Shutdown.class;
-
-	private static final List<CustomContext> tempContexts = new ArrayList<CustomContext>();
-
-	private static AfterBeanDiscovery abdEvent;
-
-	@SuppressWarnings("rawtypes")
-	private static final List<ShutdownProcessor> processors = Collections
-			.synchronizedList(new ArrayList<ShutdownProcessor>());
-
-	/**
-	 * Observes all methods annotated with @Shutdown and create an instance of ShutdownProcessor for them
-	 * 
-	 * @param <T>
-	 * @param event
-	 * @param beanManager
-	 */
-	public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event, final BeanManager beanManager) {
-		final AnnotatedType<T> annotatedType = event.getAnnotatedType();
-		for (AnnotatedMethod<?> am : annotatedType.getMethods()) {
-			if (am.isAnnotationPresent(annotationClass)) {
-				@SuppressWarnings("unchecked")
-				AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) am;
-				processors.add(new ShutdownProcessor<T>(annotatedMethod, beanManager));
-			}
-		}
-	}
-
-	public static void loadTempContexts(@Observes final AfterBeanDiscovery event) {
-		// Não registrar o contexto de aplicação pq ele já é registrado pela
-		// implementação do CDI
-		tempContexts.add(new ThreadLocalContext(ViewScoped.class));
-		tempContexts.add(new ThreadLocalContext(SessionScoped.class, false));
-		tempContexts.add(new ThreadLocalContext(ConversationScoped.class));
-		tempContexts.add(new ThreadLocalContext(RequestScoped.class));
-		abdEvent = event;
-	}
-
-	/**
-	 * Before Shutdown it execute the methods annotateds with @Shutdown considering the priority order;
-	 */
-	public synchronized static void shutdown() {
-		shutdown(true);
-	}
-
-	/**
-	 * Before Shutdown it execute the methods annotateds with @Shutdown considering the priority order;
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public synchronized static void shutdown(boolean remove) {
-		getLogger().debug(
-				getBundle("demoiselle-core-bundle").getString("executing-all", annotationClass.getSimpleName()));
-
-		Collections.sort(processors);
-		Throwable failure = null;
-
-		for (CustomContext tempContext : tempContexts) {
-			addContext(tempContext, abdEvent);
-		}
-
-		for (Iterator<ShutdownProcessor> iter = processors.iterator(); iter.hasNext();) {
-			ShutdownProcessor processor = iter.next();
-
-			try {
-				processor.process();
-
-				if (remove) {
-					iter.remove();
-				}
-
-			} catch (Throwable cause) {
-				failure = cause;
-			}
-		}
-
-		unloadTempContexts();
+public class ShutdownBootstrap extends AsbratctLifecycleBootstrap<Shutdown> {
  
-		if (failure != null) {
-			throw new DemoiselleException(failure);
-		}
+	@Override
+	protected <T> AnnotatedMethodProcessor<T> newProcessorInstance(AnnotatedMethod<T> annotatedMethod,
+			BeanManager beanManager) {
+		return new ShutdownProcessor<T>(annotatedMethod, beanManager);
 	}
  
-	private static void unloadTempContexts() {
-		for (CustomContext tempContext : tempContexts) {
-			disableContext(tempContext);
-		}
+	public void shutdown(@Observes BeforeApplicationFinalization event) {
+		proccessEvent(event);
 	}
 }
@@ -36,114 +36,26 @@
  */
 package br.gov.frameworkdemoiselle.internal.bootstrap;
  
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
  
-import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Startup;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.internal.processor.AnnotatedMethodProcessor;
 import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor;
  
 /**
  * This class is the bootstrap to execute the processes at load time.
  */
-public class StartupBootstrap extends AbstractBootstrap {
-
-	private static final Class<? extends Annotation> annotationClass = Startup.class;
-
-	private static final List<ThreadLocalContext> tempContexts = new ArrayList<ThreadLocalContext>();
-
-	@SuppressWarnings("rawtypes")
-	private static final List<StartupProcessor> processors = Collections
-			.synchronizedList(new ArrayList<StartupProcessor>());
-
-	/**
-	 * Observes all methods annotated with @Startup and create an instance of StartupAction for them
-	 * 
-	 * @param <T>
-	 * @param event
-	 * @param beanManager
-	 */
-	public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event, final BeanManager beanManager) {
-		final AnnotatedType<T> annotatedType = event.getAnnotatedType();
-		for (AnnotatedMethod<?> am : annotatedType.getMethods()) {
-			if (am.isAnnotationPresent(annotationClass)) {
-				@SuppressWarnings("unchecked")
-				AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) am;
-				processors.add(new StartupProcessor<T>(annotatedMethod, beanManager));
-			}
-		}
-	}
-
-	public void loadTempContexts(@Observes final AfterBeanDiscovery event) {
-		// Não registrar o contexto de aplicação pq ele já é registrado pela implementação do CDI
-		tempContexts.add(new ThreadLocalContext(ViewScoped.class));
-		tempContexts.add(new ThreadLocalContext(SessionScoped.class));
-		tempContexts.add(new ThreadLocalContext(ConversationScoped.class));
-		tempContexts.add(new ThreadLocalContext(RequestScoped.class));
-
-		for (ThreadLocalContext tempContext : tempContexts) {
-			addContext(tempContext, event);
-		}
-	}
-
-	/**
-	 * After the deployment validation it execute the methods annotateds with @Startup considering the priority order;
-	 */
-	public synchronized static void startup() {
-		startup(true);
-	}
-
-	/**
-	 * After the deployment validation it execute the methods annotateds with @Startup considering the priority order;
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public synchronized static void startup(boolean remove) {
-		getLogger().debug(
-				getBundle("demoiselle-core-bundle").getString("executing-all", annotationClass.getSimpleName()));
-
-		Collections.sort(processors);
-		Throwable failure = null;
-
-		for (Iterator<StartupProcessor> iter = processors.iterator(); iter.hasNext();) {
-			StartupProcessor processor = iter.next();
-
-			try {
-				processor.process();
-
-				if (remove) {
-					iter.remove();
-				}
-
-			} catch (Throwable cause) {
-				failure = cause;
-			}
-		}
-
-		unloadTempContexts();
+public class StartupBootstrap extends AsbratctLifecycleBootstrap<Startup> {
  
-		if (failure != null) {
-			throw new DemoiselleException(failure);
-		}
+	@Override
+	protected <T> AnnotatedMethodProcessor<T> newProcessorInstance(AnnotatedMethod<T> annotatedMethod,
+			BeanManager beanManager) {
+		return new StartupProcessor<T>(annotatedMethod, beanManager);
 	}
  
-	private static void unloadTempContexts() {
-		for (ThreadLocalContext tempContext : tempContexts) {
-			disableContext(tempContext);
-		}
+	public void startup(@Observes BeforeApplicationInitialization event) {
+		proccessEvent(event);
 	}
 }
@@ -1,55 +0,0 @@
-/*
- * Demoiselle Framework
- * Copyright (C) 2010 SERPRO
- * ----------------------------------------------------------------------------
- * This file is part of Demoiselle Framework.
- * 
- * Demoiselle Framework is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License version 3
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License version 3
- * along with this program; if not,  see <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.bootstrap;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import br.gov.frameworkdemoiselle.transaction.Transaction;
-import br.gov.frameworkdemoiselle.util.Reflections;
-
-public class TransactionBootstrap implements Extension {
-
-	public <A> void processAnnotatedType(@Observes final ProcessAnnotatedType<A> event) {
-		Class<A> annotated = event.getAnnotatedType().getJavaClass();
-
-		if (Reflections.isOfType(annotated, Transaction.class)) {
-			event.veto();
-		}
-	}
-}
@@ -40,6 +40,8 @@ import java.io.FileNotFoundException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,8 +51,10 @@ import java.util.Set;
 import javax.inject.Inject;
 import javax.validation.constraints.NotNull;
  
+import org.apache.commons.configuration.DataConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.configuration.XMLConfiguration;
 import org.slf4j.Logger;
  
 import br.gov.frameworkdemoiselle.annotation.Ignore;
@@ -109,7 +113,7 @@ public class ConfigurationLoader implements Serializable {
 			org.apache.commons.configuration.Configuration config = getConfiguration(resource, type);
  
 			String key = getKey(field, clazz, config);
-			Object value = getValue(key, field.getType(), config);
+			Object value = getValue(key, field, config);
  
 			validate(field, key, value, resource);
 			setValue(field, key, object, value);
@@ -218,12 +222,12 @@ public class ConfigurationLoader implements Serializable {
  
 				case PROPERTIES:
 					url = getResourceAsURL(resource + ".properties");
-					config = new PropertiesConfiguration(url);
+					config =  new DataConfiguration(new PropertiesConfiguration(url));
 					break;
  
 				case XML:
 					url = getResourceAsURL(resource + ".xml");
-					config = new PropertiesConfiguration(url);
+					config = new DataConfiguration(new XMLConfiguration(url));
 					break;
  
 				default:
@@ -239,41 +243,67 @@ public class ConfigurationLoader implements Serializable {
 		return config;
 	}
  
-	/**
-	 * Returns the value associated with the given configuration class and field type.
-	 * 
-	 * @param name
-	 * @param config
-	 * @param fieldClass
-	 * @return the value
-	 */
 	@SuppressWarnings("unchecked")
-	private <T> T getValue(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
+	private <T> T getValue(String key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value;
  
-		if (fieldClass.isArray() && fieldClass.getComponentType().equals(String.class)) {
-			value = config.getStringArray(key);
-
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
+		if (fieldClass.isArray()) {
+			value = getArray(key, field, config);
 		} else if (fieldClass.equals(Properties.class)) {
 			value = getProperty(key, config);
  
 		} else {
-			value = getBasic(key, fieldClass, config);
+			value = getBasic(key, field, config);
 		}
  
 		return (T) value;
 	}
+	
+	private <T> Object getArray(String key, Field field, org.apache.commons.configuration.Configuration config) {
+		Object value = null;
+
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
+		try {
+			Method method;
+			
+			String methodName = "get";
+			
+			methodName += Strings.firstToUpper(fieldClass.getSimpleName());
+			methodName = Strings.removeChars(methodName, '[', ']');
+			
+			methodName += "Array";
+
+			method = config.getClass().getMethod(methodName, String.class);
+			value = method.invoke(config, key);
+
+		} catch (Throwable cause) {
+			throw new ConfigurationException(bundle.getString("error-converting-to-type", fieldClass.getName()), cause);
+		}
+
+		return value;
+	}
  
-	private <T> Object getBasic(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
+	private <T> Object getBasic(String key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
 		try {
 			Method method;
-			String methodName = "get" + Strings.firstToUpper(fieldClass.getSimpleName());
+			
+			String methodName = "get";
+			
+			methodName += discoveryGenericType(field);
+			
+			methodName += Strings.firstToUpper(fieldClass.getSimpleName());
  
 			if (!fieldClass.isPrimitive()) {
 				method = config.getClass().getMethod(methodName, String.class, fieldClass);
 				value = method.invoke(config, key, null);
+				
 			} else if (config.containsKey(key)) {
 				method = config.getClass().getMethod(methodName, String.class);
 				value = method.invoke(config, key);
@@ -286,6 +316,36 @@ public class ConfigurationLoader implements Serializable {
 		return value;
 	}
  
+	/**
+	 * Discovery the Generic's type.
+	 * 
+	 *  for example: the generic's type of List<Integer> list is an Integer type 
+	 * 
+	 * @param field
+	 * @return
+	 */
+	private String discoveryGenericType(Field field) {
+		
+		Type genericFieldType = field.getGenericType();
+		
+		if(genericFieldType instanceof ParameterizedType){
+		    ParameterizedType type = (ParameterizedType) genericFieldType;
+		    Type[] fieldArgumentTypes = type.getActualTypeArguments();
+		    for(Type fieldArgumentType : fieldArgumentTypes){
+		        @SuppressWarnings("rawtypes")
+				Class fieldArgumentClass = (Class) fieldArgumentType;
+		        
+		        if("String".equals(fieldArgumentClass.getSimpleName())) {
+		        	return "";
+		        }
+		        
+		        return fieldArgumentClass.getSimpleName();
+		    }
+		}
+		
+		return "";
+	}
+	
 	private Object getProperty(String key, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
@@ -307,6 +367,10 @@ public class ConfigurationLoader implements Serializable {
 		return value;
 	}
  
+	public static ClassLoader getClassLoaderForClass(final String canonicalName) throws FileNotFoundException {
+		return getClassLoaderForResource(canonicalName.replaceAll("\\.", "/") + ".class");
+	}
+
 	public static ClassLoader getClassLoaderForResource(final String resource) throws FileNotFoundException {
 		final String stripped = resource.startsWith("/") ? resource.substring(1) : resource;
  
@@ -323,7 +387,7 @@ public class ConfigurationLoader implements Serializable {
 		}
  
 		if (url == null) {
-			throw new FileNotFoundException(resource + " not found.");
+			result = null;
 		}
  
 		return result;
@@ -1,28 +0,0 @@
-package br.gov.frameworkdemoiselle.internal.implementation;
-
-import javax.inject.Inject;
-
-import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.util.Beans;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-public class CoreBundle {
-
-	@Inject
-	@Name("demoiselle-core-bundle")
-	private ResourceBundle bundle;
-
-	private static CoreBundle instance;
-
-	private static synchronized CoreBundle getInstance() {
-		if (instance == null) {
-			instance = Beans.getReference(CoreBundle.class);
-		}
-
-		return instance;
-	}
-
-	public static ResourceBundle get() {
-		return getInstance().bundle;
-	}
-}
@@ -37,9 +37,11 @@
 package br.gov.frameworkdemoiselle.internal.implementation;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.security.User;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
  * Authenticator that actually does nothing but raise exceptions.
@@ -51,6 +53,8 @@ public class DefaultAuthenticator implements Authenticator {
  
 	private static final long serialVersionUID = 1L;
  
+	private static ResourceBundle bundle;
+
 	/**
 	 * @see br.gov.frameworkdemoiselle.security.Authenticator#authenticate()
 	 */
@@ -76,8 +80,15 @@ public class DefaultAuthenticator implements Authenticator {
 	}
  
 	private DemoiselleException getException() {
-		return new DemoiselleException(CoreBundle.get().getString("authenticator-not-defined",
+		return new DemoiselleException(getBundle().getString("authenticator-not-defined",
 				SecurityContext.class.getSimpleName()));
 	}
  
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		}
+
+		return bundle;
+	}
 }
@@ -37,9 +37,11 @@
 package br.gov.frameworkdemoiselle.internal.implementation;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.Authorizer;
 import br.gov.frameworkdemoiselle.security.RequiredPermission;
 import br.gov.frameworkdemoiselle.security.RequiredRole;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
  * Authorizator that actually does nothing but raise exceptions.
@@ -51,16 +53,25 @@ public class DefaultAuthorizer implements Authorizer {
  
 	private static final long serialVersionUID = 1L;
  
+	private static ResourceBundle bundle;
+
 	@Override
 	public boolean hasRole(String role) {
-		throw new DemoiselleException(CoreBundle.get().getString("authorizer-not-defined",
+		throw new DemoiselleException(getBundle().getString("authorizer-not-defined",
 				RequiredRole.class.getSimpleName()));
 	}
  
 	@Override
 	public boolean hasPermission(String resource, String operation) {
-		throw new DemoiselleException(CoreBundle.get().getString("authorizer-not-defined",
+		throw new DemoiselleException(getBundle().getString("authorizer-not-defined",
 				RequiredPermission.class.getSimpleName()));
 	}
  
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		}
+
+		return bundle;
+	}
 }
@@ -37,8 +37,10 @@
 package br.gov.frameworkdemoiselle.internal.implementation;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
  * Transaction strategy that actually does nothing but raise exceptions.
@@ -50,6 +52,8 @@ public class DefaultTransaction implements Transaction {
  
 	private static final long serialVersionUID = 1L;
  
+	private static ResourceBundle bundle;
+
 	@Override
 	public void begin() {
 		throw getException();
@@ -81,7 +85,15 @@ public class DefaultTransaction implements Transaction {
 	}
  
 	private DemoiselleException getException() {
-		return new DemoiselleException(CoreBundle.get().getString("transaction-not-defined",
+		return new DemoiselleException(getBundle().getString("transaction-not-defined",
 				Transactional.class.getSimpleName()));
 	}
+
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		}
+
+		return bundle;
+	}
 }
@@ -45,10 +45,12 @@ import javax.inject.Inject;
  
 import org.slf4j.Logger;
  
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.message.DefaultMessage;
 import br.gov.frameworkdemoiselle.message.Message;
 import br.gov.frameworkdemoiselle.message.MessageContext;
 import br.gov.frameworkdemoiselle.message.SeverityType;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
  * The message store is designed to provide access to messages. It is shared by every application layer.
@@ -65,6 +67,8 @@ public class MessageContextImpl implements Serializable, MessageContext {
  
 	private final List<Message> messages = new ArrayList<Message>();
  
+	private static ResourceBundle bundle;
+
 	@Override
 	public void add(final Message message, Object... params) {
 		Message aux;
@@ -75,7 +79,7 @@ public class MessageContextImpl implements Serializable, MessageContext {
 			aux = message;
 		}
  
-		logger.debug(CoreBundle.get().getString("adding-message-to-context", message.toString()));
+		logger.debug(getBundle().getString("adding-message-to-context", message.toString()));
 		messages.add(aux);
 	}
  
@@ -96,7 +100,15 @@ public class MessageContextImpl implements Serializable, MessageContext {
  
 	@Override
 	public void clear() {
-		logger.debug(CoreBundle.get().getString("cleaning-message-context"));
+		logger.debug(getBundle().getString("cleaning-message-context"));
 		messages.clear();
 	}
+
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		}
+
+		return bundle;
+	}
 }
@@ -36,12 +36,12 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
  
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import java.util.Locale;
+
 import javax.inject.Named;
  
-import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.AfterLoginSuccessful;
 import br.gov.frameworkdemoiselle.security.AfterLogoutSuccessful;
 import br.gov.frameworkdemoiselle.security.Authenticator;
@@ -57,33 +57,29 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * 
  * @author SERPRO
  */
-@SessionScoped
 @Named("securityContext")
 public class SecurityContextImpl implements SecurityContext {
  
 	private static final long serialVersionUID = 1L;
  
-	@Inject
-	@Name("demoiselle-core-bundle")
-	private ResourceBundle bundle;
-
-	@Inject
-	private Authenticator authenticator;
-
-	@Inject
-	private Authorizer authorizer;
+	private Authenticator getAuthenticator() {
+		return StrategySelector.getReference("frameworkdemoiselle.security.authenticator.class", Authenticator.class,
+				DefaultAuthenticator.class);
+	}
  
-	@Inject
-	private SecurityConfig config;
+	private Authorizer getAuthorizer() {
+		return StrategySelector.getReference("frameworkdemoiselle.security.authorizer.class", Authorizer.class,
+				DefaultAuthorizer.class);
+	}
  
 	/**
 	 * @see br.gov.frameworkdemoiselle.security.SecurityContext#hasPermission(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public boolean hasPermission(String resource, String operation) throws NotLoggedInException {
-		if (config.isEnabled()) {
+		if (getConfig().isEnabled()) {
 			checkLoggedIn();
-			return authorizer.hasPermission(resource, operation);
+			return getAuthorizer().hasPermission(resource, operation);
  
 		} else {
 			return true;
@@ -95,9 +91,9 @@ public class SecurityContextImpl implements SecurityContext {
 	 */
 	@Override
 	public boolean hasRole(String role) throws NotLoggedInException {
-		if (config.isEnabled()) {
+		if (getConfig().isEnabled()) {
 			checkLoggedIn();
-			return authorizer.hasRole(role);
+			return getAuthorizer().hasRole(role);
  
 		} else {
 			return true;
@@ -109,7 +105,7 @@ public class SecurityContextImpl implements SecurityContext {
 	 */
 	@Override
 	public boolean isLoggedIn() {
-		if (config.isEnabled()) {
+		if (getConfig().isEnabled()) {
 			return getUser() != null;
 		} else {
 			return true;
@@ -121,7 +117,7 @@ public class SecurityContextImpl implements SecurityContext {
 	 */
 	@Override
 	public void login() {
-		if (config.isEnabled() && authenticator.authenticate()) {
+		if (getConfig().isEnabled() && getAuthenticator().authenticate()) {
 			Beans.getBeanManager().fireEvent(new AfterLoginSuccessful() {
  
 				private static final long serialVersionUID = 1L;
@@ -135,9 +131,9 @@ public class SecurityContextImpl implements SecurityContext {
 	 */
 	@Override
 	public void logout() throws NotLoggedInException {
-		if (config.isEnabled()) {
+		if (getConfig().isEnabled()) {
 			checkLoggedIn();
-			authenticator.unAuthenticate();
+			getAuthenticator().unAuthenticate();
  
 			Beans.getBeanManager().fireEvent(new AfterLogoutSuccessful() {
  
@@ -151,9 +147,9 @@ public class SecurityContextImpl implements SecurityContext {
 	 */
 	@Override
 	public User getUser() {
-		User user = authenticator.getUser();
+		User user = getAuthenticator().getUser();
  
-		if (!config.isEnabled() && user == null) {
+		if (!getConfig().isEnabled() && user == null) {
 			user = new User() {
  
 				private static final long serialVersionUID = 1L;
@@ -177,8 +173,15 @@ public class SecurityContextImpl implements SecurityContext {
 		return user;
 	}
  
+	private SecurityConfig getConfig() {
+		return Beans.getReference(SecurityConfig.class);
+	}
+
 	private void checkLoggedIn() throws NotLoggedInException {
 		if (!isLoggedIn()) {
+			Locale locale = Beans.getReference(Locale.class);
+			ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle", locale);
+
 			throw new NotLoggedInException(bundle.getString("user-not-authenticated"));
 		}
 	}
@@ -0,0 +1,64 @@
+package br.gov.frameworkdemoiselle.internal.implementation;
+
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.Locale;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
+import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+import br.gov.frameworkdemoiselle.util.Strings;
+
+public class StrategySelector {
+
+	public static <T> T getReference(String configKey, Class<T> type, Class<? extends T> defaultType) {
+		Class<T> selectedType = loadSelected(configKey, type, defaultType);
+		return Beans.getReference(selectedType);
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T> Class<T> loadSelected(String configKey, Class<T> type, Class<? extends T> defaultType) {
+		ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle",
+				Beans.getReference(Locale.class));
+
+		Class<T> result = null;
+		String canonicalName = null;
+		String typeName = type.getSimpleName().toLowerCase();
+		String key = null;
+
+		try {
+			URL url = ConfigurationLoader.getResourceAsURL("demoiselle.properties");
+			Configuration config = new PropertiesConfiguration(url);
+			canonicalName = config.getString(configKey, defaultType.getCanonicalName());
+
+			ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(canonicalName);
+			if (classLoader == null) {
+				classLoader = Thread.currentThread().getContextClassLoader();
+			}
+
+			result = (Class<T>) Class.forName(canonicalName, false, classLoader);
+			result.asSubclass(type);
+
+		} catch (org.apache.commons.configuration.ConfigurationException cause) {
+			throw new ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties"));
+
+		} catch (ClassNotFoundException cause) {
+			key = Strings.getString("{0}-class-not-found", typeName);
+			throw new ConfigurationException(bundle.getString(key, canonicalName));
+
+		} catch (FileNotFoundException e) {
+			throw new ConfigurationException(bundle.getString("file-not-found", "demoiselle.properties"));
+
+		} catch (ClassCastException cause) {
+			key = Strings.getString("{0}-class-must-be-of-type", typeName);
+			throw new ConfigurationException(bundle.getString(key, canonicalName, type));
+		}
+
+		return result;
+	}
+}
@@ -0,0 +1,23 @@
+package br.gov.frameworkdemoiselle.internal.implementation;
+
+import javax.inject.Named;
+
+import br.gov.frameworkdemoiselle.transaction.Transaction;
+import br.gov.frameworkdemoiselle.transaction.TransactionContext;
+
+/**
+ * This is the default implementation of {@link TransactionContext} interface.
+ * 
+ * @author SERPRO
+ */
+@Named("transactionContext")
+public class TrancationContextImpl implements TransactionContext {
+
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	public Transaction currentTransaction() {
+		return StrategySelector.getReference("frameworkdemoiselle.transaction.class", Transaction.class, DefaultTransaction.class);
+	}
+
+}
@@ -50,7 +50,6 @@ import br.gov.frameworkdemoiselle.util.Beans;
  
 @Interceptor
 @Configuration
-@SuppressWarnings("cdi-scope")
 public class ConfigurationInterceptor implements Serializable {
  
 	private static final long serialVersionUID = 1L;
@@ -50,6 +50,7 @@ import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
 import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
+import br.gov.frameworkdemoiselle.transaction.TransactionContext;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
@@ -59,19 +60,19 @@ public class TransactionalInterceptor implements Serializable {
  
 	private static final long serialVersionUID = 1L;
  
-	private final Instance<Transaction> transaction;
+	private final Instance<TransactionContext> context;
  
 	private final Logger logger;
  
 	private final ResourceBundle bundle;
  
-	private final Instance<TransactionInfo> transactionInfo;
+	private final Instance<TransactionInfo> info;
  
 	@Inject
-	public TransactionalInterceptor(Instance<Transaction> transaction, Instance<TransactionInfo> transactionInfo,
+	public TransactionalInterceptor(Instance<TransactionContext> context, Instance<TransactionInfo> info,
 			Logger logger, @Name("demoiselle-core-bundle") ResourceBundle bundle) {
-		this.transaction = transaction;
-		this.transactionInfo = transactionInfo;
+		this.context = context;
+		this.info = info;
 		this.logger = logger;
 		this.bundle = bundle;
  
@@ -84,7 +85,7 @@ public class TransactionalInterceptor implements Serializable {
 		Object result = null;
 		try {
 			this.logger.debug(bundle.getString("transactional-execution", ic.getMethod().toGenericString()));
-			transactionInfo.get().incrementCounter();
+			info.get().incrementCounter();
  
 			result = ic.proceed();
  
@@ -93,7 +94,7 @@ public class TransactionalInterceptor implements Serializable {
 			throw cause;
  
 		} finally {
-			transactionInfo.get().decrementCounter();
+			info.get().decrementCounter();
 			complete(ic);
 		}
  
@@ -101,8 +102,8 @@ public class TransactionalInterceptor implements Serializable {
 	}
  
 	private void initiate(final InvocationContext ic) {
-		Transaction tx = this.transaction.get();
-		TransactionInfo ctx = this.transactionInfo.get();
+		Transaction tx = this.context.get().currentTransaction();
+		TransactionInfo ctx = this.info.get();
  
 		if (!tx.isActive()) {
 			tx.begin();
@@ -112,7 +113,7 @@ public class TransactionalInterceptor implements Serializable {
 	}
  
 	private void handleException(final Exception cause) {
-		Transaction tx = this.transaction.get();
+		Transaction tx = this.context.get().currentTransaction();
  
 		if (!tx.isMarkedRollback()) {
 			boolean rollback = false;
@@ -130,8 +131,8 @@ public class TransactionalInterceptor implements Serializable {
 	}
  
 	private void complete(final InvocationContext ic) {
-		Transaction tx = this.transaction.get();
-		TransactionInfo ctx = this.transactionInfo.get();
+		Transaction tx = this.context.get().currentTransaction();
+		TransactionInfo ctx = this.info.get();
  
 		if (ctx.getCounter() == 0 && tx.isActive()) {
  
@@ -51,16 +51,14 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
  * It abstract the integration between Processor and the context;
  * 
- * @param <DC>
+ * @param <T>
  *            the declaring class
  */
-public abstract class AbstractProcessor<DC> implements Processor {
+public abstract class AbstractProcessor<T> implements Processor {
  
 	private BeanManager beanManager;
  
-	private AnnotatedCallable<DC> annotatedCallable;
-
-	private ResourceBundleProducer bundleFactory = new ResourceBundleProducer();
+	private AnnotatedCallable<T> annotatedCallable;
  
 	private ResourceBundle bundle;
  
@@ -70,12 +68,12 @@ public abstract class AbstractProcessor&lt;DC&gt; implements Processor {
 		this.beanManager = beanManager;
 	}
  
-	public AbstractProcessor(final AnnotatedCallable<DC> annotatedCallable, final BeanManager beanManager) {
+	public AbstractProcessor(final AnnotatedCallable<T> annotatedCallable, final BeanManager beanManager) {
 		this.annotatedCallable = annotatedCallable;
 		this.beanManager = beanManager;
 	}
  
-	protected AnnotatedCallable<DC> getAnnotatedCallable() {
+	protected AnnotatedCallable<T> getAnnotatedCallable() {
 		return this.annotatedCallable;
 	}
  
@@ -92,15 +90,15 @@ public abstract class AbstractProcessor&lt;DC&gt; implements Processor {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected DC getReferencedBean() {
-		Class<DC> classType = (Class<DC>) getAnnotatedCallable().getJavaMember().getDeclaringClass();
+	protected T getReferencedBean() {
+		Class<T> classType = (Class<T>) getAnnotatedCallable().getJavaMember().getDeclaringClass();
 		return getReferencedBean(classType);
 	}
  
 	@SuppressWarnings("unchecked")
-	protected DC getReferencedBean(final Class<DC> type) {
-		Bean<DC> bean = (Bean<DC>) beanManager.getBeans(type).iterator().next();
-		return (DC) beanManager.getReference(bean, type, beanManager.createCreationalContext(bean));
+	protected T getReferencedBean(final Class<T> type) {
+		Bean<T> bean = (Bean<T>) beanManager.getBeans(type).iterator().next();
+		return (T) beanManager.getReference(bean, type, beanManager.createCreationalContext(bean));
 	}
  
 	protected ResourceBundle getBundle() {
@@ -109,7 +107,7 @@ public abstract class AbstractProcessor&lt;DC&gt; implements Processor {
  
 	protected ResourceBundle getBundle(String baseName) {
 		if (bundle == null) {
-			bundle = bundleFactory.create(baseName, Locale.getDefault());
+			bundle = ResourceBundleProducer.create(baseName, Locale.getDefault());
 		}
  
 		return bundle;
@@ -41,23 +41,43 @@ import java.lang.reflect.InvocationTargetException;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.BeanManager;
  
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
 import br.gov.frameworkdemoiselle.message.SeverityType;
  
 /**
  * Represents an annotated method to be processed;
  * 
- * @param <DC>
+ * @param <T>
  *            declaring class owner of the method
  */
-public class AnnotatedMethodProcessor<DC> extends AbstractProcessor<DC> {
+public abstract class AnnotatedMethodProcessor<T> extends AbstractProcessor<T> implements
+		Comparable<AnnotatedMethodProcessor<T>> {
  
-	public AnnotatedMethodProcessor(final AnnotatedMethod<DC> annotatedMethod, final BeanManager beanManager) {
+	public AnnotatedMethodProcessor(final AnnotatedMethod<T> annotatedMethod, final BeanManager beanManager) {
 		super(annotatedMethod, beanManager);
 	}
  
-	protected AnnotatedMethod<DC> getAnnotatedMethod() {
-		return (AnnotatedMethod<DC>) getAnnotatedCallable();
+	public AnnotatedMethod<T> getAnnotatedMethod() {
+		return (AnnotatedMethod<T>) getAnnotatedCallable();
+	}
+
+	protected Integer getPriority(AnnotatedMethod<T> annotatedMethod) {
+		Integer priority = Priority.MIN_PRIORITY;
+
+		Priority annotation = annotatedMethod.getAnnotation(Priority.class);
+		if (annotation != null) {
+			priority = annotation.value();
+		}
+
+		return priority;
+	}
+
+	public int compareTo(final AnnotatedMethodProcessor<T> other) {
+		Integer orderThis = getPriority(getAnnotatedMethod());
+		Integer orderOther = getPriority(other.getAnnotatedMethod());
+
+		return orderThis.compareTo(orderOther);
 	}
  
 	public boolean process(Object... args) throws Throwable {
@@ -39,25 +39,29 @@ package br.gov.frameworkdemoiselle.internal.processor;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.BeanManager;
  
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.Shutdown;
  
-public class ShutdownProcessor<T> extends AnnotatedMethodProcessor<T> implements Comparable<ShutdownProcessor<T>> {
+/**
+ * Processor for a {@code Shutdown} annotated method, making it comparable.
+ * 
+ * @param <T>
+ */
+public class ShutdownProcessor<T> extends AnnotatedMethodProcessor<T> {
  
 	public ShutdownProcessor(AnnotatedMethod<T> annotatedMethod, BeanManager beanManager) {
 		super(annotatedMethod, beanManager);
 	}
  
-	@Override
-	public int compareTo(final ShutdownProcessor<T> other) {
-		int result = 0;
-		Shutdown annotationThis = getAnnotatedMethod().getAnnotation(Shutdown.class);
-		Shutdown annotationOther = other.getAnnotatedMethod().getAnnotation(Shutdown.class);
-		if (annotationThis != null && annotationThis != null) {
-			Integer orderThis = annotationThis.priority();
-			Integer orderOther = annotationOther.priority();
-			result = orderThis.compareTo(orderOther);
+	@SuppressWarnings("deprecation")
+	protected Integer getPriority(AnnotatedMethod<T> annotatedMethod) {
+		Integer priority = super.getPriority(annotatedMethod);
+
+		if (!annotatedMethod.isAnnotationPresent(Priority.class)) {
+			Shutdown annotation = annotatedMethod.getAnnotation(Shutdown.class);
+			priority = annotation.priority();
 		}
-		return result;
-	}
  
+		return priority;
+	}
 }
@@ -39,30 +39,29 @@ package br.gov.frameworkdemoiselle.internal.processor;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.BeanManager;
  
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.Startup;
  
 /**
  * Processor for a {@code @Startup} annotated method, making it comparable.
- *
+ * 
  * @param <T>
  */
-public class StartupProcessor<T> extends AnnotatedMethodProcessor<T> implements Comparable<StartupProcessor<T>> {
+public class StartupProcessor<T> extends AnnotatedMethodProcessor<T> {
  
 	public StartupProcessor(final AnnotatedMethod<T> annotatedMethod, final BeanManager beanManager) {
 		super(annotatedMethod, beanManager);
 	}
  
-	@Override
-	public int compareTo(final StartupProcessor<T> other) {
-		int result = 0;
-		Startup annotationThis = getAnnotatedMethod().getAnnotation(Startup.class);
-		Startup annotationOther = other.getAnnotatedMethod().getAnnotation(Startup.class);
-		if (annotationThis != null && annotationOther != null) {
-			Integer orderThis = annotationThis.priority();
-			Integer orderOther = annotationOther.priority();
-			result = orderThis.compareTo(orderOther);
+	@SuppressWarnings("deprecation")
+	protected Integer getPriority(AnnotatedMethod<T> annotatedMethod) {
+		Integer priority = super.getPriority(annotatedMethod);
+		
+		if (!annotatedMethod.isAnnotationPresent(Priority.class)) {
+			Startup annotation = annotatedMethod.getAnnotation(Startup.class);
+			priority = annotation.priority();
 		}
-		return result;
-	}
  
+		return priority;
+	}
 }
@@ -40,6 +40,10 @@ import java.io.FileNotFoundException;
 import java.io.Serializable;
 import java.net.URL;
  
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
 import javax.inject.Inject;
  
 import org.apache.commons.configuration.Configuration;
@@ -48,6 +52,7 @@ import org.apache.commons.configuration.PropertiesConfiguration;
 import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
 import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
+import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Reflections;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 import br.gov.frameworkdemoiselle.util.Strings;
@@ -66,6 +71,21 @@ public abstract class AbstractStrategyProducer&lt;T, D extends T&gt; implements Serial
 	@Name("demoiselle-core-bundle")
 	private ResourceBundle bundle;
  
+	@SuppressWarnings("unchecked")
+	public T create() {
+		BeanManager beanManager = Beans.getBeanManager();
+
+		AnnotatedType<T> type = ((AnnotatedType<T>) beanManager.createAnnotatedType(getSelected()));
+		InjectionTarget<T> it = beanManager.createInjectionTarget(type);
+		CreationalContext<T> ctx = beanManager.createCreationalContext(null);
+
+		T instance = it.produce(ctx);
+		it.inject(instance, ctx);
+		it.postConstruct(instance);
+
+		return instance;
+	}
+
 	protected Class<? extends T> getSelected() {
 		if (selected == null) {
 			selected = loadSelected();
@@ -88,26 +108,7 @@ public abstract class AbstractStrategyProducer&lt;T, D extends T&gt; implements Serial
 		}
  
 		return this.defaultClass;
-	}// public <A> void processAnnotatedType(@Observes final ProcessAnnotatedType<A> event) {
-		// Class<A> annotated = event.getAnnotatedType().getJavaClass();
-
-	//
-	// if (Reflections.isOfType(annotated, getType()) && annotated != selected) {
-	// event.veto();
-	// }
-	// }
-
-	// public void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery event) {
-	// selected = loadSelected();
-	// }
-
-	// public <A> void processAnnotatedType(@Observes final ProcessAnnotatedType<A> event) {
-	// Class<A> annotated = event.getAnnotatedType().getJavaClass();
-	//
-	// if (Reflections.isOfType(annotated, getType()) && annotated != selected) {
-	// event.veto();
-	// }
-	// }
+	}
  
 	@SuppressWarnings("unchecked")
 	private Class<T> loadSelected() {
@@ -121,12 +122,8 @@ public abstract class AbstractStrategyProducer&lt;T, D extends T&gt; implements Serial
 			Configuration config = new PropertiesConfiguration(url);
 			canonicalName = config.getString(getConfigKey(), getDefaultClass().getCanonicalName());
  
-			ClassLoader classLoader;
-
-			try {
-				classLoader = ConfigurationLoader.getClassLoaderForResource(canonicalName.replaceAll("\\.", "/")
-						+ ".class");
-			} catch (FileNotFoundException e) {
+			ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(canonicalName);
+			if (classLoader == null) {
 				classLoader = Thread.currentThread().getContextClassLoader();
 			}
  
@@ -46,6 +46,7 @@ import javax.enterprise.inject.spi.InjectionPoint;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Name;
+import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
@@ -63,6 +64,16 @@ public class ResourceBundleProducer implements Serializable {
 	 * @param String
 	 *            baseName
 	 */
+	public static ResourceBundle create(String baseName) {
+		return create(baseName, Beans.getReference(Locale.class));
+	}
+
+	/**
+	 * This method should be used by classes that can not inject ResourceBundle, to create the ResourceBundle.
+	 * 
+	 * @param String
+	 *            baseName
+	 */
 	public static ResourceBundle create(String baseName, Locale locale) {
 		ResourceBundle bundle = null;
  
@@ -82,7 +93,7 @@ public class ResourceBundleProducer implements Serializable {
 	 */
 	@Produces
 	@Default
-	public ResourceBundle create(InjectionPoint ip, Locale locale) {
+	public ResourceBundle create(InjectionPoint ip) {
 		String baseName;
  
 		if (ip != null && ip.getAnnotated().isAnnotationPresent(Name.class)) {
@@ -91,6 +102,6 @@ public class ResourceBundleProducer implements Serializable {
 			baseName = "messages";
 		}
  
-		return create(baseName, locale);
+		return create(baseName, Beans.getReference(Locale.class));
 	}
 }
@@ -1,71 +0,0 @@
-/*
- * Demoiselle Framework
- * Copyright (C) 2010 SERPRO
- * ----------------------------------------------------------------------------
- * This file is part of Demoiselle Framework.
- * 
- * Demoiselle Framework is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License version 3
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License version 3
- * along with this program; if not,  see <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.
- */
-/*
- * Demoiselle Framework Copyright (c) 2010 Serpro and other contributors as indicated by the @author tag. See the
- * copyright.txt in the distribution for a full listing of contributors. Demoiselle Framework is an open source Java EE
- * library designed to accelerate the development of transactional database Web applications. Demoiselle Framework is
- * released under the terms of the LGPL license 3 http://www.gnu.org/licenses/lgpl.html LGPL License 3 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 3 as published by the Free Software Foundation. Demoiselle Framework
- * 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 Lesser General Public License for more details. You
- * should have received a copy of the GNU Lesser General Public License along with Demoiselle Framework. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package br.gov.frameworkdemoiselle.internal.producer;
-
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-
-import br.gov.frameworkdemoiselle.internal.implementation.DefaultTransaction;
-import br.gov.frameworkdemoiselle.transaction.Transaction;
-
-public class TransactionProducer extends AbstractStrategyProducer<Transaction, DefaultTransaction> {
-
-	private static final long serialVersionUID = 1L;
-
-	@Default
-	@Produces
-	public Transaction create() throws InstantiationException, IllegalAccessException {
-		return getSelected().newInstance();
-	}
-
-	@Override
-	public String getConfigKey() {
-		return "frameworkdemoiselle.transaction.class";
-	}
-}
@@ -36,7 +36,8 @@
  */
 package br.gov.frameworkdemoiselle.security;
  
-import br.gov.frameworkdemoiselle.internal.implementation.CoreBundle;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 /**
  * Thrown when trying to access some resource and/or execute an operation without the proper authorization.
@@ -47,6 +48,8 @@ public class AuthorizationException extends SecurityException {
  
 	private static final long serialVersionUID = 1L;
  
+	private static ResourceBundle bundle;
+
 	/**
 	 * Constructor with message.
 	 * 
@@ -58,8 +61,14 @@ public class AuthorizationException extends SecurityException {
 	}
  
 	public AuthorizationException(String resource, String operation) {
-		// TODO: remove the CoreBundle call
-		super(CoreBundle.get().getString("access-denied-ui", resource, operation));
+		super(getBundle().getString("access-denied-ui", resource, operation));
 	}
  
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		}
+
+		return bundle;
+	}
 }
@@ -0,0 +1,49 @@
+/*
+ * 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.transaction;
+
+import java.io.Serializable;
+
+/**
+ * Structure used to handle trancationa mechanisms.
+ * 
+ * @author SERPRO
+ */
+public interface TransactionContext extends Serializable {
+
+	Transaction currentTransaction();
+}
 br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap
-br.gov.frameworkdemoiselle.internal.bootstrap.TransactionBootstrap
-#br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap
-#br.gov.frameworkdemoiselle.internal.bootstrap.AuthorizerBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap
@@ -68,7 +68,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
 public class AbstractBootstrapTest {
  
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "static-access" })
 	public void testAddContext() {
 		mockStatic(LoggerProducer.class);
 		mockStatic(Contexts.class);
@@ -97,7 +97,7 @@ public class AbstractBootstrapTest {
 	}
  
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "static-access" })
 	public void testDisableContext() {
 		mockStatic(LoggerProducer.class);
 		mockStatic(Contexts.class);
-/*
- * 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.bootstrap;
-
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Ignore;
-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 org.powermock.reflect.Whitebox;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.annotation.Shutdown;
-import br.gov.frameworkdemoiselle.internal.context.Contexts;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
-import br.gov.frameworkdemoiselle.internal.processor.ShutdownProcessor;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@Ignore
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Contexts.class, LoggerProducer.class, ResourceBundle.class, ResourceBundleProducer.class })
-@SuppressWarnings("rawtypes")
-public class ShutdownBootstrapTest {
-
-	private ProcessAnnotatedType event;
-
-	private BeanManager beanManager;
-
-	private AnnotatedType annotatedType;
-
-	@Before
-	public void before() {
-		event = EasyMock.createMock(ProcessAnnotatedType.class);
-		annotatedType = EasyMock.createMock(AnnotatedType.class);
-		beanManager = null;
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<ShutdownProcessor> getProcessors(ShutdownBootstrap bootstrap) throws IllegalArgumentException,
-			IllegalAccessException {
-		Set<Field> fields = Whitebox.getAllStaticFields(ShutdownBootstrap.class);
-		List<ShutdownProcessor> list = new ArrayList<ShutdownProcessor>();
-		for (Field field : fields) {
-			if (field.getName().equals("processors")) {
-				list = (List<ShutdownProcessor>) field.get(bootstrap);
-			}
-		}
-		return list;
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	@Test
-	public void processAnnotatedType() throws IllegalArgumentException, IllegalAccessException {
-		ShutdownBootstrap bootstrap = new ShutdownBootstrap();
-		List<ShutdownProcessor> list = getProcessors(bootstrap);
-
-		assertTrue(list.isEmpty());
-
-		AnnotatedMethod am1 = PowerMock.createMock(AnnotatedMethod.class);
-		AnnotatedMethod am2 = PowerMock.createMock(AnnotatedMethod.class);
-		AnnotatedMethod am3 = PowerMock.createMock(AnnotatedMethod.class);
-
-		Set<AnnotatedMethod> set = new HashSet<AnnotatedMethod>();
-		set.add(am1);
-		set.add(am2);
-		set.add(am3);
-
-		expect(am1.isAnnotationPresent(Shutdown.class)).andReturn(true);
-		expect(am2.isAnnotationPresent(Shutdown.class)).andReturn(true);
-		expect(am3.isAnnotationPresent(Shutdown.class)).andReturn(false);
-		expect(event.getAnnotatedType()).andReturn(annotatedType);
-		expect(annotatedType.getMethods()).andReturn(set);
-
-		replay(event, annotatedType, am1, am2, am3);
-		bootstrap.processAnnotatedType(event, beanManager);
-		verify(event, annotatedType);
-
-		list = getProcessors(bootstrap);
-		assertNotNull(list);
-		assertFalse(list.isEmpty());
-		assertTrue(list.size() == 2);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	@Test
-	public void testShuttingDown() throws Throwable {
-		ShutdownBootstrap bootstrap = new ShutdownBootstrap();
-
-		PowerMock.mockStatic(Contexts.class);
-		PowerMock.mockStatic(LoggerProducer.class);
-
-		Logger logger = PowerMock.createMock(Logger.class);
-		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
-		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
-
-		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
-				bundle).anyTimes();
-		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
-				.anyTimes();
-
-		logger.debug(EasyMock.anyObject(String.class));
-		logger.trace(EasyMock.anyObject(String.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
-
-		List<ShutdownProcessor> list = getProcessors(bootstrap);
-		list.clear();
-
-		MyShuttingDownProcessor<?> processor = PowerMock.createMock(MyShuttingDownProcessor.class);
-		list.add(processor);
-		expect(processor.process()).andReturn(true).times(1);
-
-		Contexts.add(EasyMock.anyObject(ThreadLocalContext.class), EasyMock.anyObject(AfterBeanDiscovery.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		Contexts.remove(EasyMock.anyObject(ThreadLocalContext.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		PowerMock.replayAll();
-		ShutdownBootstrap.shutdown();
-
-		assertTrue(list.isEmpty());
-		PowerMock.verifyAll();
-	}
-}
-
-@SuppressWarnings("rawtypes")
-class MyShuttingDownProcessor<T> extends ShutdownProcessor<T> {
-
-	@SuppressWarnings("unchecked")
-	public MyShuttingDownProcessor(AnnotatedMethod annotatedMethod, BeanManager beanManager) {
-		super(annotatedMethod, beanManager);
-	}
-
-	@Override
-	public int compareTo(final ShutdownProcessor<T> other) {
-		return 1;
-	}
-}
+///*
+// * 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.bootstrap;
+//
+//import static org.easymock.EasyMock.expect;
+//import static org.easymock.EasyMock.replay;
+//import static org.easymock.EasyMock.verify;
+//import static org.junit.Assert.assertFalse;
+//import static org.junit.Assert.assertNotNull;
+//import static org.junit.Assert.assertTrue;
+//
+//import java.lang.reflect.Field;
+//import java.util.ArrayList;
+//import java.util.HashSet;
+//import java.util.List;
+//import java.util.Locale;
+//import java.util.Set;
+//
+//import javax.enterprise.inject.spi.AfterBeanDiscovery;
+//import javax.enterprise.inject.spi.AnnotatedMethod;
+//import javax.enterprise.inject.spi.AnnotatedType;
+//import javax.enterprise.inject.spi.BeanManager;
+//import javax.enterprise.inject.spi.ProcessAnnotatedType;
+//
+//import org.easymock.EasyMock;
+//import org.junit.Before;
+//import org.junit.Ignore;
+//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 org.powermock.reflect.Whitebox;
+//import org.slf4j.Logger;
+//
+//import br.gov.frameworkdemoiselle.annotation.Shutdown;
+//import br.gov.frameworkdemoiselle.internal.context.Contexts;
+//import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+//import br.gov.frameworkdemoiselle.internal.processor.ShutdownProcessor;
+//import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
+//import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+//@Ignore
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({ Contexts.class, LoggerProducer.class, ResourceBundle.class, ResourceBundleProducer.class })
+//@SuppressWarnings("rawtypes")
+//public class ShutdownBootstrapTest {
+//
+//	private ProcessAnnotatedType event;
+//
+//	private BeanManager beanManager;
+//
+//	private AnnotatedType annotatedType;
+//
+//	@Before
+//	public void before() {
+//		event = EasyMock.createMock(ProcessAnnotatedType.class);
+//		annotatedType = EasyMock.createMock(AnnotatedType.class);
+//		beanManager = null;
+//	}
+//
+//	@SuppressWarnings("unchecked")
+//	private List<ShutdownProcessor> getProcessors(ShutdownBootstrap bootstrap) throws IllegalArgumentException,
+//			IllegalAccessException {
+//		Set<Field> fields = Whitebox.getAllStaticFields(ShutdownBootstrap.class);
+//		List<ShutdownProcessor> list = new ArrayList<ShutdownProcessor>();
+//		for (Field field : fields) {
+//			if (field.getName().equals("processors")) {
+//				list = (List<ShutdownProcessor>) field.get(bootstrap);
+//			}
+//		}
+//		return list;
+//	}
+//
+//	@SuppressWarnings({ "unchecked" })
+//	@Test
+//	public void processAnnotatedType() throws IllegalArgumentException, IllegalAccessException {
+//		ShutdownBootstrap bootstrap = new ShutdownBootstrap();
+//		List<ShutdownProcessor> list = getProcessors(bootstrap);
+//
+//		assertTrue(list.isEmpty());
+//
+//		AnnotatedMethod am1 = PowerMock.createMock(AnnotatedMethod.class);
+//		AnnotatedMethod am2 = PowerMock.createMock(AnnotatedMethod.class);
+//		AnnotatedMethod am3 = PowerMock.createMock(AnnotatedMethod.class);
+//
+//		Set<AnnotatedMethod> set = new HashSet<AnnotatedMethod>();
+//		set.add(am1);
+//		set.add(am2);
+//		set.add(am3);
+//
+//		expect(am1.isAnnotationPresent(Shutdown.class)).andReturn(true);
+//		expect(am2.isAnnotationPresent(Shutdown.class)).andReturn(true);
+//		expect(am3.isAnnotationPresent(Shutdown.class)).andReturn(false);
+//		expect(event.getAnnotatedType()).andReturn(annotatedType);
+//		expect(annotatedType.getMethods()).andReturn(set);
+//
+//		replay(event, annotatedType, am1, am2, am3);
+//		bootstrap.processAnnotatedType(event, beanManager);
+//		verify(event, annotatedType);
+//
+//		list = getProcessors(bootstrap);
+//		assertNotNull(list);
+//		assertFalse(list.isEmpty());
+//		assertTrue(list.size() == 2);
+//	}
+//
+//	@SuppressWarnings({ "unchecked", "static-access" })
+//	@Test
+//	public void testShuttingDown() throws Throwable {
+//		ShutdownBootstrap bootstrap = new ShutdownBootstrap();
+//
+//		PowerMock.mockStatic(Contexts.class);
+//		PowerMock.mockStatic(LoggerProducer.class);
+//
+//		Logger logger = PowerMock.createMock(Logger.class);
+//		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
+//		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
+//
+//		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
+//		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+//				bundle).anyTimes();
+//		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
+//				.anyTimes();
+//
+//		logger.debug(EasyMock.anyObject(String.class));
+//		logger.trace(EasyMock.anyObject(String.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
+//
+//		List<ShutdownProcessor> list = getProcessors(bootstrap);
+//		list.clear();
+//
+//		MyShuttingDownProcessor<?> processor = PowerMock.createMock(MyShuttingDownProcessor.class);
+//		list.add(processor);
+//		expect(processor.process()).andReturn(true).times(1);
+//
+//		Contexts.add(EasyMock.anyObject(ThreadLocalContext.class), EasyMock.anyObject(AfterBeanDiscovery.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		Contexts.remove(EasyMock.anyObject(ThreadLocalContext.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		PowerMock.replayAll();
+//		ShutdownBootstrap.shutdown();
+//
+//		assertTrue(list.isEmpty());
+//		PowerMock.verifyAll();
+//	}
+//}
+//
+//@SuppressWarnings("rawtypes")
+//class MyShuttingDownProcessor<T> extends ShutdownProcessor<T> {
+//
+//	@SuppressWarnings("unchecked")
+//	public MyShuttingDownProcessor(AnnotatedMethod annotatedMethod, BeanManager beanManager) {
+//		super(annotatedMethod, beanManager);
+//	}
+//
+//	@Override
+//	public int compareTo(final ShutdownProcessor<T> other) {
+//		return 1;
+//	}
+//}
-/*
- * 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.bootstrap;
-
-import static junit.framework.Assert.assertEquals;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import junit.framework.Assert;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Ignore;
-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 org.powermock.reflect.Whitebox;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.annotation.Startup;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.Contexts;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
-import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@Ignore
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Contexts.class, LoggerProducer.class, ResourceBundle.class, ResourceBundleProducer.class })
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class StartupBootstrapTest {
-
-	private ProcessAnnotatedType event;
-
-	private BeanManager beanManager;
-
-	private AnnotatedType annotatedType;
-
-	@Before
-	public void before() {
-		event = EasyMock.createMock(ProcessAnnotatedType.class);
-		annotatedType = EasyMock.createMock(AnnotatedType.class);
-		beanManager = null;
-	}
-
-	private List<StartupProcessor> getActions(StartupBootstrap bootstrap) throws IllegalArgumentException,
-			IllegalAccessException {
-		Set<Field> fields = Whitebox.getAllStaticFields(StartupBootstrap.class);
-		List<StartupProcessor> list = null;
-		for (Field field : fields) {
-			if (field.getName().equals("processors")) {
-				list = (List<StartupProcessor>) field.get(bootstrap);
-			}
-		}
-		return list;
-	}
-
-	@Test
-	public void processAnnotatedType() throws IllegalArgumentException, IllegalAccessException {
-		StartupBootstrap bootstrap = new StartupBootstrap();
-		List<StartupProcessor> list = getActions(bootstrap);
-
-		assertNotNull(list);
-		assertTrue(list.isEmpty());
-
-		AnnotatedMethod am1 = PowerMock.createMock(AnnotatedMethod.class);
-		AnnotatedMethod am2 = PowerMock.createMock(AnnotatedMethod.class);
-		AnnotatedMethod am3 = PowerMock.createMock(AnnotatedMethod.class);
-
-		Set<AnnotatedMethod> set = new HashSet<AnnotatedMethod>();
-		set.add(am1);
-		set.add(am2);
-		set.add(am3);
-
-		expect(am1.isAnnotationPresent(Startup.class)).andReturn(true);
-		expect(am2.isAnnotationPresent(Startup.class)).andReturn(true);
-		expect(am3.isAnnotationPresent(Startup.class)).andReturn(false);
-		expect(event.getAnnotatedType()).andReturn(annotatedType);
-		expect(annotatedType.getMethods()).andReturn(set);
-
-		replay(event, annotatedType, am1, am2, am3);
-		bootstrap.processAnnotatedType(event, beanManager);
-		verify(event, annotatedType);
-
-		list = getActions(bootstrap);
-		assertNotNull(list);
-		assertFalse(list.isEmpty());
-		assertTrue(list.size() == 2);
-	}
-
-	@Test
-	public void testLoadTempContexts() {
-		StartupBootstrap bootstrap = new StartupBootstrap();
-
-		Logger logger = PowerMock.createMock(Logger.class);
-		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
-		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
-
-		PowerMock.mockStatic(Contexts.class);
-		PowerMock.mockStatic(LoggerProducer.class);
-
-		List<ThreadLocalContext> tempContexts = Whitebox.getInternalState(bootstrap, "tempContexts");
-
-		assertNotNull(tempContexts);
-		assertTrue(tempContexts.isEmpty());
-
-		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
-				bundle).anyTimes();
-		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
-				.anyTimes();
-
-		logger.trace(EasyMock.anyObject(String.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		Contexts.add(EasyMock.anyObject(ThreadLocalContext.class), EasyMock.anyObject(AfterBeanDiscovery.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
-
-		PowerMock.replayAll();
-		bootstrap.loadTempContexts(null);
-		PowerMock.verifyAll();
-
-		assertNotNull(tempContexts);
-		assertEquals(4, tempContexts.size());
-
-		for (ThreadLocalContext tlc : tempContexts) {
-			if (!tlc.getScope().equals(SessionScoped.class) && !tlc.getScope().equals(ConversationScoped.class)
-					&& !tlc.getScope().equals(RequestScoped.class) && !tlc.getScope().equals(ViewScoped.class)) {
-				fail();
-			}
-		}
-	}
-
-	@Test
-	public void testStartup() throws Throwable {
-		StartupBootstrap bootstrap = new StartupBootstrap();
-
-		PowerMock.mockStatic(Contexts.class);
-		PowerMock.mockStatic(LoggerProducer.class);
-
-		Logger logger = PowerMock.createMock(Logger.class);
-		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
-		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
-
-		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
-				bundle).anyTimes();
-		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
-				.anyTimes();
-
-		logger.debug(EasyMock.anyObject(String.class));
-		EasyMock.expectLastCall().anyTimes();
-
-		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
-
-		List<StartupProcessor> list = getActions(bootstrap);
-		list.clear();
-
-		MyProcessor<?> processor = PowerMock.createMock(MyProcessor.class);
-		list.add(processor);
-		expect(processor.process()).andReturn(true).times(1);
-
-		PowerMock.replayAll();
-		bootstrap.startup();
-
-		assertTrue(list.isEmpty());
-		PowerMock.verifyAll();
-	}
-
-	@Test
-	public void testLoadTempContextsAndStartup() {
-
-		StartupBootstrap bootstrap = new StartupBootstrap();
-
-		bootstrap.loadTempContexts(null);
-		Assert.assertFalse(Contexts.getActiveContexts().isEmpty());
-
-		try {
-			bootstrap.startup();
-			Assert.assertTrue(Contexts.getActiveContexts().isEmpty());
-		} catch (Throwable e) {
-			fail();
-		}
-	}
-}
-
-@SuppressWarnings("rawtypes")
-class MyProcessor<T> extends StartupProcessor<T> {
-
-	@SuppressWarnings("unchecked")
-	public MyProcessor(AnnotatedMethod annotatedMethod, BeanManager beanManager) {
-		super(annotatedMethod, beanManager);
-	}
-
-	@Override
-	public int compareTo(final StartupProcessor<T> other) {
-		return 1;
-	}
-}
+///*
+// * 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.bootstrap;
+//
+//import static junit.framework.Assert.assertEquals;
+//import static org.easymock.EasyMock.expect;
+//import static org.easymock.EasyMock.replay;
+//import static org.easymock.EasyMock.verify;
+//import static org.junit.Assert.assertFalse;
+//import static org.junit.Assert.assertNotNull;
+//import static org.junit.Assert.assertTrue;
+//import static org.junit.Assert.fail;
+//
+//import java.lang.reflect.Field;
+//import java.util.HashSet;
+//import java.util.List;
+//import java.util.Locale;
+//import java.util.Set;
+//
+//import javax.enterprise.context.ConversationScoped;
+//import javax.enterprise.context.RequestScoped;
+//import javax.enterprise.context.SessionScoped;
+//import javax.enterprise.inject.spi.AfterBeanDiscovery;
+//import javax.enterprise.inject.spi.AnnotatedMethod;
+//import javax.enterprise.inject.spi.AnnotatedType;
+//import javax.enterprise.inject.spi.BeanManager;
+//import javax.enterprise.inject.spi.ProcessAnnotatedType;
+//
+//import junit.framework.Assert;
+//
+//import org.easymock.EasyMock;
+//import org.junit.Before;
+//import org.junit.Ignore;
+//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 org.powermock.reflect.Whitebox;
+//import org.slf4j.Logger;
+//
+//import br.gov.frameworkdemoiselle.annotation.Startup;
+//import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+//import br.gov.frameworkdemoiselle.internal.context.Contexts;
+//import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+//import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor;
+//import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
+//import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+//import br.gov.frameworkdemoiselle.util.ResourceBundle;
+//
+//@Ignore
+//@RunWith(PowerMockRunner.class)
+//@PrepareForTest({ Contexts.class, LoggerProducer.class, ResourceBundle.class, ResourceBundleProducer.class })
+//@SuppressWarnings({ "rawtypes", "unchecked" })
+//public class StartupBootstrapTest {
+//
+//	private ProcessAnnotatedType event;
+//
+//	private BeanManager beanManager;
+//
+//	private AnnotatedType annotatedType;
+//
+//	@Before
+//	public void before() {
+//		event = EasyMock.createMock(ProcessAnnotatedType.class);
+//		annotatedType = EasyMock.createMock(AnnotatedType.class);
+//		beanManager = null;
+//	}
+//
+//	private List<StartupProcessor> getActions(StartupBootstrap bootstrap) throws IllegalArgumentException,
+//			IllegalAccessException {
+//		Set<Field> fields = Whitebox.getAllStaticFields(StartupBootstrap.class);
+//		List<StartupProcessor> list = null;
+//		for (Field field : fields) {
+//			if (field.getName().equals("processors")) {
+//				list = (List<StartupProcessor>) field.get(bootstrap);
+//			}
+//		}
+//		return list;
+//	}
+//
+//	@Test
+//	public void processAnnotatedType() throws IllegalArgumentException, IllegalAccessException {
+//		StartupBootstrap bootstrap = new StartupBootstrap();
+//		List<StartupProcessor> list = getActions(bootstrap);
+//
+//		assertNotNull(list);
+//		assertTrue(list.isEmpty());
+//
+//		AnnotatedMethod am1 = PowerMock.createMock(AnnotatedMethod.class);
+//		AnnotatedMethod am2 = PowerMock.createMock(AnnotatedMethod.class);
+//		AnnotatedMethod am3 = PowerMock.createMock(AnnotatedMethod.class);
+//
+//		Set<AnnotatedMethod> set = new HashSet<AnnotatedMethod>();
+//		set.add(am1);
+//		set.add(am2);
+//		set.add(am3);
+//
+//		expect(am1.isAnnotationPresent(Startup.class)).andReturn(true);
+//		expect(am2.isAnnotationPresent(Startup.class)).andReturn(true);
+//		expect(am3.isAnnotationPresent(Startup.class)).andReturn(false);
+//		expect(event.getAnnotatedType()).andReturn(annotatedType);
+//		expect(annotatedType.getMethods()).andReturn(set);
+//
+//		replay(event, annotatedType, am1, am2, am3);
+//		bootstrap.processAnnotatedType(event, beanManager);
+//		verify(event, annotatedType);
+//
+//		list = getActions(bootstrap);
+//		assertNotNull(list);
+//		assertFalse(list.isEmpty());
+//		assertTrue(list.size() == 2);
+//	}
+//
+//	@SuppressWarnings("static-access")
+//	@Test
+//	public void testLoadTempContexts() {
+//		StartupBootstrap bootstrap = new StartupBootstrap();
+//
+//		Logger logger = PowerMock.createMock(Logger.class);
+//		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
+//		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
+//
+//		PowerMock.mockStatic(Contexts.class);
+//		PowerMock.mockStatic(LoggerProducer.class);
+//
+//		List<ThreadLocalContext> tempContexts = Whitebox.getInternalState(bootstrap, "tempContexts");
+//
+//		assertNotNull(tempContexts);
+//		assertTrue(tempContexts.isEmpty());
+//
+//		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
+//		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+//				bundle).anyTimes();
+//		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
+//				.anyTimes();
+//
+//		logger.trace(EasyMock.anyObject(String.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		Contexts.add(EasyMock.anyObject(ThreadLocalContext.class), EasyMock.anyObject(AfterBeanDiscovery.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
+//
+//		PowerMock.replayAll();
+//		bootstrap.loadTempContexts(null);
+//		PowerMock.verifyAll();
+//
+//		assertNotNull(tempContexts);
+//		assertEquals(4, tempContexts.size());
+//
+//		for (ThreadLocalContext tlc : tempContexts) {
+//			if (!tlc.getScope().equals(SessionScoped.class) && !tlc.getScope().equals(ConversationScoped.class)
+//					&& !tlc.getScope().equals(RequestScoped.class) && !tlc.getScope().equals(ViewScoped.class)) {
+//				fail();
+//			}
+//		}
+//	}
+//
+//	@SuppressWarnings("static-access")
+//	@Test
+//	public void testStartup() throws Throwable {
+//		StartupBootstrap bootstrap = new StartupBootstrap();
+//
+//		PowerMock.mockStatic(Contexts.class);
+//		PowerMock.mockStatic(LoggerProducer.class);
+//
+//		Logger logger = PowerMock.createMock(Logger.class);
+//		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
+//		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
+//
+//		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
+//		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+//				bundle).anyTimes();
+//		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
+//				.anyTimes();
+//
+//		logger.debug(EasyMock.anyObject(String.class));
+//		EasyMock.expectLastCall().anyTimes();
+//
+//		Whitebox.setInternalState(AbstractBootstrap.class, ResourceBundleProducer.class, bundleFactory);
+//
+//		List<StartupProcessor> list = getActions(bootstrap);
+//		list.clear();
+//
+//		MyProcessor<?> processor = PowerMock.createMock(MyProcessor.class);
+//		list.add(processor);
+//		expect(processor.process()).andReturn(true).times(1);
+//
+//		PowerMock.replayAll();
+//		bootstrap.startup();
+//
+//		assertTrue(list.isEmpty());
+//		PowerMock.verifyAll();
+//	}
+//
+//	@SuppressWarnings("static-access")
+//	@Test
+//	public void testLoadTempContextsAndStartup() {
+//
+//		StartupBootstrap bootstrap = new StartupBootstrap();
+//
+//		bootstrap.loadTempContexts(null);
+//		Assert.assertFalse(Contexts.getActiveContexts().isEmpty());
+//
+//		try {
+//			bootstrap.startup();
+//			Assert.assertTrue(Contexts.getActiveContexts().isEmpty());
+//		} catch (Throwable e) {
+//			fail();
+//		}
+//	}
+//}
+//
+//@SuppressWarnings("rawtypes")
+//class MyProcessor<T> extends StartupProcessor<T> {
+//
+//	@SuppressWarnings("unchecked")
+//	public MyProcessor(AnnotatedMethod annotatedMethod, BeanManager beanManager) {
+//		super(annotatedMethod, beanManager);
+//	}
+//
+//	@Override
+//	public int compareTo(final StartupProcessor<T> other) {
+//		return 1;
+//	}
+// }
@@ -638,4 +638,4 @@
 //		assertEquals("All LowerCase", config.conventionAllLowerCase);
 //	}
 //
 -//}
+//}
 \ No newline at end of file
@@ -0,0 +1,520 @@
+/*
+ * 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.configuration;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.easymock.PowerMock.mockStatic;
+
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+import org.junit.After;
+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 org.powermock.reflect.Whitebox;
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.configuration.ConfigType;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(CoreBootstrap.class)
+public class ConfigurationLoaderWithArrayTest {
+
+	private ConfigurationLoader configurationLoader;
+
+	@Configuration(type = ConfigType.PROPERTIES , resource = "configuration-with-array")
+	public class ConfigurationPropertiesWithArray {
+		
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
+		 */
+		
+		protected BigDecimal[] bigDecimalArray;
+		protected BigInteger[] bigIntegerArray;
+		protected boolean[] booleanArray;
+		protected byte[] byteArray;
+		protected Calendar[] calendarArray;
+		protected Color[] colorArray;
+		protected Date[] dateArray;
+		protected double[] doubleArray;
+		protected float[] floatArray;
+		protected int[] integerArray;
+		protected Locale[] localeArray;
+		protected long[] longArray;
+		protected short[] shortArray;
+		protected URL[] urlArray;
+		protected String[] stringArray;
+		
+	}
+	
+	@Configuration(type = ConfigType.XML, resource = "configuration-with-array")
+	public class ConfigurationXMLWithArray {
+		
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
+		 */
+		
+		protected BigDecimal[] bigDecimalArray;
+		protected BigInteger[] bigIntegerArray;
+		protected boolean[] booleanArray;
+		protected byte[] byteArray;
+		protected Calendar[] calendarArray;
+		protected Color[] colorArray;
+		protected Date[] dateArray;
+		protected double[] doubleArray;
+		protected float[] floatArray;
+		protected int[] integerArray;
+		protected Locale[] localeArray;
+		protected long[] longArray;
+		protected short[] shortArray;
+		protected URL[] urlArray;
+		protected String[] stringArray;
+		
+	}
+	
+
+	@Before
+	public void setUp() throws Exception {
+		Logger logger;
+		ResourceBundle bundle;
+		logger = PowerMock.createMock(Logger.class);
+		bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		configurationLoader = new ConfigurationLoader();
+		Whitebox.setInternalState(this.configurationLoader, "bundle", bundle);
+		Whitebox.setInternalState(this.configurationLoader, "logger", logger);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithIntegerArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Integer integerValue = config.integerArray[0];
+		
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerArray.length);
+	}
+	
+	
+	@Test
+	public void testConfigurationPropertiesWithShortArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Short shortValue = config.shortArray[0];
+		
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithByteArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Byte byteValue = config.byteArray[0];
+		
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBooleanArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Boolean booleanValue = config.booleanArray[0];
+		
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithLongArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Long longValue = config.longArray[0];
+		
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithFloatArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Float floatValue = config.floatArray[0];
+		
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithDoubleArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Double doubleValue = config.doubleArray[0];
+		
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBigDecimalArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		BigDecimal bigDecimalValue = config.bigDecimalArray[0];
+		
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBigIntegerArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		BigInteger bigIntegerValue = config.bigIntegerArray[0];
+		
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithCalendarArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Calendar calendarValue = config.calendarArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+		
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithDateArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Date dateValue = config.dateArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+		
+		Date date = new Date(calendar.getTimeInMillis());
+		
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithColorArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Color colorValue = config.colorArray[0];
+		
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithLocaleArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Locale localeValue = config.localeArray[0];
+		Locale localeValue2 = config.localeArray[1];
+		
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithURLArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		URL urlValue = config.urlArray[0];
+		
+		URL otherURL = null;
+		
+		try {
+			otherURL = new URL("http://www.test.com");
+		}
+		catch(Exception e) {
+			
+		}
+		
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithStringArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		String stringValue = config.stringArray[0];
+		
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringArray.length);
+	}
+
+	private ConfigurationPropertiesWithArray prepareConfigurationPropertiesWithArray() {
+		ConfigurationPropertiesWithArray config = new ConfigurationPropertiesWithArray();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+	
+	@Test
+	public void testConfigurationXMLWithIntegerArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Integer integerValue = config.integerArray[0];
+		
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerArray.length);
+	}
+	
+	
+	@Test
+	public void testConfigurationXMLWithShortArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Short shortValue = config.shortArray[0];
+		
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithByteArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Byte byteValue = config.byteArray[0];
+		
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBooleanArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Boolean booleanValue = config.booleanArray[0];
+		
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithLongArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Long longValue = config.longArray[0];
+		
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithFloatArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Float floatValue = config.floatArray[0];
+		
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithDoubleArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Double doubleValue = config.doubleArray[0];
+		
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBigDecimalArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		BigDecimal bigDecimalValue = config.bigDecimalArray[0];
+		
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBigIntegerArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		BigInteger bigIntegerValue = config.bigIntegerArray[0];
+		
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithCalendarArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Calendar calendarValue = config.calendarArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+		
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithDateArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Date dateValue = config.dateArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+		
+		Date date = new Date(calendar.getTimeInMillis());
+		
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithColorArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Color colorValue = config.colorArray[0];
+		
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithLocaleArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Locale localeValue = config.localeArray[0];
+		Locale localeValue2 = config.localeArray[1];
+		
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithURLArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		URL urlValue = config.urlArray[0];
+		
+		URL otherURL = null;
+		
+		try {
+			otherURL = new URL("http://www.test.com");
+		}
+		catch(Exception e) {
+			
+		}
+		
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithStringArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		String stringValue = config.stringArray[0];
+		
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringArray.length);
+	}
+
+	private ConfigurationXMLWithArray prepareConfigurationXMLWithArray() {
+		ConfigurationXMLWithArray config = new ConfigurationXMLWithArray();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+}
@@ -0,0 +1,542 @@
+/*
+ * 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.configuration;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.easymock.PowerMock.mockStatic;
+
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.After;
+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 org.powermock.reflect.Whitebox;
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.configuration.ConfigType;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(CoreBootstrap.class)
+public class ConfigurationLoaderWithListTest {
+
+	private ConfigurationLoader configurationLoader;
+
+	@Configuration(type = ConfigType.PROPERTIES, resource = "configuration-with-list")
+	public class ConfigurationPropertiesWithList {
+
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for List type
+		 */
+
+		protected List<BigDecimal> bigDecimalList;
+
+		protected List<BigInteger> bigIntegerList;
+
+		protected List<Boolean> booleanList;
+
+		protected List<Byte> byteList;
+
+		protected List<Calendar> calendarList;
+
+		protected List<Color> colorList;
+
+		protected List<Date> dateList;
+
+		protected List<Double> doubleList;
+
+		protected List<Float> floatList;
+
+		protected List<Integer> integerList;
+
+		protected List<Locale> localeList;
+
+		protected List<Long> longList;
+
+		protected List<Short> shortList;
+
+		protected List<URL> urlList;
+
+		protected List<String> stringList;
+	}
+
+	@Configuration(type = ConfigType.XML, resource = "configuration-with-list")
+	public class ConfigurationXMLWithList {
+
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for List type
+		 */
+
+		protected List<BigDecimal> bigDecimalList;
+
+		protected List<BigInteger> bigIntegerList;
+
+		protected List<Boolean> booleanList;
+
+		protected List<Byte> byteList;
+
+		protected List<Calendar> calendarList;
+
+		protected List<Color> colorList;
+
+		protected List<Date> dateList;
+
+		protected List<Double> doubleList;
+
+		protected List<Float> floatList;
+
+		protected List<Integer> integerList;
+
+		protected List<Locale> localeList;
+
+		protected List<Long> longList;
+
+		protected List<Short> shortList;
+
+		protected List<URL> urlList;
+
+		protected List<String> stringList;
+	}
+
+	@Before
+	public void setUp() throws Exception {
+		Logger logger;
+		ResourceBundle bundle;
+		logger = PowerMock.createMock(Logger.class);
+		bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		configurationLoader = new ConfigurationLoader();
+		Whitebox.setInternalState(this.configurationLoader, "bundle", bundle);
+		Whitebox.setInternalState(this.configurationLoader, "logger", logger);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithIntegerList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Integer integerValue = config.integerList.get(0);
+
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithShortList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Short shortValue = config.shortList.get(0);
+
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithByteList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Byte byteValue = config.byteList.get(0);
+
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBooleanList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Boolean booleanValue = config.booleanList.get(0);
+
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithLongList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Long longValue = config.longList.get(0);
+
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithFloatList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Float floatValue = config.floatList.get(0);
+
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithDoubleList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Double doubleValue = config.doubleList.get(0);
+
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBigDecimalList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		BigDecimal bigDecimalValue = config.bigDecimalList.get(0);
+
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBigIntegerList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		BigInteger bigIntegerValue = config.bigIntegerList.get(0);
+
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithCalendarList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Calendar calendarValue = config.calendarList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithDateList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Date dateValue = config.dateList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+
+		Date date = new Date(calendar.getTimeInMillis());
+
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithColorList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Color colorValue = config.colorList.get(0);
+
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithLocaleList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Locale localeValue = config.localeList.get(0);
+		Locale localeValue2 = config.localeList.get(1);
+
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithURLList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		URL urlValue = config.urlList.get(0);
+
+		URL otherURL = null;
+
+		try {
+			otherURL = new URL("http://www.test.com");
+		} catch (Exception e) {
+
+		}
+
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithStringList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		String stringValue = config.stringList.get(0);
+
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringList.size());
+	}
+
+	private ConfigurationPropertiesWithList prepareConfigurationPropertiesWithList() {
+		ConfigurationPropertiesWithList config = new ConfigurationPropertiesWithList();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+
+	@Test
+	public void testConfigurationXMLWithIntegerList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Integer integerValue = config.integerList.get(0);
+
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithShortList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Short shortValue = config.shortList.get(0);
+
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithByteList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Byte byteValue = config.byteList.get(0);
+
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBooleanList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Boolean booleanValue = config.booleanList.get(0);
+
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithLongList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Long longValue = config.longList.get(0);
+
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithFloatList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Float floatValue = config.floatList.get(0);
+
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithDoubleList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Double doubleValue = config.doubleList.get(0);
+
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBigDecimalList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		BigDecimal bigDecimalValue = config.bigDecimalList.get(0);
+
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBigIntegerList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		BigInteger bigIntegerValue = config.bigIntegerList.get(0);
+
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithCalendarList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Calendar calendarValue = config.calendarList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithDateList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Date dateValue = config.dateList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+
+		Date date = new Date(calendar.getTimeInMillis());
+
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithColorList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Color colorValue = config.colorList.get(0);
+
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithLocaleList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Locale localeValue = config.localeList.get(0);
+		Locale localeValue2 = config.localeList.get(1);
+
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithURLList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		URL urlValue = config.urlList.get(0);
+
+		URL otherURL = null;
+
+		try {
+			otherURL = new URL("http://www.test.com");
+		} catch (Exception e) {
+
+		}
+
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithStringList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		String stringValue = config.stringList.get(0);
+
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringList.size());
+	}
+
+	private ConfigurationXMLWithList prepareConfigurationXMLWithList() {
+		ConfigurationXMLWithList config = new ConfigurationXMLWithList();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+}
-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);
+//		}
+//	}
+//
+//}
-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);
+//		}
+//	}
+//
+//}
-/*
- * 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);
+//		}
+//	}
+//}
-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);
+//	}
+//}
-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) {
+//		}
+//	}
+//
+//}
-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);
+//	}
+//
+//}
@@ -43,20 +43,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
  
-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.slf4j.Logger;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
  
 public class TransactionalInterceptorTest {
  
@@ -73,26 +66,26 @@ public class TransactionalInterceptorTest {
 		}
 	}
  
-	@Before
-	@SuppressWarnings("unchecked")
-	public void setUp() throws Exception {
-		Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class);
-		Instance<TransactionInfo> transactionContextInstance = EasyMock.createMock(Instance.class);
-
-		Logger logger = EasyMock.createMock(Logger.class);
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-		transaction = EasyMock.createMock(Transaction.class);
-		TransactionInfo context = new TransactionInfo();
-
-		this.interceptor = new TransactionalInterceptor(transactionInstance, transactionContextInstance, logger, bundle);
-		this.ic = EasyMock.createMock(InvocationContext.class);
-
-		expect(transactionInstance.get()).andReturn(transaction).anyTimes();
-		expect(transactionContextInstance.get()).andReturn(context).anyTimes();
-		expect(this.ic.proceed()).andReturn(null);
-		expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));
-		replay(this.ic, transactionInstance, transactionContextInstance);
-	}
+	// @Before
+	// @SuppressWarnings("unchecked")
+	// public void setUp() throws Exception {
+	// Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class);
+	// Instance<TransactionInfo> transactionContextInstance = EasyMock.createMock(Instance.class);
+	//
+	// Logger logger = EasyMock.createMock(Logger.class);
+	// ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+	// transaction = EasyMock.createMock(Transaction.class);
+	// TransactionInfo context = new TransactionInfo();
+	//
+	// this.interceptor = new TransactionalInterceptor(transactionInstance, transactionContextInstance, logger, bundle);
+	// this.ic = EasyMock.createMock(InvocationContext.class);
+	//
+	// expect(transactionInstance.get()).andReturn(transaction).anyTimes();
+	// expect(transactionContextInstance.get()).andReturn(context).anyTimes();
+	// expect(this.ic.proceed()).andReturn(null);
+	// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));
+	// replay(this.ic, transactionInstance, transactionContextInstance);
+	// }
  
 	@Test
 	public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback()
@@ -36,16 +36,10 @@
  */
 package br.gov.frameworkdemoiselle.internal.producer;
  
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
 import static org.junit.Assert.assertTrue;
  
 import java.util.Locale;
  
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -54,7 +48,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
  
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.annotation.Name;
  
 public class ResourceBundleProducerTest {
  
@@ -89,42 +82,42 @@ public class ResourceBundleProducerTest {
 		}
 	}
  
-	@Test
-	public void testCreateNullInjectionPoint() {
-		ResourceBundleProducer factory = new ResourceBundleProducer();
-		Assert.assertNotNull(factory.create((InjectionPoint) null, Locale.getDefault()));
-	}
-
-	@Test
-	public void testCreateInjectionPointNameAnnoted() {
-		Name name = EasyMock.createMock(Name.class);
-		expect(name.value()).andReturn("demoiselle-core-bundle");
-		replay(name);
-
-		Annotated annotated = EasyMock.createMock(Annotated.class);
-		expect(annotated.getAnnotation(Name.class)).andReturn(name).anyTimes();
-		expect(annotated.isAnnotationPresent(Name.class)).andReturn(true).anyTimes();
-		replay(annotated);
-
-		InjectionPoint ip = EasyMock.createMock(InjectionPoint.class);
-		expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
-		replay(ip);
-
-		ResourceBundleProducer factory = new ResourceBundleProducer();
-		Assert.assertNotNull(factory.create(ip, Locale.getDefault()));
-	}
-
-	@Test
-	public void testCreateInjectionPointNameUnannoted() {
-		Annotated annotated = EasyMock.createMock(Annotated.class);
-		expect(annotated.isAnnotationPresent(Name.class)).andReturn(false).anyTimes();
-		replay(annotated);
-
-		InjectionPoint ip = EasyMock.createMock(InjectionPoint.class);
-		expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
-		replay(ip);
-
-		ResourceBundleProducer factory = new ResourceBundleProducer();
-		Assert.assertNotNull(factory.create(ip, Locale.getDefault()));
-	}
+	// @Test
+	// public void testCreateNullInjectionPoint() {
+	// ResourceBundleProducer factory = new ResourceBundleProducer();
+	// Assert.assertNotNull(factory.create((InjectionPoint) null, Locale.getDefault()));
+	// }
+
+	// @Test
+	// public void testCreateInjectionPointNameAnnoted() {
+	// Name name = EasyMock.createMock(Name.class);
+	// expect(name.value()).andReturn("demoiselle-core-bundle");
+	// replay(name);
+	//
+	// Annotated annotated = EasyMock.createMock(Annotated.class);
+	// expect(annotated.getAnnotation(Name.class)).andReturn(name).anyTimes();
+	// expect(annotated.isAnnotationPresent(Name.class)).andReturn(true).anyTimes();
+	// replay(annotated);
+	//
+	// InjectionPoint ip = EasyMock.createMock(InjectionPoint.class);
+	// expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
+	// replay(ip);
+	//
+	// ResourceBundleProducer factory = new ResourceBundleProducer();
+	// Assert.assertNotNull(factory.create(ip, Locale.getDefault()));
+	// }
+
+	// @Test
+	// public void testCreateInjectionPointNameUnannoted() {
+	// Annotated annotated = EasyMock.createMock(Annotated.class);
+	// expect(annotated.isAnnotationPresent(Name.class)).andReturn(false).anyTimes();
+	// replay(annotated);
+	//
+	// InjectionPoint ip = EasyMock.createMock(InjectionPoint.class);
+	// expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
+	// replay(ip);
+	//
+	// ResourceBundleProducer factory = new ResourceBundleProducer();
+	// Assert.assertNotNull(factory.create(ip, Locale.getDefault()));
+	// }
 }
@@ -0,0 +1,50 @@
+# 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.
+
+integer.array = 2147483647, 10993, 12330, 129399
+short.array = 32767, 123, 5512, 4212
+byte.array = 127, 12, 51, 123, 11, 5, 1, -12
+boolean.array = true, false
+long.array = 9223372036854775807, 0901920390123, 1235234523, 134230094, 66123413423
+float.array = 3.4028235E38, 34.244, 2412.423444, 513.234, 10000.000
+double.array = 1.7976931348623157E308, 1231234.00120349192348123, 1234123512341.9134828348238
+big.decimal.array = 16578.69899, 48787.548877788, 4487787.559
+big.integer.array = 1998987987897, 89789498171, 21474836475
+calendar.array = 2012-06-14 10:10:00, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+date.array = 2012-08-14 18:10:50, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+color.array = #808080, #cccccc, #ABCCCC
+locale.array = en, pt_br, ca
+url.array = http://www.test.com, https://test.of.test.com, ftp://192.168.0.1
+string.array = Test, One, Two
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<configuration>
+
+	<integer>
+		<array>2147483647</array>
+		<array>10993</array>
+		<array>12330</array>
+		<array>129399</array>
+	</integer>
+	
+	<short>
+		<array>32767</array>
+		<array>123</array>
+		<array>5512</array>
+		<array>4212</array>
+	</short>
+	
+	<byte>
+		<array>127</array>
+		<array>12</array>
+		<array>51</array>
+		<array>123</array>
+		<array>11</array>
+		<array>5</array>
+		<array>1</array>
+		<array>-12</array>
+	</byte>
+	
+	<boolean>
+		<array>true</array>
+		<array>false</array>
+	</boolean>
+	
+	<long>
+		<array>9223372036854775807</array>
+		<array>0901920390123</array>
+		<array>1235234523</array>
+		<array>134230094</array>
+		<array>66123413423</array>
+	</long>
+	
+	<float>
+		<array>3.4028235E38</array>
+		<array>34.244</array>
+		<array>2412.423444</array>
+		<array>513.234</array>
+		<array>10000.000</array>
+	</float>
+	
+	<double>
+		<array>1.7976931348623157E308</array>
+		<array>1231234.00120349192348123</array>
+		<array>1234123512341.9134828348238</array>
+	</double>
+	
+	<big>
+		<decimal>
+			<array>16578.69899</array>
+			<array>48787.548877788</array>
+			<array>4487787.559</array>
+		</decimal>
+	</big>
+	
+	<big>
+		<integer>
+			<array>1998987987897</array>
+			<array>89789498171</array>
+			<array>21474836475</array>
+		</integer>
+	</big>
+	
+	<calendar>
+		<array>2012-06-14 10:10:00</array>
+		<array>2012-07-14 10:10:00</array>
+		<array>2012-06-15 18:10:00</array>
+	</calendar>
+	
+	<date>
+		<array>2012-08-14 18:10:50</array>
+		<array>2012-07-14 10:10:00</array>
+		<array>2012-06-15 18:10:00</array>
+	</date>
+	
+	<color>
+		<array>#808080</array>
+		<array>#cccccc</array>
+		<array> #ABCCCC</array>
+	</color>
+	
+	<locale>
+		<array>en</array>
+		<array>pt_br</array>
+		<array>ca</array>
+	</locale>
+	
+	<url>
+		<array>http://www.test.com</array>
+		<array>https://test.of.test.com</array>
+		<array>ftp://192.168.0.1</array>
+	</url>
+	
+	<string>
+		<array>Test</array>
+		<array>One</array>
+		<array>Two</array>
+	</string>
+
+</configuration>
 \ No newline at end of file
@@ -0,0 +1,50 @@
+# 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.
+
+integer.list = 2147483647, 10993, 12330, 129399
+short.list = 32767, 123, 5512, 4212
+byte.list = 127, 12, 51, 123, 11, 5, 1, -12
+boolean.list = true, false
+long.list = 9223372036854775807, 0901920390123, 1235234523, 134230094, 66123413423
+float.list = 3.4028235E38, 34.244, 2412.423444, 513.234, 10000.000
+double.list = 1.7976931348623157E308, 1231234.00120349192348123, 1234123512341.9134828348238
+big.decimal.list = 16578.69899, 48787.548877788, 4487787.559
+big.integer.list = 1998987987897, 89789498171, 21474836475
+calendar.list = 2012-06-14 10:10:00, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+date.list = 2012-08-14 18:10:50, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+color.list = #808080, #cccccc, #ABCCCC
+locale.list = en, pt_br, ca
+url.list = http://www.test.com, https://test.of.test.com, ftp://192.168.0.1
+string.list = Test, One, Two
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<configuration>
+
+	<integer>
+		<list>2147483647</list>
+		<list>10993</list>
+		<list>12330</list>
+		<list>129399</list>
+	</integer>
+	
+	<short>
+		<list>32767</list>
+		<list>123</list>
+		<list>5512</list>
+		<list>4212</list>
+	</short>
+	
+	<byte>
+		<list>127</list>
+		<list>12</list>
+		<list>51</list>
+		<list>123</list>
+		<list>11</list>
+		<list>5</list>
+		<list>1</list>
+		<list>-12</list>
+	</byte>
+	
+	<boolean>
+		<list>true</list>
+		<list>false</list>
+	</boolean>
+	
+	<long>
+		<list>9223372036854775807</list>
+		<list>0901920390123</list>
+		<list>1235234523</list>
+		<list>134230094</list>
+		<list>66123413423</list>
+	</long>
+	
+	<float>
+		<list>3.4028235E38</list>
+		<list>34.244</list>
+		<list>2412.423444</list>
+		<list>513.234</list>
+		<list>10000.000</list>
+	</float>
+	
+	<double>
+		<list>1.7976931348623157E308</list>
+		<list>1231234.00120349192348123</list>
+		<list>1234123512341.9134828348238</list>
+	</double>
+	
+	<big>
+		<decimal>
+			<list>16578.69899</list>
+			<list>48787.548877788</list>
+			<list>4487787.559</list>
+		</decimal>
+	</big>
+	
+	<big>
+		<integer>
+			<list>1998987987897</list>
+			<list>89789498171</list>
+			<list>21474836475</list>
+		</integer>
+	</big>
+	
+	<calendar>
+		<list>2012-06-14 10:10:00</list>
+		<list>2012-07-14 10:10:00</list>
+		<list>2012-06-15 18:10:00</list>
+	</calendar>
+	
+	<date>
+		<list>2012-08-14 18:10:50</list>
+		<list>2012-07-14 10:10:00</list>
+		<list>2012-06-15 18:10:00</list>
+	</date>
+	
+	<color>
+		<list>#808080</list>
+		<list>#cccccc</list>
+		<list> #ABCCCC</list>
+	</color>
+	
+	<locale>
+		<list>en</list>
+		<list>pt_br</list>
+		<list>ca</list>
+	</locale>
+	
+	<url>
+		<list>http://www.test.com</list>
+		<list>https://test.of.test.com</list>
+		<list>ftp://192.168.0.1</list>
+	</url>
+	
+	<string>
+		<list>Test</list>
+		<list>One</list>
+		<list>Two</list>
+	</string>
+
+</configuration>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Demoiselle Framework
  Copyright (C) 2010 SERPRO
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Demoiselle Framework
  Copyright (C) 2010 SERPRO
 package br.gov.frameworkdemoiselle.internal.producer;
  
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,29 +39,45 @@ public class EntityManagerFactoryProducer implements Serializable {
 	@Name("demoiselle-jpa-bundle")
 	private ResourceBundle bundle;
  
-	private final Map<String, EntityManagerFactory> cache = Collections
-			.synchronizedMap(new HashMap<String, EntityManagerFactory>());
+	// private final Map<String, EntityManagerFactory> cache = Collections
+	// .synchronizedMap(new HashMap<String, EntityManagerFactory>());
+
+	/*
+	 * private final Map<Key, EntityManagerFactory> cache = Collections .synchronizedMap(new HashMap<Key,
+	 * EntityManagerFactory>());
+	 */
+
+	private final Map<ClassLoader, Map<String, EntityManagerFactory>> factoryCache = Collections
+			.synchronizedMap(new HashMap<ClassLoader, Map<String, EntityManagerFactory>>());
  
 	public EntityManagerFactory create(String persistenceUnit) {
 		EntityManagerFactory factory;
  
-		if (cache.containsKey(persistenceUnit)) {
-			factory = cache.get(persistenceUnit);
+		ClassLoader c = Thread.currentThread().getContextClassLoader();
+
+		if (factoryCache.containsKey(c)) {
+			Map<String, EntityManagerFactory> localCache = factoryCache.get(c);
+			if (localCache.containsKey(persistenceUnit)) {
+				factory = localCache.get(persistenceUnit);
+			} else {
+				factory = Persistence.createEntityManagerFactory(persistenceUnit);
+				localCache.put(persistenceUnit, factory);
+			}
 		} else {
+			Map<String, EntityManagerFactory> localCache = new HashMap<String, EntityManagerFactory>();
 			factory = Persistence.createEntityManagerFactory(persistenceUnit);
-			cache.put(persistenceUnit, factory);
+			localCache.put(persistenceUnit, factory);
+			factoryCache.put(c, localCache);
 		}
  
 		return factory;
 	}
  
-	@PostConstruct
-	public void init() {
-		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-
+	private String[] loadPersistenceUnitFromClassloader(ClassLoader classLoader) {
 		try {
+			ArrayList<String> persistenceUnits = new ArrayList<String>();
 			DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			Document document = documentBuilder.parse(contextClassLoader.getResourceAsStream(ENTITY_MANAGER_RESOURCE));
+			Document document = documentBuilder.parse(classLoader.getResourceAsStream(ENTITY_MANAGER_RESOURCE));
 			NodeList nodes = document.getElementsByTagName("persistence-unit");
  
 			String persistenceUnit = "";
@@ -70,30 +87,57 @@ public class EntityManagerFactoryProducer implements Serializable {
  
 				if ("".equals(persistenceUnit)) {
 					throw new DemoiselleException(bundle.getString("can-not-get-persistence-unit-from-persistence"));
+				} else {
+					persistenceUnits.add(persistenceUnit);
 				}
+				// logger.debug(bundle.getString("persistence-unit-name-found",
+				// persistenceUnit));
  
-				create(persistenceUnit);
-				logger.debug(bundle.getString("persistence-unit-name-found", persistenceUnit));
 			}
  
+			return persistenceUnits.toArray(new String[0]);
+
 		} catch (Exception cause) {
 			String message = bundle.getString("can-not-get-persistence-unit-from-persistence");
 			logger.error(message, cause);
  
 			throw new DemoiselleException(message, cause);
 		}
+
+	}
+
+	@PostConstruct
+	public void loadPersistenceUnits() {
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		for (String persistenceUnit : loadPersistenceUnitFromClassloader(contextClassLoader)) {
+			create(persistenceUnit);
+			logger.debug(bundle.getString("persistence-unit-name-found", persistenceUnit));
+		}
 	}
  
 	@PreDestroy
 	public void close() {
-		for (EntityManagerFactory factory : cache.values()) {
-			factory.close();
+		for (Map<String, EntityManagerFactory> factories : factoryCache.values()) {
+			for (EntityManagerFactory factory : factories.values()) {
+				factory.close();
+			}
 		}
-
-		cache.clear();
+		factoryCache.clear();
 	}
  
 	public Map<String, EntityManagerFactory> getCache() {
-		return cache;
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		Map<String, EntityManagerFactory> result = factoryCache.get(classLoader);
+
+		if (result == null || result.isEmpty()) {
+			logger.debug(bundle.getString("entity-manager-factory-not-found-in-cache"));
+			for (String persistenceUnit : loadPersistenceUnitFromClassloader(classLoader)) {
+				create(persistenceUnit);
+				result = factoryCache.get(classLoader);
+			}
+		}
+
+		return result;
 	}
+
 }
@@ -39,6 +39,8 @@ package br.gov.frameworkdemoiselle.template;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
  
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
@@ -46,9 +48,9 @@ import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.EntityManager;
 import javax.persistence.Enumerated;
-import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
+import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
@@ -78,7 +80,6 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
  
 	private static final long serialVersionUID = 1L;
  
-//	@PersistenceContext
 	private EntityManager entityManager;
  
 	@Inject
@@ -105,10 +106,10 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 	}
  
 	protected EntityManager getEntityManager() {
-		if(this.entityManager == null) {
+		if (this.entityManager == null) {
 			this.entityManager = Beans.getReference(EntityManager.class);
 		}
-		
+
 		return this.entityManager;
 	}
  
@@ -117,6 +118,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			PaginationContext context = paginationContext.get();
 			pagination = context.getPagination(getBeanClass());
 		}
+
 		return pagination;
 	}
  
@@ -132,6 +134,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 		if (cause instanceof TransactionRequiredException) {
 			String message = bundle.get().getString("no-transaction-active", "frameworkdemoiselle.transaction.class",
 					Configuration.DEFAULT_RESOURCE);
+
 			throw new DemoiselleException(message, cause);
  
 		} else {
@@ -164,31 +167,80 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 	}
  
 	@Override
-	@SuppressWarnings("unchecked")
 	public List<T> findAll() {
-		final String jpql = "select this from " + getBeanClass().getSimpleName() + " this";
-		final Query query = getEntityManager().createQuery(jpql);
-
-		final Pagination pagination = getPagination();
-		if (pagination != null) {
-			pagination.setTotalResults(this.countAll().intValue());
-			query.setFirstResult(pagination.getFirstResult());
-			query.setMaxResults(pagination.getPageSize());
+		return findByJPQL("select this from " + getBeanClass().getSimpleName() + " this");
+	}
+
+	/**
+	 * Search JPQL integrated into the context of paging
+	 * 
+	 * @param jpql
+	 *            - query in syntax JPQL
+	 * @return a list of entities
+	 */
+	protected List<T> findByJPQL(String jpql) {
+		TypedQuery<T> listQuery = getEntityManager().createQuery(jpql, getBeanClass());
+
+		if (getPagination() != null) {
+			String countQuery = createCountQuery(jpql);
+			Query query = getEntityManager().createQuery(countQuery);
+			Number cResults = (Number) query.getSingleResult();
+			getPagination().setTotalResults(cResults.intValue());
+			listQuery.setFirstResult(getPagination().getFirstResult());
+			listQuery.setMaxResults(getPagination().getPageSize());
+		}
+
+		return listQuery.getResultList();
+	}
+
+	/**
+	 * Search CriteriaQuery integrated into the context of paging
+	 * 
+	 * @param criteriaQuery
+	 *            - structure CriteriaQuery
+	 * @return a list of entities
+	 */
+	public List<T> findByCriteriaQuery(CriteriaQuery<T> criteriaQuery) {
+		TypedQuery<T> listQuery = getEntityManager().createQuery(criteriaQuery);
+
+		if (getPagination() != null) {
+			CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+			CriteriaQuery<Long> countQuery = builder.createQuery(Long.class);
+			countQuery.select(builder.count(countQuery.from(getBeanClass())));
+			countQuery.where(criteriaQuery.getRestriction());
+			getEntityManager().createQuery(countQuery);
+			getPagination().setTotalResults((int) (getEntityManager().createQuery(countQuery).getSingleResult() + 0));
+			listQuery.setFirstResult(getPagination().getFirstResult());
+			listQuery.setMaxResults(getPagination().getPageSize());
 		}
  
-		List<T> lista = query.getResultList();
-		return lista;
+		return listQuery.getResultList();
 	}
  
 	/**
-	 * Retrieves the number of persisted objects for the current class type.
+	 * Converts a query into a count query
 	 * 
-	 * @return the row count
+	 * @param query
+	 * @return
 	 */
-	private Long countAll() {
-		final Query query = getEntityManager().createQuery(
-				"select count(this) from " + beanClass.getSimpleName() + " this");
-		return (Long) query.getSingleResult();
+	private String createCountQuery(String query) {
+		Matcher matcher = Pattern.compile("[Ss][Ee][Ll][Ee][Cc][Tt](.+)[Ff][Rr][Oo][Mm]").matcher(query);
+
+		if (matcher.find()) {
+			String group = matcher.group(1).trim();
+			query = query.replaceFirst(group, "COUNT(" + group + ")");
+			matcher = Pattern.compile("[Oo][Rr][Dd][Ee][Rr](.+)").matcher(query);
+
+			if (matcher.find()) {
+				group = matcher.group(0);
+				query = query.replaceFirst(group, "");
+			}
+
+			return query;
+
+		} else {
+			throw new DemoiselleException(bundle.get().getString("malformed-jpql"));
+		}
 	}
  
 	/**
@@ -219,7 +271,6 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 	 * @return an instance of {@code CriteriaQuery}
 	 */
 	private CriteriaQuery<T> createCriteriaByExample(final T example) {
-
 		final CriteriaBuilder builder = getCriteriaBuilder();
 		final CriteriaQuery<T> query = builder.createQuery(getBeanClass());
 		final Root<T> entity = query.from(getBeanClass());
@@ -228,7 +279,6 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 		final Field[] fields = example.getClass().getDeclaredFields();
  
 		for (Field field : fields) {
-
 			if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Basic.class)
 					&& !field.isAnnotationPresent(Enumerated.class)) {
 				continue;
@@ -239,10 +289,13 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			try {
 				field.setAccessible(true);
 				value = field.get(example);
+
 			} catch (IllegalArgumentException e) {
 				continue;
+
 			} catch (IllegalAccessException e) {
 				continue;
+
 			}
  
 			if (value == null) {
@@ -252,6 +305,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			final Predicate pred = builder.equal(entity.get(field.getName()), value);
 			predicates.add(pred);
 		}
+
 		return query.where(predicates.toArray(new Predicate[0])).select(entity);
 	}
  
@@ -34,6 +34,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  
 entity-manager-was-created=Gerenciador de entidades criado a partir da unidade de persist\u00EAncia "{0}".
+entity-manager-factory-not-found-in-cache=Entity Manager Factory n\u00E3o encontrado para contexto atual, criando um agora.
 operation-not-supported=Esta operação não é suportada.
 getting-persistence-unit-from-properties=Obtendo a unidade de persist\u00EAncia a partir do arquivo de configura\u00E7\u00E3o "{0}".
 getting-persistence-unit-from-persistence=Obtendo a unidade de persist\u00EAncia a partir do arquivo "persistence.xml".
@@ -41,4 +42,5 @@ can-not-get-persistence-unit-from-persistence=N\u00E3o foi poss\u00EDvel obter a
 more-than-one-persistence-unit-defined=Existe mais de uma unidade de persist\u00EAncia definida. Utilize @{0} no ponto de inje\u00E7\u00E3o ou defina o atributo "frameworkdemoiselle.persistence.unit.name" no arquivo demoiselle.properties.
 persistence-unit-name-found=Unidade de persist\u00EAncia "{0}" encontrada.
 entity-manager-closed=O gerenciador de entidades foi fechado.
-no-transaction-active=Nenhuma transa\u00E7\u00E3o est\u00E1 ativa, verifique a configura\u00E7\u00E3o "{0}" no arquivo "{1}" e defina a sua estrat\u00E9gia de transa\u00E7\u00E3o.
 \ No newline at end of file
+no-transaction-active=Nenhuma transa\u00E7\u00E3o est\u00E1 ativa, verifique a configura\u00E7\u00E3o "{0}" no arquivo "{1}" e defina a sua estrat\u00E9gia de transa\u00E7\u00E3o.
+malformed-jpql=Consulta JPQL mal formada para pagina\u00E7\u00E3o de dados.
@@ -70,7 +70,7 @@ public class EntityManagerConfigTest {
 	@Before
 	public void setUp() throws Exception {
 		Logger logger = PowerMock.createMock(Logger.class);
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());;
+		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
  
 		ConfigurationLoader configurationLoader = new ConfigurationLoader();
  
@@ -40,7 +40,7 @@ public class EntityManagerFactoryProducerTest {
 	@Before
 	public void setUp() {
 		logger = createMock(Logger.class);
-		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle", Locale.getDefault());
+		bundle = ResourceBundleProducer.create("demoiselle-jpa-bundle", Locale.getDefault());
 		producer = new EntityManagerFactoryProducer();
 		cache = Collections.synchronizedMap(new HashMap<String, EntityManagerFactory>());
 		setInternalState(producer, Map.class, cache);
@@ -72,14 +72,14 @@ public class EntityManagerFactoryProducerTest {
 		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
 		replay(Persistence.class);
  
-		producer.init();
+		producer.loadPersistenceUnits();
 		Assert.assertEquals(emFactory, cache.get("pu1"));
 	}
  
 	@Test
 	public void testInitWithError() {
 		try {
-			producer.init();
+			producer.loadPersistenceUnits();
 			Assert.fail();
 		}catch(DemoiselleException cause) {
 			Assert.assertTrue(true);
@@ -106,7 +106,7 @@ public class EntityManagerProducerTest {
 		replay(emf, Persistence.class);
  
 		producer = new EntityManagerProducer();
-		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle", Locale.getDefault());
+		bundle = ResourceBundleProducer.create("demoiselle-jpa-bundle", Locale.getDefault());
 		logger = createMock(Logger.class);
  
 		setInternalState(producer, ResourceBundle.class, bundle);
@@ -129,28 +129,37 @@ public class JPACrudTest {
 		this.contactDAO.delete(this.contact.getId());
 		verify(this.entityManager);
 	}
-
+	
+	private TypedQuery<Contact> makeTypedQuery() {
+		@SuppressWarnings("unchecked")
+		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
+		expect(typeQuery.setFirstResult(EasyMock.anyInt())).andReturn(null);
+		expect(typeQuery.setMaxResults(EasyMock.anyInt())).andReturn(null);
+		expect(typeQuery.getResultList()).andReturn(createContacts(1));
+		return typeQuery;
+	}
+	
 	@Test
 	public void testCountAll() {
  
 		Pagination pagination = new PaginationImpl();
+		pagination.setPageSize(10);
 		PaginationContext actualContext = PowerMock.createMock(PaginationContext.class);
 		expect(actualContext.getPagination(Contact.class)).andReturn(pagination);
 		@SuppressWarnings("unchecked")
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
  
 		Query query = EasyMock.createMock(Query.class);
-		expect(query.setFirstResult(EasyMock.anyInt())).andReturn(query);
-		expect(query.setMaxResults(EasyMock.anyInt())).andReturn(query);
 		expect(query.getSingleResult()).andReturn(10L);
+		
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);		
  
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(this.entityManager.createQuery("select count(this) from Contact this")).andReturn(query);
-		expect(query.getResultList()).andReturn(createContacts(1));
-
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		List<Contact> find = this.contactDAO.findAll();
  
@@ -171,11 +180,13 @@ public class JPACrudTest {
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
  
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
+		
 		Query query = EasyMock.createMock(Query.class);
  
 		expect(query.getSingleResult()).andThrow(new DemoiselleException(""));
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(this.entityManager.createQuery("select count(this) from Contact this")).andReturn(query);
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);	
  
 		replayAll(query, this.entityManager, paginationContext);
  
@@ -280,27 +291,31 @@ public class JPACrudTest {
  
 	@Test
 	public void testFindAll() {
-
+		
+		Pagination pagination = new PaginationImpl();
+		pagination.setPageSize(10);
 		PaginationContext actualContext = PowerMock.createMock(PaginationContext.class);
-		expect(actualContext.getPagination(Contact.class)).andReturn(null);
+		expect(actualContext.getPagination(Contact.class)).andReturn(pagination);
 		@SuppressWarnings("unchecked")
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
  
 		Query query = EasyMock.createMock(Query.class);
-		// expect(query.setFirstResult(EasyMock.anyInt())).andReturn(query);
-		// expect(query.setMaxResults(EasyMock.anyInt())).andReturn(query);
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(query.getResultList()).andReturn(createContacts(1));
+		expect(query.getSingleResult()).andReturn(10L);
+		
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);		
  
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		List<Contact> find = this.contactDAO.findAll();
  
 		assertEquals(1, find.size());
 		assertTrue(find.iterator().next().getId().equals(1L));
-
+		
 		verifyAll();
 	}
  
@@ -313,12 +328,15 @@ public class JPACrudTest {
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		@SuppressWarnings("unchecked")
+		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
+		expect(typeQuery.getResultList()).andThrow(new DemoiselleException(""));
  
 		Query query = EasyMock.createMock(Query.class);
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(query.getResultList()).andThrow(new DemoiselleException(""));
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);		
  
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		try {
 			this.contactDAO.findAll();
@@ -34,6 +34,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  
 entity-manager-was-created=Gerenciador de entidades criado a partir da unidade de persist\u00EAncia "{0}".
+entity-manager-factory-not-found-in-cache=Entity Manager Factory n\u00E3o encontrado para contexto atual, criando um agora.
 operation-not-supported=Esta operação não é suportada.
 getting-persistence-unit-from-properties=Obtendo a unidade de persist\u00EAncia a partir do arquivo de configura\u00E7\u00E3o "{0}".
 getting-persistence-unit-from-persistence=Obtendo a unidade de persist\u00EAncia a partir do arquivo "persistence.xml".
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Demoiselle Framework
  Copyright (C) 2010 SERPRO
@@ -35,6 +34,9 @@
  ou escreva para a Fundação do Software Livre (FSF) Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 -->
-<persistence>
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+	
+	<persistence-unit name=""></persistence-unit>
  
 </persistence>
 \ No newline at end of file
@@ -1,19 +0,0 @@
-package br.gov.frameworkdemoiselle.util;
-
-import javax.servlet.ServletContextEvent;
-
-import br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap;
-import br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap;
-
-public class ServletContextListener implements javax.servlet.ServletContextListener {
-
-	@Override
-	public void contextInitialized(ServletContextEvent event) {
-		StartupBootstrap.startup();
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent event) {
-		ShutdownBootstrap.shutdown();
-	}
-}
-/*
- * 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();
+//
+//	}
+//
+//}
-/*
- * 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();
+//		
+//	}
+//
+//}
@@ -51,17 +51,6 @@
 	<name>SE Extension</name>
 	<description>Extensão para aplicações SE</description>
  
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.weld.se</groupId>
-			<artifactId>weld-se-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
-	</dependencies>
-
 	<repositories>
 		<repository>
 			<id>demoiselle.sourceforge.net</id>
@@ -38,18 +38,30 @@ package br.gov.frameworkdemoiselle.util;
  
 import javax.servlet.ServletContextEvent;
  
-import br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap;
-import br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap;
+import br.gov.frameworkdemoiselle.internal.bootstrap.BeforeApplicationFinalization;
+import br.gov.frameworkdemoiselle.internal.bootstrap.BeforeApplicationInitialization;
  
 public class ServletListener implements javax.servlet.ServletContextListener {
  
 	@Override
 	public void contextInitialized(ServletContextEvent event) {
-		StartupBootstrap.startup();
+		Beans.getBeanManager().fireEvent(new BeforeApplicationInitialization() {
+
+			@Override
+			public boolean removeProcessors() {
+				return true;
+			}
+		});
 	}
  
 	@Override
 	public void contextDestroyed(ServletContextEvent event) {
-		ShutdownBootstrap.shutdown();
+		Beans.getBeanManager().fireEvent(new BeforeApplicationFinalization() {
+
+			@Override
+			public boolean removeProcessors() {
+				return true;
+			}
+		});
 	}
 }
...	...	@@ -13,7 +13,7 @@
13	13	<property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
14	14	<property name="javax.persistence.jdbc.user" value="sa" />
15	15	<property name="javax.persistence.jdbc.password" value="" />
16		- <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:hsql:." />
	16	+ <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:." />
17	17
18	18	<property name="hibernate.show_sql" value="true" />
19	19	<property name="hibernate.format_sql" value="false" />
...	...
...	...	@@ -34,4 +34,12 @@
34	34	<firstname>Wilson</firstname>
35	35	<surname>Guimarães</surname>
36	36	</author>
	37	+ <author>
	38	+ <firstname>Emerson</firstname>
	39	+ <surname>Oliveira</surname>
	40	+ </author>
	41	+ <author>
	42	+ <firstname>Luciano</firstname>
	43	+ <surname>Borges</surname>
	44	+ </author>
37	45	</authorgroup>
...	...
...	...	@@ -47,6 +47,25 @@
47	47	</section>
48	48
49	49	<section>
	50	+ <title>Configurando</title>
	51	+ <para>
	52	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de configuração no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	53	+ </para>
	54	+ <programlisting role="XML">
	55	+ <![CDATA[
	56	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	57	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	58	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	59	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	60	+ <interceptors>
	61	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.ConfigurationInterceptor</class>
	62	+ </interceptors>
	63	+ </beans>
	64	+ ]]>
	65	+ </programlisting>
	66	+ </section>
	67	+
	68	+ <section>
50	69	<title>As classes de configuração</title>
51	70	<para>
52	71	A primeira etapa para a utilização do mecanismo de configuração em uma aplicação consiste em criar uma classe específica
...	...
...	...	@@ -11,6 +11,25 @@
11	11	Oferecemos à você uma alternativa para resolver estes problemas, mas você estará livre para usá-la: isoladamente,
12	12	misturando com a forma verbosa ou até mesmo não usá-la.
13	13	</para>
	14	+
	15	+ <section>
	16	+ <title>Configurando</title>
	17	+ <para>
	18	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de exceção no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	19	+ </para>
	20	+ <programlisting role="XML">
	21	+ <![CDATA[
	22	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	23	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	24	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	25	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	26	+ <interceptors>
	27	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor</class>
	28	+ </interceptors>
	29	+ </beans>
	30	+ ]]>
	31	+ </programlisting>
	32	+ </section>
14	33
15	34	<section>
16	35	<title>Tratadores de exceção</title>
...	...
...	...	@@ -41,7 +41,8 @@
41	41	<xi:include href="logger.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
42	42	<xi:include href="templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
43	43	<xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
44		- <!-- <xi:include href="paginacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
	44	+ <xi:include href="paginacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
	45	+ <xi:include href="properties.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
45	46	</part>
46	47	<!-- parte 2 -->
47	48	<!-- <part id="2">-->
...	...	@@ -52,4 +53,4 @@
52	53	<!-- apêndices -->
53	54	<xi:include href="instalacao.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
54	55
55		-</book>
56	56	\ No newline at end of file
	57	+</book>
...	...
...	...	@@ -0,0 +1,188 @@
	1	+<?xml version='1.0' encoding="utf-8"?>
	2	+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
	3	+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
	4	+<chapter id="properties">
	5	+
	6	+ <title>Demoiselle Properties</title>
	7	+
	8	+ <para>
	9	+ Em um projeto com o <emphasis>Demoiselle Framework</emphasis>, algumas propriedades e configurações
	10	+ do <emphasis>Framework</emphasis> podem ser ajustadas no arquivo <literal>demoiselle.properties</literal>.
	11	+ Além disso, a partir da versão 2.3.0 também é nesse arquivo que devem ser definidas as estratégias de
	12	+ <emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>.
	13	+ </para>
	14	+ <para>
	15	+ A seguir listamos as propriedades e configurações do <emphasis>Demoiselle Framework</emphasis> que o usuário pode modificar,
	16	+ acompanhados de alguns exemplos ilustrativos. Também mostraremos como escolher as estratégias para
	17	+ <emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>, oferecidas pelo
	18	+ <emphasis>Demoiselle</emphasis>.
	19	+ </para>
	20	+
	21	+ <section>
	22	+ <title>Configurações do Core</title>
	23	+ <para>
	24	+ <itemizedlist>
	25	+ <listitem>
	26	+ <para>
	27	+ <literal>frameworkdemoiselle.pagination.page.size</literal> - Configura o número de linhas que será
	28	+ exibido na grade de uma página. Por padrão, esse número é 10.
	29	+ </para>
	30	+ <para>
	31	+ Exemplo de configuração: <literal>frameworkdemoiselle.pagination.page.size = 15</literal>, ajusta em 15
	32	+ a quantidade de linhas em uma grade
	33	+ </para>
	34	+ </listitem>
	35	+ <listitem>
	36	+ <para>
	37	+ <literal>frameworkdemoiselle.pagination.max.page.links</literal> - Configura a quantidade de links que
	38	+ será exibido em uma página. Por padrão, esse valor é 5.
	39	+ </para>
	40	+ <para>
	41	+ Exemplo de configuração: <literal>frameworkdemoiselle.pagination.max.page.links = 20</literal>, configura em 20
	42	+ o número de links que podem ser exibidos em uma página.
	43	+ </para>
	44	+ </listitem>
	45	+ <listitem>
	46	+ <para>
	47	+ <literal>frameworkdemoiselle.security.enabled</literal> - Configura a habilitação das funcionalidades do
	48	+ <emphasis>Demoiselle</emphasis> relacionadas a segurança (como autenticação de usuário e verificação de
	49	+ permissão de acesso à recursos). Por padrão, essas funcionalidades ficam habilitadas.
	50	+ </para>
	51	+ <para>
	52	+ Exemplo de configuração: <literal>frameworkdemoiselle.security.enabled = false</literal>, desabilita as
	53	+ funcionalidades de segurança do <emphasis>Demoiselle</emphasis>.
	54	+ </para>
	55	+ </listitem>
	56	+ </itemizedlist>
	57	+ </para>
	58	+ </section>
	59	+
	60	+ <section>
	61	+ <title>Configurações da extensão JSF</title>
	62	+ <para>
	63	+ <itemizedlist>
	64	+ <listitem>
	65	+ <para>
	66	+ <literal>frameworkdemoiselle.security.login.page</literal> - Configura a página de login. Por padrão, a página
	67	+ configurada é <emphasis>“/login”</emphasis>.
	68	+ </para>
	69	+ <para>
	70	+ Exemplo de configuração: <literal>frameworkdemoiselle.security.login.page = “/inicial”</literal>, configura a
	71	+ página <emphasis>“/inicial”</emphasis> como a página de login.
	72	+ </para>
	73	+ </listitem>
	74	+
	75	+ <listitem>
	76	+ <para>
	77	+ <literal>frameworkdemoiselle.security.redirect.after.login</literal> - Configura a página que será acessada após
	78	+ o login. Por padrão, a página configurada é <emphasis>“/index”</emphasis>.
	79	+ </para>
	80	+ <para>
	81	+ Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.after.login = "/menu"</literal>, configura
	82	+ a página <emphasis>“/menu”</emphasis> para ser acessada no redirecionamento após o login do usuário.
	83	+ </para>
	84	+ </listitem>
	85	+
	86	+ <listitem>
	87	+ <para>
	88	+ <literal>frameworkdemoiselle.security.redirect.after.logout</literal> - Configura a página para a qual a aplicação
	89	+ será direcionada após o logout do usuário. Por padrão, a página configurada é <emphasis>“/login”</emphasis>.
	90	+ </para>
	91	+ <para>
	92	+ Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.after.logout = "/index"</literal>, configura
	93	+ a página "/index" para ser acessada no redirecionamento após o logout do usuário.
	94	+ </para>
	95	+ </listitem>
	96	+
	97	+ <listitem>
	98	+ <para>
	99	+ <literal>frameworkdemoiselle.security.redirect.enebled</literal> - Configura a habilitação do redirecionamento da página
	100	+ após <emphasis>login</emphasis> e <emphasis>logout</emphasis>. Por padrão, o valor dessa propriedade é <emphasis>true</emphasis>.
	101	+ </para>
	102	+ <para>
	103	+ Exemplo de configuração: <literal>frameworkdemoiselle.security.redirect.enebled = false</literal>, desabilita os
	104	+ redirecionamentos de páginas após <emphasis>login</emphasis> e <emphasis>logout</emphasis>.
	105	+ </para>
	106	+ </listitem>
	107	+
	108	+ <listitem>
	109	+ <para>
	110	+ <literal>frameworkdemoiselle.handle.application.exception</literal> - Define se a extensão vai capturar ou não alguma exceção
	111	+ lançada pela aplicação. Por padrão, essa configuração vem marcada como “true”, que diz para a extensão capturar a exceção.
	112	+ </para>
	113	+ <para>
	114	+ Exemplo de configuração: <emphasis>frameworkdemoiselle.handle.application.exception = false</emphasis>, desabilita a captura
	115	+ de exceções lançadas pela aplicação.
	116	+ </para>
	117	+ </listitem>
	118	+
	119	+ <listitem>
	120	+ <para>
	121	+ <literal>frameworkdemoiselle.handle.aplication.exception.page</literal> - Configura a página para a qual a aplicação será
	122	+ direcionada em caso de exceção. Por padrão, a página configurada é <emphasis>“/application_error”</emphasis>.
	123	+ </para>
	124	+ <para>
	125	+ Exemplo de configuração: <emphasis>framework.handle.aplication.exception.page = “/exception_x_page”</emphasis>, redireciona a
	126	+ aplicação para a página <emphasis>/exception_x_page</emphasis> caso ocorra alguma exceção.
	127	+ </para>
	128	+ </listitem>
	129	+ </itemizedlist>
	130	+ </para>
	131	+ </section>
	132	+
	133	+ <section>
	134	+ <title>Configurações da Extensão JPA</title>
	135	+ <para>
	136	+ <itemizedlist>
	137	+ <listitem>
	138	+ <para>
	139	+ <literal>frameworkdemoiselle.persistence.unit.name</literal> - Quando é definida mais de uma unidade de persitencia
	140	+ no arquivo <literal>persistence.xml</literal>, muitas vezes é conveniente escolher uma unidade padrão, ao invés de
	141	+ definir as unidades individualmente em cada <emphasis>Entity Manager</emphasis>. Esse parametro é utilizado para
	142	+ indicar qual é a unidade de persistência que deve ser utilizada quando no <emphasis>Entity Manager</emphasis> não
	143	+ houver essa definição.
	144	+ </para>
	145	+ <para>
	146	+ Exemplo de configuração: <literal>frameworkdemoiselle.persistence.unit.name = database1-ds</literal>, configura a
	147	+ unidade de persistencia <literal>database1-ds</literal> como padrão da aplicação.
	148	+ </para>
	149	+ </listitem>
	150	+ </itemizedlist>
	151	+ </para>
	152	+ </section>
	153	+
	154	+ <section>
	155	+ <title>Escolhendo Estratégias</title>
	156	+ <para>
	157	+ Para escolher as estratégias de <emphasis>Transação</emphasis>, <emphasis>Autorização</emphasis> e <emphasis>Autenticação</emphasis>
	158	+ devem ser configuradas as propriedades: <literal>frameworkdemoiselle.transaction.class</literal>,
	159	+ <literal>frameworkdemoiselle.security.authorizer.class</literal> e <literal>frameworkdemoiselle.security.authenticator.class</literal>
	160	+ , respectivamente.
	161	+ </para>
	162	+ <para>
	163	+ Para utilizar as estratégias fornecidas pelo próprio <emphasis>Framework Demoiselle</emphasis>, você deve configurar essas
	164	+ propriedades da seguinte forma:
	165	+ <itemizedlist>
	166	+ <listitem>
	167	+ <para>
	168	+ <literal>frameworkdemoiselle.transaction.class = br.gov.frameworkdemoiselle.transaction.JPATransaction</literal>,
	169	+ para transações <emphasis>JPA</emphasis>, e <literal>frameworkdemoiselle.transaction.class =
	170	+ br.gov.frameworkdemoiselle.transaction.JTATransaction</literal>, para transações <emphasis>JTA</emphasis>;
	171	+ </para>
	172	+ </listitem>
	173	+ <listitem>
	174	+ <para>
	175	+ <literal>frameworkdemoiselle.security.authorizer.class = br.gov.serpro.inscricao.security.Autorizador</literal>;
	176	+ </para>
	177	+ </listitem>
	178	+ <listitem>
	179	+ <para>
	180	+ <literal>frameworkdemoiselle.security.authenticator.class = br.gov.serpro.inscricao.security.Autenticador</literal>.
	181	+ </para>
	182	+ </listitem>
	183	+ </itemizedlist>
	184	+ As instruções para você construir e utilizar sua própria estratégia estãodescritas nos capítulos <link linkend="transacao">Transação</link>
	185	+ e <link linkend="security">Segurança</link>.
	186	+ </para>
	187	+ </section>
	188	+</chapter>
...	...
...	...	@@ -18,6 +18,26 @@
18	18	</para>
19	19
20	20	<section>
	21	+ <title>Configurando</title>
	22	+ <para>
	23	+ Para um correto funcionamento do Demoiselle é necessário inserir od interceptadores de segurança no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	24	+ </para>
	25	+ <programlisting role="XML">
	26	+ <![CDATA[
	27	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	28	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	29	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	30	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	31	+ <interceptors>
	32	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor</class>
	33	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor</class>
	34	+ </interceptors>
	35	+ </beans>
	36	+ ]]>
	37	+ </programlisting>
	38	+ </section>
	39	+
	40	+ <section>
21	41	<title>Autenticação</title>
22	42	<para>
23	43	O mecanismo de autenticação busca verificar a identidade do usuário de um sistema. A forma mais conhecida, e comum,
...	...	@@ -201,20 +221,12 @@ public class MeuAuthorizer implements Authorizer {
201	221
202	222	}]]></programlisting>
203	223	<para>
204		- Feito isso deve-se definir no arquivo META-INF/beans.xml, as classes criadas:
	224	+ Feito isso deve-se definir no arquivo <filename>demoiselle.properties</filename>, as classes criadas:
205	225	</para>
206		- <programlisting role="XML"><![CDATA[<?xml version="1.0"?>
207		-<beans xmlns="http://java.sun.com/xml/ns/javaee"
208		- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
209		- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
210		- http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
211		-
212		- <alternatives>
213		- <class>projeto.MeuAuthenticator</class>
214		- <class>projeto.MeuAuthorizer</class>
215		- </alternatives>
216		-
217		-</beans>]]></programlisting>
	226	+ <programlisting>
	227	+ frameworkdemoiselle.security.authenticator.class=projeto.MeuAuthenticator
	228	+ frameworkdemoiselle.security.authorizer.class=projeto.MeuAuthorizer
	229	+ </programlisting>
218	230	<para>
219	231	À partir desse momento, a aplicação já possui uma implementação de segurança definida.
220	232	</para>
...	...
...	...	@@ -22,6 +22,25 @@
22	22	Neste capítulo apresentaremos para você como usar a nossa solução de controle de transação, as estratégias
23	23	prontas que oferecemos e a criação de sua própria estratégia.
24	24	</para>
	25	+
	26	+ <section>
	27	+ <title>Configurando</title>
	28	+ <para>
	29	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de transação no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	30	+ </para>
	31	+ <programlisting role="XML">
	32	+ <![CDATA[
	33	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	34	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	35	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	36	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	37	+ <interceptors>
	38	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor</class>
	39	+ </interceptors>
	40	+ </beans>
	41	+ ]]>
	42	+ </programlisting>
	43	+ </section>
25	44
26	45	<section>
27	46	<title>Métodos transacionais</title>
...	...	@@ -99,19 +118,11 @@ public class AbacaxiException {
99	118	</para>
100	119	<para>
101	120	A transação JPA é simples de configurar e não exige nenhum recurso externo à sua aplicação.
102		- Basta definir no arquivo <filename>META-INF/beans.xml</filename> a seguinte configuração:
	121	+ Basta definir no arquivo <filename>demoiselle.properties</filename> a seguinte configuração:
103	122	</para>
104		- <programlisting role="XML"><![CDATA[<?xml version="1.0"?>
105		-<beans xmlns="http://java.sun.com/xml/ns/javaee"
106		- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
107		- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
108		- http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
109		-
110		- <alternatives>
111		- <class>br.gov.frameworkdemoiselle.transaction.JPATransaction</class>
112		- </alternatives>
113		-
114		-</beans>]]></programlisting>
	123	+ <programlisting>
	124	+ frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JPATransaction
	125	+ </programlisting>
115	126	<tip><para> Caso não esteja utilizando o arquétipo JSF-JPA fornecidos pelo Demoiselle, confira se a dependência para a
116	127	extensão está indicada corretamente no arquivo POM.XML.</para>
117	128	<programlisting role="XML"><![CDATA[<dependency>
...	...	@@ -132,23 +143,13 @@ public class AbacaxiException {
132	143	<para>
133	144	A estratégia JTA não serve apenas para persistência em banco de dados, serve também para integrar com
134	145	tecnologias que façam acesso ao contexto JTA, como é o caso do EJB. Para ativar esta estratégia defina no
135		- arquivo <filename>META-INF/beans.xml</filename> a seguinte configuração:
	146	+ arquivo <filename>demoiselle.properties</filename> a seguinte configuração:
136	147	</para>
137		- <programlisting role="XML"><![CDATA[<?xml version="1.0"?>
138		-<beans xmlns="http://java.sun.com/xml/ns/javaee"
139		- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
140		- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
141		- http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
142		-
143		- <alternatives>
144		- <class>br.gov.frameworkdemoiselle.transaction.JTATransaction</class>
145		- </alternatives>
146		-
147		-</beans>]]></programlisting>
	148	+ <programlisting>frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JTATransaction</programlisting>
148	149	<para>
149	150	Feito isto, o controle transacional será delegado para a transação acessível via JNDI com o nome
150	151	<literal>UserTransaction</literal>. A estratégia acessa o objeto da seguinte maneira:
151		- <literal>context.lookup("UserTransaction")</literal>. Portanto, para você utilizar esta estratégia,
	152	+ <literal>Beans.getReference(UserTransaction.class)</literal>. Portanto, para você utilizar esta estratégia,
152	153	você precisa de um container JEE ou de um servidor JTA qualquer.
153	154	</para>
154	155	<para>
...	...	@@ -156,18 +157,20 @@ public class AbacaxiException {
156	157	JTA gerenciada. Veja um exemplo utilizando o servidor de aplicações JBoss-AS6 e com o provider Hibernate (embutido no JBoss-AS) como implementação JPA:
157	158	</para>
158	159	<programlisting role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
159		-<persistence version="2.0"
160		- xmlns="http://java.sun.com/xml/ns/persistence"
	160	+<persistence version="2.0"
	161	+ xmlns="http://java.sun.com/xml/ns/persistence"
161	162	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
162		- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
163		- http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
	163	+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
	164	+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
164	165
165		- <persistence-unit name="contactlist-ds">
166		- <jta-data-source>java:/DefaultDS</jta-data-source>
	166	+ <persistence-unit name="bookmark-ds" transaction-type="JTA">
	167	+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
167	168	<properties>
168		- <property name="hibernate.transaction.factory_class"
169		- value="org.hibernate.transaction.JTATransactionFactory" />
170		- <property name="jta.UserTransaction" value="UserTransaction" />
	169	+ <property name="hibernate.show_sql" value="true" />
	170	+ <property name="hibernate.format_sql" value="false" />
	171	+ <property name="hibernate.hbm2ddl.auto" value="update" />
	172	+ <property name="hibernate.transaction.jta.platform"
	173	+ value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
171	174	</properties>
172	175	</persistence-unit>
173	176	</persistence>]]></programlisting>
...	...	@@ -221,19 +224,11 @@ public class MegaTransaction implements Transaction {
221	224	}
222	225	]]></programlisting>
223	226	<para>
224		- Basta agora definir no arquivo <filename>META-INF/beans.xml</filename> a sua estratégia:
	227	+ Basta agora definir no arquivo <filename>demoiselle.properties</filename> a sua estratégia:
225	228	</para>
226		- <programlisting role="XML"><![CDATA[<?xml version="1.0"?>
227		-<beans xmlns="http://java.sun.com/xml/ns/javaee"
228		- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
229		- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
230		- http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
231		-
232		- <alternatives>
233		- <class>projeto.MegaTransaction</class>
234		- </alternatives>
235		-
236		-</beans>]]></programlisting>
	229	+ <programlisting>
	230	+ frameworkdemoiselle.transaction.class=projeto.MegaTransaction
	231	+ </programlisting>
237	232	</section>
238	233
239	234	</chapter>
...	...
...	...	@@ -0,0 +1,66 @@
	1	+/*
	2	+ * Demoiselle Framework
	3	+ * Copyright (C) 2010 SERPRO
	4	+ * ----------------------------------------------------------------------------
	5	+ * This file is part of Demoiselle Framework.
	6	+ *
	7	+ * Demoiselle Framework is free software; you can redistribute it and/or
	8	+ * modify it under the terms of the GNU Lesser General Public License version 3
	9	+ * as published by the Free Software Foundation.
	10	+ *
	11	+ * This program is distributed in the hope that it will be useful,
	12	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	+ * GNU General Public License for more details.
	15	+ *
	16	+ * You should have received a copy of the GNU Lesser General Public License version 3
	17	+ * along with this program; if not, see <http://www.gnu.org/licenses/>
	18	+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
	19	+ * Fifth Floor, Boston, MA 02110-1301, USA.
	20	+ * ----------------------------------------------------------------------------
	21	+ * Este arquivo é parte do Framework Demoiselle.
	22	+ *
	23	+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
	24	+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
	25	+ * do Software Livre (FSF).
	26	+ *
	27	+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
	28	+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
	29	+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
	30	+ * para maiores detalhes.
	31	+ *
	32	+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
	33	+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
	34	+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
	35	+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
	36	+ */
	37	+package br.gov.frameworkdemoiselle.annotation;
	38	+
	39	+import static java.lang.annotation.ElementType.METHOD;
	40	+import static java.lang.annotation.RetentionPolicy.RUNTIME;
	41	+
	42	+import java.lang.annotation.Retention;
	43	+import java.lang.annotation.Target;
	44	+
	45	+/**
	46	+ * @author SERPRO
	47	+ */
	48	+@Target(METHOD)
	49	+@Retention(RUNTIME)
	50	+public @interface Priority {
	51	+
	52	+ /**
	53	+ * Most important priority value.
	54	+ */
	55	+ public static int MAX_PRIORITY = Integer.MIN_VALUE;
	56	+
	57	+ /**
	58	+ * Less important priority value.
	59	+ */
	60	+ public static int MIN_PRIORITY = Integer.MAX_VALUE;
	61	+
	62	+ /**
	63	+ * An integer value defines the priority order.
	64	+ */
	65	+ int value();
	66	+}
...	...
...	...	@@ -52,7 +52,8 @@ import java.lang.annotation.Target;
52	52	* <pre>
53	53	* public class Finalizer {
54	54	*
55		- * @Shutdown(priority = 5)
	55	+ * @Shutdown
	56	+ * @Priority(5)
56	57	* public void finalize() {
57	58	* ...
58	59	* }
...	...	@@ -60,6 +61,7 @@ import java.lang.annotation.Target;
60	61	*
61	62	*
62	63	*
	64	+ *
63	65	* </pre>
64	66	*
65	67	* </blockquote>
...	...	@@ -75,17 +77,29 @@ public @interface Shutdown {
75	77
76	78	/**
77	79	* Most important priority value.
	80	+ *
	81	+ * @deprecated
	82	+ * @see Priority
78	83	*/
	84	+ @Deprecated
79	85	public static int MAX_PRIORITY = Integer.MIN_VALUE;
80	86
81	87	/**
82	88	* Less important priority value.
	89	+ *
	90	+ * @deprecated
	91	+ * @see Priority
83	92	*/
	93	+ @Deprecated
84	94	public static int MIN_PRIORITY = Integer.MAX_VALUE;
85	95
86	96	/**
87	97	* An integer value defines method execution order (i.e., priority).
	98	+ *
	99	+ * @deprecated
	100	+ * @see Priority
88	101	*/
	102	+ @Deprecated
89	103	int priority() default MIN_PRIORITY;
90	104
91	105	}
...	...