Merge remote-tracking branch 'origin/2.4.0' into 2.4.0

Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/OperationType.java

Merge remote-tracking branch 'origin/2.4.0' into 2.4.0
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/OperationType.java
Dancovich
2 parents 1c9e25ba b14e654f
Showing 107 changed files with 1255 additions and 1349 deletions Show diff stats
documentation/reference/pom.xml
documentation/reference/pt-BR/gerenciamento.xml
documentation/reference/pt-BR/images/jmx-jconsole-example.png
documentation/reference/pt-BR/jmx-jconsole-example.jpg
documentation/reference/pt-BR/master.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Ignore.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ManagedOperation.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ManagedProperty.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/OperationParameter.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/OperationType.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigType.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.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/ConfigurationBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomInjectionPoint.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-documentation-parent</artifactId>
-		<version>8</version>
+		<version>9-SNAPSHOT</version>
 		<relativePath>../../../internal/parent/documentation</relativePath>
 	</parent>
@@ -24,6 +24,8 @@
 		uso o desenvolvedor pode se despreocupar com detalhes de implementação de cada tecnologia individual e facilmente integrar tais tecnologias.</para>
 	</section>
+	
+	
 	<section>
 		<title>Introdução ao mecanismo</title>
@@ -136,6 +138,8 @@
 	</section>
+	
+	
 	<section>
 		<title>Expondo aspectos de sua aplicação para monitoração</title>
@@ -169,6 +173,8 @@
 		a quantidade de logins efetuados no momento da consulta.</para>
 	</section>
+	
+	
 	<section>
 		<title>Conectando um cliente de monitoração</title>
@@ -197,7 +203,7 @@
 			individualmente, as classes monitoradas serão então expostas para todas as extensões escolhidas.</para>
 		</tip>
-		<para>A imagem abaixo mostra como uma classe monitorada na aplicação <emphasis>Bookmark</emphasis> é exibida no <emphasis>JConsole</emphasis>.</para>
+		<para>A figura <xref linkend="exemplo_jconsole"/> mostra como uma classe monitorada na aplicação <emphasis>Bookmark</emphasis> é exibida no <emphasis>JConsole</emphasis>.</para>
 		<programlisting role="JAVA"><![CDATA[
 		@ManagementController
@@ -213,15 +219,14 @@
 		}
 		]]></programlisting>
-		<figure>
-			<title>JConsole acessando a aplicação <emphasis>Bookmark</emphasis></title>
+		<figure id="exemplo_jconsole"><title>JConsole acessando a aplicação <emphasis>Bookmark</emphasis></title>
 			<mediaobject>
 				<imageobject>
-					<imagedata fileref="jmx-console-example.jpg" align="center"/>
+					<imagedata fileref="images/jmx-jconsole-example.png"/>
 				</imageobject>
+				<textobject><phrase>JConsole acessando a aplicação <emphasis>Bookmark</emphasis></phrase></textobject>
 			</mediaobject>
 		</figure>
-		
 	</section>
 </chapter>
 \ No newline at end of file
@@ -5,6 +5,7 @@
 	<xi:include href="bookinfo.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<!-- 
 	<preface>
 		<title>Sobre o Guia de Referência</title>
 		<para>
@@ -38,8 +39,9 @@
 	<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="gerenciamento.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="properties.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<!-- <xi:include href="properties.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
 	<!-- parte 1 -->
 	<!-- TODO: dividir melhor os capítulos em seções -->
@@ -42,7 +42,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-@Target(FIELD) 
+@Target(FIELD)
 @Retention(RUNTIME)
 public @interface Ignore {
 }
@@ -47,24 +47,28 @@ import javax.enterprise.util.Nonbinding;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 /**
- * <p>Indicates that a method is a <b>managed operation</b>, meaning you can manage some aspect of the application by calling it from a external management client.</p>
- * <p>This annotation can't be used together with {@link ManagedProperty}, doing so will throw a {@link DemoiselleException}.</p>  
+ * <p>
+ * Indicates that a method is a <b>managed operation</b>, meaning you can manage some aspect of the application by
+ * calling it from a external management client.
+ * </p>
+ * <p>
+ * This annotation can't be used together with {@link ManagedProperty}, doing so will throw a
+ * {@link DemoiselleException}.
+ * </p>
  * 
  * @author SERPRO
- *
  */
 @Documented
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ManagedOperation {
-	
+
 	/**
-	 * Description that will be used to publish the operation to clients.
-	 * Defaults to an empty description.
+	 * Description that will be used to publish the operation to clients. Defaults to an empty description.
 	 */
 	@Nonbinding
 	String description() default "";
-	
+
 	/**
 	 * Type of operation. Defaults to {@link OperationType#UNKNOWN}.
 	 */
@@ -45,57 +45,65 @@ import java.lang.annotation.Target;
 import javax.enterprise.util.Nonbinding;
 /**
- * <p>Indicates that a field must be exposed as a property to management clients.</p>
- * <p>The property will be writable if there's a public setter method
- * declared for the field and readable if there's a getter method. You can override this behaviour by passing a value
- * to the {@link #accessLevel()} property.</p>
- * <p>It's a runtime error to annotate a field with no getter and no setter method.</p>
- * <p>It's also a runtime error to declare a field as a property and one or both of it's getter and setter
- * methods as an operation using the {@link ManagedOperation} annotation.</p> 
+ * <p>
+ * Indicates that a field must be exposed as a property to management clients.
+ * </p>
+ * <p>
+ * The property will be writable if there's a public setter method declared for the field and readable if there's a
+ * getter method. You can override this behaviour by passing a value to the {@link #accessLevel()} property.
+ * </p>
+ * <p>
+ * It's a runtime error to annotate a field with no getter and no setter method.
+ * </p>
+ * <p>
+ * It's also a runtime error to declare a field as a property and one or both of it's getter and setter methods as an
+ * operation using the {@link ManagedOperation} annotation.
+ * </p>
  * 
  * @author SERPRO
- *
  */
 @Documented
-@Target({ElementType.FIELD})
+@Target({ ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ManagedProperty {
-	
+
 	/**
 	 * @return The description of this property exposed to management clients.
 	 */
 	@Nonbinding
 	String description() default "";
-	
+
 	@Nonbinding
 	ManagedPropertyAccess accessLevel() default ManagedPropertyAccess.DEFAULT;
-	
+
 	/**
-	 * <p>Access level of a managed property.</p>
-	 * 
-	 * <p>These values only affect access via external management clients, the application is still able to inject and use the normal visibility of the property
-	 * by Java standards.</p>
+	 * <p>
+	 * Access level of a managed property.
+	 * </p>
+	 * <p>
+	 * These values only affect access via external management clients, the application is still able to inject and use
+	 * the normal visibility of the property by Java standards.
+	 * </p>
 	 * 
 	 * @author serpro
-	 *
 	 */
-	enum ManagedPropertyAccess{
-		
+	enum ManagedPropertyAccess {
+
 		/**
 		 * Restricts a property to be only readable even if a setter method exists.
 		 */
 		READ_ONLY
-		
+
 		/**
 		 * Restricts a property to be only writeable even if a getter method exists.
 		 */
-		,WRITE_ONLY
-		
+		, WRITE_ONLY
+
 		/**
-		 * Says that the read or write access will
-		 * be determined by the presence of a getter method <code>(getProperty())</code> or setter method <code>(setProperty(propertyValue))</code> for a property.
+		 * Says that the read or write access will be determined by the presence of a getter method
+		 * <code>(getProperty())</code> or setter method <code>(setProperty(propertyValue))</code> for a property.
 		 */
-		,DEFAULT;
+		, DEFAULT;
 	}
 }
@@ -45,29 +45,31 @@ import java.lang.annotation.Target;
 import javax.enterprise.util.Nonbinding;
 /**
- * <p>Optional annotation to write additional detail about an operation's parameter.</p>
- * <p>This annotation is ignored for non-operation methods.</p>  
+ * <p>
+ * Optional annotation to write additional detail about an operation's parameter.
+ * </p>
+ * <p>
+ * This annotation is ignored for non-operation methods.
+ * </p>
  * 
  * @author SERPRO
- *
  */
 @Documented
-@Target({ElementType.PARAMETER})
+@Target({ ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface OperationParameter {
-	
+
 	/**
 	 * Name that will be used to publish this operation's parameter to clients.
 	 */
 	@Nonbinding
 	String name();
-	
+
 	/**
-	 * Optional description that will be used to publish this operation's parameter to clients.
-	 * Defaults to an empty description.
+	 * Optional description that will be used to publish this operation's parameter to clients. Defaults to an empty
+	 * description.
 	 */
 	@Nonbinding
 	String description() default "";
-	
 }
@@ -37,43 +37,42 @@
 package br.gov.frameworkdemoiselle.annotation;
-
 /**
- * <p>Define the operation type for an operation inside a ManagementController class.</p>
- * 
- * <p>This is an optional annotation and it's significanse will change based on the management extension
- * used. Most extensions will just publish this information to the client so it can better show to the user the inner
- * workings of the annotated operation.</p>
- * 
+ * <p>
+ * Define the operation type for an operation inside a ManagementController class.
+ * </p>
+ * <p>
+ * This is an optional annotation and it's significanse will change based on the management extension used. Most
+ * extensions will just publish this information to the client so it can better show to the user the inner workings of
+ * the annotated operation.
+ * </p>
  * 
  * @author SERPRO
- *
  */
 public enum OperationType {
-	
+
 	/**
-	 * ManagedOperation is write-only, it causes the application
-	 * to change some of it's behaviour but doesn't return any kind of information
+	 * ManagedOperation is write-only, it causes the application to change some of it's behaviour but doesn't return any
+	 * kind of information
 	 */
-	ACTION
-	,
+	ACTION,
+
 	/**
 	 * ManagedOperation is read-only, it will operate over data provided by the application and return some information,
 	 * but will not change the application in any way.
 	 */
-	INFO
-	,
+	INFO,
+	
 	/**
-	 * ManagedOperation is read-write, it will both change the way the application work and return some information regarding
-	 * the result of the operation.
+	 * ManagedOperation is read-write, it will both change the way the application work and return some information
+	 * regarding the result of the operation.
 	 */
-	ACTION_INFO
-	,
+	ACTION_INFO,
+
 	/**
-	 * The effect of calling this operation is unknown. This is the default type and if this type is assigned to an operation,
-	 * the user must rely on the {@link ManagedOperation#description()} attribute to learn about how the operation works.
+	 * The effect of calling this operation is unknown. This is the default type and if this type is assigned to an
+	 * operation, the user must rely on the {@link ManagedOperation#description()} attribute to learn about how the
+	 * operation works.
 	 */
 	UNKNOWN
-	
-	
 }
@@ -60,6 +60,14 @@ public @interface Priority {
 	 */
 	static int MIN_PRIORITY = Integer.MAX_VALUE;
+	static int L1_PRIORITY = MIN_PRIORITY;
+
+	static int L2_PRIORITY = L1_PRIORITY - 100;
+
+	static int L3_PRIORITY = L2_PRIORITY - 100;
+
+	static int L4_PRIORITY = L3_PRIORITY - 100;
+
 	/**
 	 * An integer value defines the priority order.
 	 */
@@ -57,5 +57,5 @@ public enum ConfigType {
 	 * Configuration loaded on properties resources.
 	 */
 	PROPERTIES;
-	
+
 }
@@ -52,9 +52,9 @@ import javax.interceptor.InvocationContext;
 import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.stereotype.Controller;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @Interceptor
@@ -63,9 +63,9 @@ public class ExceptionHandlerInterceptor implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
-	private static Logger logger;
+	private static transient Logger logger;
 	private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();
@@ -199,7 +199,7 @@ public class ExceptionHandlerInterceptor implements Serializable {
 	private static ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
 		return bundle;
@@ -207,7 +207,7 @@ public class ExceptionHandlerInterceptor implements Serializable {
 	private static Logger getLogger() {
 		if (logger == null) {
-			logger = LoggerProducer.create(ExceptionHandlerInterceptor.class);
+			logger = Beans.getReference(Logger.class, new NameQualifier(ExceptionHandlerInterceptor.class.getName()));
 		}
 		return logger;
@@ -98,23 +98,22 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 		return this.annotationClass;
 	}
+	@SuppressWarnings("unchecked")
 	public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event) {
 		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));
+				processors.add(newProcessorInstance((AnnotatedMethod<T>) am));
 			}
 		}
 	}
 	public void loadTempContexts(@Observes final AfterBeanDiscovery event) {
-		//Caso este bootstrap rode antes do CoreBootstrap. Não há problemas em chamar este método várias vezes, ele
-		//ignora chamadas adicionais.
+		// Caso este bootstrap rode antes do CoreBootstrap. Não há problemas em chamar este método várias vezes, ele
+		// ignora chamadas adicionais.
 		ContextManager.initialize(event);
-		
+
 		// Não registrar o contexto de aplicação pq ele já é registrado pela implementação do CDI
 		ContextManager.add(new ThreadLocalContext(ViewScoped.class), event);
 		ContextManager.add(new ThreadLocalContext(SessionScoped.class), event);
@@ -1,56 +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 org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.security.Authenticator;
-
-public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator> {
-
-	private Logger logger;
-
-	@Override
-	protected Logger getLogger() {
-		if (logger == null) {
-			logger = LoggerProducer.create(AuthenticatorBootstrap.class);
-		}
-
-		return logger;
-	}
-}
@@ -1,56 +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 org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.security.Authorizer;
-
-public class AuthorizerBootstrap extends AbstractStrategyBootstrap<Authorizer> {
-
-	private Logger logger;
-
-	@Override
-	protected Logger getLogger() {
-		if (logger == null) {
-			logger = LoggerProducer.create(AuthorizerBootstrap.class);
-		}
-
-		return logger;
-	}
-}
@@ -96,7 +96,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap&lt;Configurat
 		String superClassName = type.getCanonicalName();
 		String chieldClassName = superClassName + "_$$_DemoiselleProxy";
-		Map<String, Class<Object>> cacheProxy = Collections.synchronizedMap(new HashMap<String, Class<Object>>());;
+		Map<String, Class<Object>> cacheProxy = Collections.synchronizedMap(new HashMap<String, Class<Object>>());
 		Class<Object> clazzProxy = null;
@@ -139,7 +139,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap&lt;Configurat
 	@Override
 	protected Logger getLogger() {
 		if (logger == null) {
-			logger = LoggerProducer.create(TransactionBootstrap.class);
+			logger = LoggerProducer.create(ConfigurationBootstrap.class);
 		}
 		return logger;
@@ -1,136 +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.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-public class CustomInjectionPoint implements InjectionPoint {
-
-	private final Bean<?> bean;
-
-	private final Type beanType;
-
-	private final Set<Annotation> qualifiers;
-
-	public CustomInjectionPoint(Bean<?> bean, Type beanType, Annotation... qualifiers) {
-		this.bean = bean;
-		this.beanType = beanType;
-		this.qualifiers = new HashSet<Annotation>(Arrays.asList(qualifiers));
-	}
-
-	@Override
-	public Type getType() {
-		return this.beanType;
-	}
-
-	@Override
-	public Set<Annotation> getQualifiers() {
-		return this.qualifiers;
-	}
-
-	@Override
-	public Bean<?> getBean() {
-		return this.bean;
-	}
-
-	@Override
-	public Member getMember() {
-		return null;
-	}
-
-	@Override
-	public boolean isDelegate() {
-		return false;
-	}
-
-	@Override
-	public boolean isTransient() {
-		return false;
-	}
-
-	@Override
-	public Annotated getAnnotated() {
-		return new Annotated() {
-
-			@Override
-			public Type getBaseType() {
-				// TODO Auto-generated method stub
-				return null;
-			}
-
-			@Override
-			public Set<Type> getTypeClosure() {
-				// TODO Auto-generated method stub
-				return null;
-			}
-
-			@Override
-			@SuppressWarnings("unchecked")
-			public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
-				T result = null;
-
-				for (Annotation annotation : getAnnotations()) {
-					if (annotation.annotationType() == annotationType) {
-						result = (T) annotation;
-						break;
-					}
-				}
-
-				return result;
-			}
-
-			@Override
-			public Set<Annotation> getAnnotations() {
-				return qualifiers;
-			}
-
-			@Override
-			public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
-				return qualifiers.contains(annotationType);
-			}
-		};
-	}
-}
@@ -32,8 +32,8 @@ public class ManagementBootstrap implements Extension {
 	protected static List<AnnotatedType<?>> types = Collections.synchronizedList(new ArrayList<AnnotatedType<?>>());
-	private List<Class<? extends ManagementExtension>> managementExtensionCache = Collections.synchronizedList(new ArrayList<Class<? extends ManagementExtension>>());
-	
+	private List<Class<? extends ManagementExtension>> managementExtensionCache = Collections
+			.synchronizedList(new ArrayList<Class<? extends ManagementExtension>>());
 	public <T> void detectAnnotation(@Observes final ProcessAnnotatedType<T> event, final BeanManager beanManager) {
 		if (event.getAnnotatedType().isAnnotationPresent(ManagementController.class)) {
@@ -47,27 +47,28 @@ public class ManagementBootstrap implements Extension {
 	}
 	@SuppressWarnings("unchecked")
-	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event,BeanManager beanManager) {
+	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event, BeanManager beanManager) {
 		ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
 		Management monitoringManager = Beans.getReference(Management.class);
 		for (AnnotatedType<?> type : types) {
-			if (type.getJavaClass().isInterface() || Modifier.isAbstract(type.getJavaClass().getModifiers()) ){
-				throw new DemoiselleException(bundle.getString("management-abstract-class-defined" , type.getJavaClass().getCanonicalName()));
+			if (type.getJavaClass().isInterface() || Modifier.isAbstract(type.getJavaClass().getModifiers())) {
+				throw new DemoiselleException(bundle.getString("management-abstract-class-defined", type.getJavaClass()
+						.getCanonicalName()));
 			}
 			ManagedType managedType = new ManagedType(type.getJavaClass());
 			monitoringManager.addManagedType(managedType);
 		}
-		
+
 		Set<Bean<?>> extensionBeans = beanManager.getBeans(ManagementExtension.class);
-		if (extensionBeans!=null){
-			for (Bean<?> bean : extensionBeans){
+		if (extensionBeans != null) {
+			for (Bean<?> bean : extensionBeans) {
 				Class<?> extensionConcreteClass = bean.getBeanClass();
 				managementExtensionCache.add((Class<? extends ManagementExtension>) extensionConcreteClass);
 			}
 		}
-		
+
 		monitoringManager.initialize(managementExtensionCache);
 	}
@@ -75,7 +76,7 @@ public class ManagementBootstrap implements Extension {
 		Management manager = Beans.getReference(Management.class);
 		manager.shutdown(managementExtensionCache);
-		
+
 		managementExtensionCache.clear();
 		types.clear();
 	}
@@ -1,56 +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 org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.transaction.Transaction;
-
-public class TransactionBootstrap extends AbstractStrategyBootstrap<Transaction> {
-
-	private Logger logger;
-
-	@Override
-	protected Logger getLogger() {
-		if (logger == null) {
-			logger = LoggerProducer.create(TransactionBootstrap.class);
-		}
-
-		return logger;
-	}
-}
@@ -75,7 +75,7 @@ public abstract class AbstractCustomContext implements CustomContext {
 		Class<?> type = getType(contextual);
 		if (getStore().contains(type)) {
-			instance = (T) getStore().get(type);
+			instance = getStore().get(type);
 		} else if (creationalContext != null) {
 			instance = contextual.create(creationalContext);
@@ -96,8 +96,8 @@ public abstract class AbstractCustomContext implements CustomContext {
 	}
 	public void setActive(boolean active) {
-		if (!active && this.active){
-			//Limpando contexto
+		if (!active && this.active) {
+			// Limpando contexto
 			getStore().clear();
 		}
 		this.active = active;
@@ -120,13 +120,13 @@ public abstract class AbstractCustomContext implements CustomContext {
 		private Store() {
 		}
-
 		private boolean contains(final Class<?> type) {
 			return this.getMap().containsKey(type);
 		}
-		private Object get(final Class<?> type) {
-			return this.getMap().get(type);
+		@SuppressWarnings("unchecked")
+		private <T> T get(final Class<?> type) {
+			return (T) this.getMap().get(type);
 		}
 		private void put(final Class<?> type, final Object instance) {
@@ -136,7 +136,7 @@ public abstract class AbstractCustomContext implements CustomContext {
 		public void clear() {
 			cache.clear();
 		}
-		
+
 		private Map<Class<?>, Object> getMap() {
 			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -51,8 +51,9 @@ public class ContextManager {
 	private static ResourceBundle bundle;
 	private static Logger logger;
-	
-	private ContextManager(){}
+
+	private ContextManager() {
+	}
 	/**
 	 * <p>
@@ -105,9 +106,9 @@ public class ContextManager {
 		}
 		ContextManager.getLogger().trace(
-				ContextManager.getBundle().getString("bootstrap-context-added",
-						context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
-		
+				ContextManager.getBundle().getString("bootstrap-context-added", context.getClass().getCanonicalName(),
+						context.getScope().getCanonicalName()));
+
 		context.setActive(false);
 		event.addContext(context);
 		contexts.add(new CustomContextCounter(context));
@@ -194,8 +195,10 @@ public class ContextManager {
 	}
 	/**
-	 * <p>This method should be called when the application is shutting down, usually by observing
-	 * the {@link BeforeShutdown} event.</p> 
+	 * <p>
+	 * This method should be called when the application is shutting down, usually by observing the
+	 * {@link BeforeShutdown} event.
+	 * </p>
 	 */
 	public static synchronized void shutdown() {
 		for (CustomContextCounter context : contexts) {
@@ -252,7 +255,7 @@ class CustomContextCounter {
 	public CustomContext getInternalContext() {
 		return this.context;
 	}
-	
+
 	public void setInternalContext(CustomContext context) {
 		this.context = context;
 	}
@@ -261,19 +264,14 @@ class CustomContextCounter {
 		try {
 			BeanManager beanManager = Beans.getReference(BeanManager.class);
 			Context c = beanManager.getContext(context.getScope());
-			
-			
+
 			if (c == context) {
 				activationCounter++;
-			}
-			else{
+			} else {
 				ContextManager.getLogger().trace(
 						ContextManager.getBundle().getString("custom-context-already-activated",
-								context.getClass().getCanonicalName()
-								,c.getScope().getCanonicalName()
-								,c.getClass().getCanonicalName()
-						)
-					);
+								context.getClass().getCanonicalName(), c.getScope().getCanonicalName(),
+								c.getClass().getCanonicalName()));
 			}
 		} catch (ContextNotActiveException ce) {
 			context.setActive(true);
@@ -299,10 +297,10 @@ class CustomContextCounter {
 		} catch (ContextNotActiveException ce) {
 		}
 	}
-	
+
 	public synchronized void shutdown() {
 		context.setActive(false);
-		context=null;
-		activationCounter=0;
+		context = null;
+		activationCounter = 0;
 	}
 }
@@ -5,14 +5,13 @@ import javax.enterprise.context.RequestScoped;
 import br.gov.frameworkdemoiselle.stereotype.ManagementController;
 /**
- * Context that stores {@link RequestScoped} beans during client calls to {@link ManagementController} classes.
- * This context is only activated when no other context is active for {@link RequestScoped}.
+ * Context that stores {@link RequestScoped} beans during client calls to {@link ManagementController} classes. This
+ * context is only activated when no other context is active for {@link RequestScoped}.
  * 
  * @author serpro
- *
  */
 public class ManagedContext extends ThreadLocalContext {
-	
+
 	/**
 	 * Constructs a new context.
 	 */
@@ -51,10 +51,9 @@ package br.gov.frameworkdemoiselle.internal.context;
 import java.lang.annotation.Annotation;
 /**
- * Base context that has a separated store for each thread 
+ * Base context that has a separated store for each thread
  * 
  * @author serpro
- *
  */
 public class ThreadLocalContext extends AbstractCustomContext {
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.lang.reflect.Field;
@@ -46,7 +46,7 @@ import org.apache.commons.configuration.DataConfiguration;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor {
 	@Override
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.lang.reflect.Field;
@@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
 import br.gov.frameworkdemoiselle.util.Reflections;
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class ConfigurationClassValueExtractor implements ConfigurationValueExtractor {
 	@Override
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -50,7 +50,7 @@ import org.apache.commons.configuration.Configuration;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class ConfigurationMapValueExtractor implements ConfigurationValueExtractor {
 	@Override
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.lang.reflect.Field;
 import java.util.HashSet;
@@ -50,7 +50,7 @@ import org.apache.commons.lang.ClassUtils;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class ConfigurationPrimitiveOrWrapperValueExtractor implements ConfigurationValueExtractor {
 	private static final Set<Object> wrappers = new HashSet<Object>();
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.lang.reflect.Field;
@@ -45,7 +45,7 @@ import org.apache.commons.configuration.Configuration;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class ConfigurationStringValueExtractor implements ConfigurationValueExtractor {
 	@Override
@@ -36,14 +36,16 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
+
+import java.security.Principal;
+
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.AuthenticationException;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
-import br.gov.frameworkdemoiselle.security.User;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -52,8 +54,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * @author SERPRO
  * @see Authenticator
  */
-@SuppressWarnings("deprecation")
-@Priority(CORE_PRIORITY)
+@Priority(L1_PRIORITY)
 public class DefaultAuthenticator implements Authenticator {
 	private static final long serialVersionUID = 1L;
@@ -80,7 +81,7 @@ public class DefaultAuthenticator implements Authenticator {
 	 * @see br.gov.frameworkdemoiselle.security.Authenticator#getUser()
 	 */
 	@Override
-	public User getUser() {
+	public Principal getUser() {
 		throw getException();
 	}
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
@@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * @author SERPRO
  * @see Authorizer
  */
-@Priority(CORE_PRIORITY)
+@Priority(L1_PRIORITY)
 public class DefaultAuthorizer implements Authorizer {
 	private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
@@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * @author SERPRO
  * @see Transaction
  */
-@Priority(CORE_PRIORITY)
+@Priority(L1_PRIORITY)
 public class DefaultTransaction implements Transaction {
 	private static final long serialVersionUID = 1L;
@@ -0,0 +1,74 @@
+/*
+ * 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 br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.message.Message;
+import br.gov.frameworkdemoiselle.message.MessageAppender;
+
+@Priority(L1_PRIORITY)
+public class LoggerMessageAppender implements MessageAppender {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private Logger logger;
+
+	@Override
+	public void append(Message message) {
+		String text = message.getText();
+
+		switch (message.getSeverity()) {
+			case INFO:
+				logger.info(text);
+				break;
+
+			case WARN:
+				logger.warn(text);
+				break;
+
+			default:
+				logger.error(text);
+		}
+	}
+}
@@ -48,8 +48,10 @@ import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.message.DefaultMessage;
 import br.gov.frameworkdemoiselle.message.Message;
+import br.gov.frameworkdemoiselle.message.MessageAppender;
 import br.gov.frameworkdemoiselle.message.MessageContext;
 import br.gov.frameworkdemoiselle.message.SeverityType;
+import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -79,7 +81,13 @@ public class MessageContextImpl implements Serializable, MessageContext {
 		}
 		getLogger().debug(getBundle().getString("adding-message-to-context", message.toString()));
-		messages.add(aux);
+		getAppender().append(aux);
+	}
+
+	private MessageAppender getAppender() {
+		Class<? extends MessageAppender> appenderClass = StrategySelector.selectClass(MessageAppender.class);
+
+		return Beans.getReference(appenderClass);
 	}
 	@Override
@@ -42,8 +42,6 @@ import java.security.Principal;
 import javax.inject.Named;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap;
-import br.gov.frameworkdemoiselle.internal.bootstrap.AuthorizerBootstrap;
 import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.AfterLoginSuccessful;
@@ -74,11 +72,10 @@ public class SecurityContextImpl implements SecurityContext {
 	private Authenticator getAuthenticator() {
 		if (this.authenticator == null) {
-			AuthenticatorBootstrap bootstrap = Beans.getReference(AuthenticatorBootstrap.class);
 			Class<? extends Authenticator> clazz = getConfig().getAuthenticatorClass();
 			if (clazz == null) {
-				clazz = StrategySelector.selectClass(Authenticator.class, bootstrap.getCache());
+				clazz = StrategySelector.selectClass(Authenticator.class);
 			}
 			this.authenticator = Beans.getReference(clazz);
@@ -89,11 +86,10 @@ public class SecurityContextImpl implements SecurityContext {
 	private Authorizer getAuthorizer() {
 		if (this.authorizer == null) {
-			AuthorizerBootstrap bootstrap = Beans.getReference(AuthorizerBootstrap.class);
 			Class<? extends Authorizer> clazz = getConfig().getAuthorizerClass();
 			if (clazz == null) {
-				clazz = StrategySelector.selectClass(Authorizer.class, bootstrap.getCache());
+				clazz = StrategySelector.selectClass(Authorizer.class);
 			}
 			this.authorizer = Beans.getReference(clazz);
@@ -36,32 +36,26 @@
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static br.gov.frameworkdemoiselle.annotation.Priority.MIN_PRIORITY;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.enterprise.inject.AmbiguousResolutionException;
+import javax.enterprise.inject.spi.Bean;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 public final class StrategySelector implements Serializable {
-	public static final int CORE_PRIORITY = MIN_PRIORITY;
-
-	public static final int EXTENSIONS_L1_PRIORITY = CORE_PRIORITY - 100;
-
-	public static final int EXTENSIONS_L2_PRIORITY = EXTENSIONS_L1_PRIORITY - 100;
-
-	public static final int COMPONENTS_PRIORITY = EXTENSIONS_L2_PRIORITY - 100;
-
 	private static final long serialVersionUID = 1L;
 	private static ResourceBundle bundle;
@@ -92,7 +86,7 @@ public final class StrategySelector implements Serializable {
 		return map.get(elected);
 	}
-	public static <T> Class<? extends T> selectClass(Class<T> type, Collection<Class<? extends T>> options) {
+	private static <T> Class<? extends T> selectClass(Class<T> type, Collection<Class<? extends T>> options) {
 		Class<? extends T> selected = null;
 		for (Class<? extends T> option : options) {
@@ -102,13 +96,28 @@ public final class StrategySelector implements Serializable {
 		}
 		if (selected != null) {
-			checkForAmbiguity(type, selected, options);
+			performAmbiguityCheck(type, selected, options);
 		}
 		return selected;
 	}
-	private static <T> void checkForAmbiguity(Class<T> type, Class<? extends T> selected,
+	public static <T> Class<? extends T> selectClass(Class<T> type) {
+		return selectClass(type, getOptions(type));
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T> Collection<Class<? extends T>> getOptions(Class<T> type) {
+		Set<Class<? extends T>> result = new HashSet<Class<? extends T>>();
+
+		for (Bean<?> bean : Beans.getBeanManager().getBeans(type)) {
+			result.add((Class<? extends T>) bean.getBeanClass());
+		}
+
+		return result;
+	}
+
+	private static <T> void performAmbiguityCheck(Class<T> type, Class<? extends T> selected,
 			Collection<Class<? extends T>> options) {
 		int selectedPriority = getPriority(selected);
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.implementation;
 import javax.inject.Named;
-import br.gov.frameworkdemoiselle.internal.bootstrap.TransactionBootstrap;
 import br.gov.frameworkdemoiselle.internal.configuration.TransactionConfig;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
 import br.gov.frameworkdemoiselle.transaction.TransactionContext;
@@ -56,13 +55,13 @@ public class TransactionContextImpl implements TransactionContext {
 	private Transaction transaction;
-	private Transaction getTransaction() {
+	@Override
+	public Transaction getCurrentTransaction() {
 		if (this.transaction == null) {
-			TransactionBootstrap bootstrap = Beans.getReference(TransactionBootstrap.class);
 			Class<? extends Transaction> clazz = getConfig().getTransactionClass();
 			if (clazz == null) {
-				clazz = StrategySelector.selectClass(Transaction.class, bootstrap.getCache());
+				clazz = StrategySelector.selectClass(Transaction.class);
 			}
 			this.transaction = Beans.getReference(clazz);
@@ -71,11 +70,6 @@ public class TransactionContextImpl implements TransactionContext {
 		return this.transaction;
 	}
-	@Override
-	public Transaction getCurrentTransaction() {
-		return getTransaction();
-	}
-
 	private TransactionConfig getConfig() {
 		return Beans.getReference(TransactionConfig.class);
 	}
@@ -57,7 +57,7 @@ public class ExceptionHandlerInterceptor extends br.gov.frameworkdemoiselle.exce
 	@Inject
 	private Logger logger;
-	
+
 	@Override
 	@AroundInvoke
 	public Object manage(InvocationContext ic) throws Exception {
@@ -65,4 +65,3 @@ public class ExceptionHandlerInterceptor extends br.gov.frameworkdemoiselle.exce
 		return super.manage(ic);
 	}
 }
-
@@ -61,12 +61,12 @@ public class Slf4jLoggerProxy implements Logger, Serializable {
 	private transient Logger delegate;
 	private final Class<?> type;
-	
+
 	private Logger getDelegate() {
-		if(delegate == null) {
+		if (delegate == null) {
 			delegate = LoggerFactory.getLogger(type);
 		}
-		
+
 		return delegate;
 	}
@@ -42,34 +42,36 @@ import br.gov.frameworkdemoiselle.internal.management.ManagedType;
 import br.gov.frameworkdemoiselle.stereotype.ManagementController;
 /**
- * 
- * <p>Interface defining the lifecycle of a <b>management extension</b>, an extension
- * capable of exposing {@link ManagementController}'s to external clients in one
- * of the available management technologies, such as JMX or SNMP.</p>
- * 
- * <p>To include a management extension into the management lifecycle, it just needs
- * to implement this interface and be a CDI bean (have a <b>beans.xml</b> file inside
- * the META-INF folder of it's java package). The Demoiselle Core lifecycle controller
- * will call the {@link #initialize(List managedTypes)} and {@link #shutdown(List managedTypes)} methods at the apropriate times.</p>
+ * <p>
+ * Interface defining the lifecycle of a <b>management extension</b>, an extension capable of exposing
+ * {@link ManagementController}'s to external clients in one of the available management technologies, such as JMX or
+ * SNMP.
+ * </p>
+ * <p>
+ * To include a management extension into the management lifecycle, it just needs to implement this interface and be a
+ * CDI bean (have a <b>beans.xml</b> file inside the META-INF folder of it's java package). The Demoiselle Core
+ * lifecycle controller will call the {@link #initialize(List managedTypes)} and {@link #shutdown(List managedTypes)}
+ * methods at the apropriate times.
+ * </p>
  * 
  * @author serpro
- *
  */
 public interface ManagementExtension {
 	/**
-	 * This method is called during the application initialization process for each concrete
-	 * implementation of this interface.
+	 * This method is called during the application initialization process for each concrete implementation of this
+	 * interface.
 	 * 
-	 * @param managedTypes The list of discovered {@link ManagementController} classes.
+	 * @param managedTypes
+	 *            The list of discovered {@link ManagementController} classes.
 	 */
 	void initialize(List<ManagedType> managedTypes);
 	/**
-	 * This method is called during the application shutdown process for each concrete
-	 * implementation of this interface.
+	 * This method is called during the application shutdown process for each concrete implementation of this interface.
 	 * 
-	 * @param managedTypes The list of discovered {@link ManagementController} classes.
+	 * @param managedTypes
+	 *            The list of discovered {@link ManagementController} classes.
 	 */
 	void shutdown(List<ManagedType> managedTypes);
@@ -48,17 +48,20 @@ import java.lang.annotation.Target;
  * Take a look at the following usage sample:
  * <p>
  * <blockquote>
+ * 
  * <pre>
  * public class Finalizer {
  * 
- *   &#064;Shutdown
+ * 	&#064;Shutdown
  *   &#064;Priority(5)
  *   public void finalize() {
  *       ...
  *    }
  * }
  * 
+ * 
  * </pre>
+ * 
  * </blockquote>
  * <p>
  * 
@@ -48,17 +48,20 @@ import java.lang.annotation.Target;
  * Take a look at the following usage sample:
  * <p>
  * <blockquote>
+ * 
  * <pre>
  * public class Finalizer {
  * 
- *   &#064;Startup
+ * 	&#064;Startup
  *   &#064;Priority(1)
  *   public void init() {
  *       ...
  *    }
  * }
  * 
+ * 
  * </pre>
+ * 
  * </blockquote>
  * <p>
  * 
@@ -36,8 +36,6 @@
  */
 package br.gov.frameworkdemoiselle.message;
-import javax.enterprise.inject.Alternative;
-
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 import br.gov.frameworkdemoiselle.util.Strings;
@@ -45,7 +43,6 @@ import br.gov.frameworkdemoiselle.util.Strings;
 /**
  * @author SERPRO
  */
-@Alternative
 public class DefaultMessage implements Message {
 	private final String originalText;
@@ -65,28 +62,27 @@ public class DefaultMessage implements Message {
 		this.severity = (severity == null ? DEFAULT_SEVERITY : severity);
 		this.params = params;
 		this.bundle = Beans.getReference(ResourceBundle.class);
+
+		initParsedText();
 	}
 	public DefaultMessage(String text, Object... params) {
 		this(text, null, (Object[]) params);
 	}
-	public String getText() {
-		initParsedText();
-		return parsedText;
-	}
-
 	private void initParsedText() {
-		if (parsedText == null) {
-			if (Strings.isResourceBundleKeyFormat(originalText)) {
-				parsedText = bundle.getString(Strings.removeBraces(originalText));
-
-			} else if (originalText != null) {
-				parsedText = new String(originalText);
-			}
+		if (Strings.isResourceBundleKeyFormat(originalText)) {
+			parsedText = bundle.getString(Strings.removeBraces(originalText));
-			parsedText = Strings.getString(parsedText, params);
+		} else if (originalText != null) {
+			parsedText = new String(originalText);
 		}
+
+		parsedText = Strings.getString(parsedText, params);
+	}
+
+	public String getText() {
+		return parsedText;
 	}
 	public SeverityType getSeverity() {
@@ -95,7 +91,40 @@ public class DefaultMessage implements Message {
 	@Override
 	public String toString() {
-		initParsedText();
 		return Strings.toString(this);
 	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((parsedText == null) ? 0 : parsedText.hashCode());
+		result = prime * result + ((severity == null) ? 0 : severity.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		DefaultMessage other = (DefaultMessage) obj;
+		if (parsedText == null) {
+			if (other.parsedText != null) {
+				return false;
+			}
+		} else if (!parsedText.equals(other.parsedText)) {
+			return false;
+		}
+		if (severity != other.severity) {
+			return false;
+		}
+		return true;
+	}
 }
@@ -0,0 +1,47 @@
+/*
+ * 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.message;
+
+import java.io.Serializable;
+
+/**
+ * @author SERPRO
+ */
+public interface MessageAppender extends Serializable {
+
+	void append(Message message);
+}
@@ -65,11 +65,13 @@ public interface MessageContext {
 	/**
 	 * Returns all messages in the context.
 	 */
+	@Deprecated
 	List<Message> getMessages();
 	/**
 	 * Clears the list of messages in the context.
 	 */
+	@Deprecated
 	void clear();
 }
@@ -88,5 +88,5 @@ public interface Pagination {
 	 * Sets the position for the first record and hence calculates current page according to page size.
 	 */
 	void setFirstResult(int firstResult);
-	
+
 }
@@ -51,7 +51,8 @@ public interface PaginationContext {
 	/**
 	 * Retrieves the pagination according to the class type specified.
 	 * 
-	 * @param clazz a {@code Class} type
+	 * @param clazz
+	 *            a {@code Class} type
 	 * @return Pagination
 	 */
 	Pagination getPagination(Class<?> clazz);
@@ -60,8 +61,10 @@ public interface PaginationContext {
 	 * Retrieves the pagination according to the class type specified. If not existing, creates the pagination whenever
 	 * {@code create} parameter is true.
 	 * 
-	 * @param clazz a {@code Class} type
-	 * @param create determines whether pagination must always be returned
+	 * @param clazz
+	 *            a {@code Class} type
+	 * @param create
+	 *            determines whether pagination must always be returned
 	 * @return Pagination
 	 */
 	Pagination getPagination(Class<?> clazz, boolean create);
@@ -49,7 +49,8 @@ public interface Authenticator extends Serializable {
 	/**
 	 * Executes the necessary steps to authenticate an user.
 	 * 
-	 * @throws AuthenticationException When the authentication process fails, this exception is thrown.
+	 * @throws AuthenticationException
+	 *             When the authentication process fails, this exception is thrown.
 	 */
 	void authenticate() throws AuthenticationException;
@@ -46,9 +46,8 @@ import javax.interceptor.InvocationContext;
 import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 import br.gov.frameworkdemoiselle.util.Strings;
@@ -63,9 +62,9 @@ public class RequiredPermissionInterceptor implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
-	private static Logger logger;
+	private static transient Logger logger;
 	/**
 	 * Gets the values for both resource and operation properties of {@code @RequiredPermission}. Delegates to
@@ -168,7 +167,7 @@ public class RequiredPermissionInterceptor implements Serializable {
 	private static ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
 		return bundle;
@@ -176,7 +175,7 @@ public class RequiredPermissionInterceptor implements Serializable {
 	private static Logger getLogger() {
 		if (logger == null) {
-			logger = LoggerProducer.create(RequiredPermissionInterceptor.class);
+			logger = Beans.getReference(Logger.class, new NameQualifier(RequiredPermissionInterceptor.class.getName()));
 		}
 		return logger;
@@ -47,9 +47,8 @@ import javax.interceptor.InvocationContext;
 import org.slf4j.Logger;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -63,9 +62,9 @@ public class RequiredRoleInterceptor implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
-	private static Logger logger;
+	private static transient Logger logger;
 	/**
 	 * Gets the value property of {@code @RequiredRole}. Delegates to {@code SecurityContext} check role. If the user
@@ -102,7 +101,6 @@ public class RequiredRoleInterceptor implements Serializable {
 					.error(getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(),
 							roles));
-			// AuthorizationException a = new AuthorizationException(null);
 			throw new AuthorizationException(getBundle().getString("does-not-have-role-ui", roles));
 		}
@@ -139,7 +137,7 @@ public class RequiredRoleInterceptor implements Serializable {
 	private static ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
 		return bundle;
@@ -147,7 +145,7 @@ public class RequiredRoleInterceptor implements Serializable {
 	private static Logger getLogger() {
 		if (logger == null) {
-			logger = LoggerProducer.create(RequiredRoleInterceptor.class);
+			logger = Beans.getReference(Logger.class, new NameQualifier(RequiredRoleInterceptor.class.getName()));
 		}
 		return logger;
@@ -41,7 +41,7 @@ import java.security.Principal;
 /**
  * @author SERPRO
- * @deprecated 
+ * @deprecated
  */
 public interface User extends Principal, Serializable {
@@ -49,17 +49,23 @@ import javax.enterprise.inject.Stereotype;
 import javax.enterprise.util.Nonbinding;
 /**
- * <p>Identifies a <b>management controller</b> bean. What it means is that an external client can manage the application
- * this class is in by reading or writing it's attributes and calling it's operations.</p>
  * <p>
- * Only fields annotated with {@link br.gov.frameworkdemoiselle.annotation.ManagedProperty} or
- * methods annotated with {@link br.gov.frameworkdemoiselle.annotation.ManagedOperation} will be exposed
- * to clients.</p>
- * <p>Only bean implementations (concrete classes) can be management controllers. It's a runtime error to mark an interface
- * or abstract class with this annotation.</p>
- * <p>This stereotype only defines a class as managed, you need to choose an extension that will expose this managed class
+ * Identifies a <b>management controller</b> bean. What it means is that an external client can manage the application
+ * this class is in by reading or writing it's attributes and calling it's operations.
+ * </p>
+ * <p>
+ * Only fields annotated with {@link br.gov.frameworkdemoiselle.annotation.ManagedProperty} or methods annotated with
+ * {@link br.gov.frameworkdemoiselle.annotation.ManagedOperation} will be exposed to clients.
+ * </p>
+ * <p>
+ * Only bean implementations (concrete classes) can be management controllers. It's a runtime error to mark an interface
+ * or abstract class with this annotation.
+ * </p>
+ * <p>
+ * This stereotype only defines a class as managed, you need to choose an extension that will expose this managed class
  * to external clients using any technology available. One example is the Demoiselle JMX extension, that will expose
- * managed classes as MBeans.</p> 
+ * managed classes as MBeans.
+ * </p>
  * 
  * @author SERPRO
  */
@@ -71,7 +77,7 @@ import javax.enterprise.util.Nonbinding;
 @Retention(RUNTIME)
 @Target({ TYPE })
 public @interface ManagementController {
-	
+
 	/**
 	 * @return Human readable description of this managed class.
 	 */
@@ -43,16 +43,18 @@ import java.util.List;
  * Interface containing basic methods for creating, updating and deleting entities (the CRUD design pattern).
  * 
  * @author serpro
- *
- * @param <T> Type of the entity
- * @param <I> Type of the identification attribute of the entity
+ * @param <T>
+ *            Type of the entity
+ * @param <I>
+ *            Type of the identification attribute of the entity
  */
 public interface Crud<T, I> extends Serializable {
 	/**
 	 * Find an entity by it's identification attribute and make it transient.
 	 * 
-	 * @param id The unique identification to find the entity to be deleted.
+	 * @param id
+	 *            The unique identification to find the entity to be deleted.
 	 */
 	void delete(I id);
@@ -66,24 +68,27 @@ public interface Crud&lt;T, I&gt; extends Serializable {
 	/**
 	 * Insert an entity and return the inserted instance of the entity
 	 * 
-	 * @param bean The bean to be inserted
+	 * @param bean
+	 *            The bean to be inserted
 	 * @return The inserted instance of the entity
 	 */
 	T insert(T bean);
 	/**
 	 * Find an entity's instance by it's identification attribute and return it
-	 * @param id Value of the identification attribute of the desired entity's instance
-	 * @return The entity's instance whose identification attribute's value matches
-	 * the one passed as argument.
+	 * 
+	 * @param id
+	 *            Value of the identification attribute of the desired entity's instance
+	 * @return The entity's instance whose identification attribute's value matches the one passed as argument.
 	 */
 	T load(I id);
 	/**
-	 * Update an instance of the entity with the bean's attributes as new values. 
+	 * Update an instance of the entity with the bean's attributes as new values.
 	 * 
-	 * @param bean The bean instance containing both the identification value to find the old
-	 * instance and the new values for the instance's attributes.
+	 * @param bean
+	 *            The bean instance containing both the identification value to find the old instance and the new values
+	 *            for the instance's attributes.
 	 * @return The updated entity's instance
 	 */
 	T update(T bean);
@@ -39,20 +39,15 @@ package br.gov.frameworkdemoiselle.template;
 import java.util.List;
 import java.util.ListIterator;
-import br.gov.frameworkdemoiselle.internal.implementation.DefaultTransaction;
-import br.gov.frameworkdemoiselle.transaction.Transaction;
-import br.gov.frameworkdemoiselle.transaction.TransactionContext;
-import br.gov.frameworkdemoiselle.transaction.Transactional;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Reflections;
 /**
- * An implementation of the {@link Crud} interface that delegates it's operations
- * to another {@link Crud} implementation.
+ * An implementation of the {@link Crud} interface that delegates it's operations to another {@link Crud}
+ * implementation.
  * 
  * @author serpro
- *
- * @param <T> 
+ * @param <T>
  *            bean object type
  * @param <I>
  *            bean id type
@@ -75,19 +70,6 @@ public class DelegateCrud&lt;T, I, C extends Crud&lt;T, I&gt;&gt; implements Crud&lt;T, I&gt; {
 	 */
 	@Override
 	public void delete(final I id) {
-		if (isRunningTransactionalOperations()) {
-			transactionalDelete(id);
-		} else {
-			nonTransactionalDelete(id);
-		}
-	}
-
-	@Transactional
-	private void transactionalDelete(final I id) {
-		nonTransactionalDelete(id);
-	}
-
-	private void nonTransactionalDelete(final I id) {
 		getDelegate().delete(id);
 	}
@@ -98,20 +80,8 @@ public class DelegateCrud&lt;T, I, C extends Crud&lt;T, I&gt;&gt; implements Crud&lt;T, I&gt; {
 	 *            List of entities identifiers
 	 */
 	public void delete(final List<I> ids) {
-		if (isRunningTransactionalOperations()) {
-			transactionalDelete(ids);
-		} else {
-			nonTransactionalDelete(ids);
-		}
-	}
-
-	@Transactional
-	private void transactionalDelete(final List<I> ids) {
-		nonTransactionalDelete(ids);
-	}
-
-	private void nonTransactionalDelete(final List<I> ids) {
 		ListIterator<I> iter = ids.listIterator();
+
 		while (iter.hasNext()) {
 			this.delete(iter.next());
 		}
@@ -151,19 +121,6 @@ public class DelegateCrud&lt;T, I, C extends Crud&lt;T, I&gt;&gt; implements Crud&lt;T, I&gt; {
 	 */
 	@Override
 	public T insert(final T bean) {
-		if (isRunningTransactionalOperations()) {
-			return transactionalInsert(bean);
-		} else {
-			return nonTransactionalInsert(bean);
-		}
-	}
-
-	@Transactional
-	private T transactionalInsert(final T bean) {
-		return nonTransactionalInsert(bean);
-	}
-
-	private T nonTransactionalInsert(final T bean) {
 		return getDelegate().insert(bean);
 	}
@@ -185,24 +142,6 @@ public class DelegateCrud&lt;T, I, C extends Crud&lt;T, I&gt;&gt; implements Crud&lt;T, I&gt; {
 	 */
 	@Override
 	public T update(final T bean) {
-		if (isRunningTransactionalOperations()) {
-			return transactionalUpdate(bean);
-		} else {
-			return nonTransactionalUpdate(bean);
-		}
-	}
-
-	@Transactional
-	private T transactionalUpdate(final T bean) {
-		return nonTransactionalUpdate(bean);
-	}
-
-	private T nonTransactionalUpdate(final T bean) {
 		return getDelegate().update(bean);
 	}
-
-	private boolean isRunningTransactionalOperations() {
-		Transaction transaction = Beans.getReference(TransactionContext.class).getCurrentTransaction();
-		return !(transaction instanceof DefaultTransaction);
-	}
 }
@@ -48,9 +48,8 @@ import javax.interceptor.InvocationContext;
 import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @Interceptor
@@ -63,9 +62,9 @@ public class TransactionalInterceptor implements Serializable {
 	private TransactionInfo transactionInfo;
-	private static ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
-	private static Logger logger;
+	private static transient Logger logger;
 	private TransactionContext getTransactionContext() {
 		if (this.transactionContext == null) {
@@ -175,7 +174,7 @@ public class TransactionalInterceptor implements Serializable {
 	private static ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
 		return bundle;
@@ -183,7 +182,7 @@ public class TransactionalInterceptor implements Serializable {
 	private static Logger getLogger() {
 		if (logger == null) {
-			logger = LoggerProducer.create(TransactionalInterceptor.class);
+			logger = Beans.getReference(Logger.class, new NameQualifier(TransactionalInterceptor.class.getName()));
 		}
 		return logger;
@@ -37,22 +37,25 @@
 package br.gov.frameworkdemoiselle.util;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
 import java.lang.reflect.Type;
-import java.util.Locale;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.bootstrap.CustomInjectionPoint;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 public final class Beans {
+	private static transient ResourceBundle bundle;
+
 	private static BeanManager manager;
 	private Beans() {
@@ -132,6 +135,98 @@ public final class Beans {
 	}
 	private static ResourceBundle getBundle() {
-		return ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
+		}
+
+		return bundle;
+	}
+
+	static class CustomInjectionPoint implements InjectionPoint {
+
+		private final Bean<?> bean;
+
+		private final Type beanType;
+
+		private final Set<Annotation> qualifiers;
+
+		public CustomInjectionPoint(Bean<?> bean, Type beanType, Annotation... qualifiers) {
+			this.bean = bean;
+			this.beanType = beanType;
+			this.qualifiers = new HashSet<Annotation>(Arrays.asList(qualifiers));
+		}
+
+		@Override
+		public Type getType() {
+			return this.beanType;
+		}
+
+		@Override
+		public Set<Annotation> getQualifiers() {
+			return this.qualifiers;
+		}
+
+		@Override
+		public Bean<?> getBean() {
+			return this.bean;
+		}
+
+		@Override
+		public Member getMember() {
+			return null;
+		}
+
+		@Override
+		public boolean isDelegate() {
+			return false;
+		}
+
+		@Override
+		public boolean isTransient() {
+			return false;
+		}
+
+		@Override
+		public Annotated getAnnotated() {
+			return new Annotated() {
+
+				@Override
+				public Type getBaseType() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				public Set<Type> getTypeClosure() {
+					// TODO Auto-generated method stub
+					return null;
+				}
+
+				@Override
+				@SuppressWarnings("unchecked")
+				public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+					T result = null;
+
+					for (Annotation annotation : getAnnotations()) {
+						if (annotation.annotationType() == annotationType) {
+							result = (T) annotation;
+							break;
+						}
+					}
+
+					return result;
+				}
+
+				@Override
+				public Set<Annotation> getAnnotations() {
+					return qualifiers;
+				}
+
+				@Override
+				public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+					return qualifiers.contains(annotationType);
+				}
+			};
+		}
 	}
 }
@@ -166,7 +166,7 @@ public final class Reflections {
 	}
 	public static ClassLoader getClassLoaderForResource(final String resource) {
-		final String stripped = resource.startsWith("/") ? resource.substring(1) : resource;
+		final String stripped = resource.charAt(0) == '/' ? resource.substring(1) : resource;
 		URL url = null;
 		ClassLoader result = Thread.currentThread().getContextClassLoader();
@@ -114,14 +114,14 @@ public final class Strings {
 					}
 					result.append(field.getName());
-					result.append("=");
+					result.append('=');
 					fieldValue = Reflections.getFieldValue(field, object);
 					result.append(fieldValue != null && fieldValue.getClass().isArray() ? Arrays
 							.toString((Object[]) fieldValue) : fieldValue);
 				}
 			}
-			result.append("]");
+			result.append(']');
 		}
 		return result.toString();
 br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ConfigurationBootstrap
-br.gov.frameworkdemoiselle.internal.bootstrap.TransactionBootstrap
-br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap
-br.gov.frameworkdemoiselle.internal.bootstrap.AuthorizerBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ManagementBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap
@@ -42,14 +42,14 @@ public abstract class BeanValidationWithEmptyNotNullFieldConfig {
 	@NotNull
 	private Integer intAttributeNull;
-	
+
 	@NotNull
 	private String stringAttributeNull;
-	
+
 	public Integer getIntAttributeNull() {
 		return intAttributeNull;
 	}
-	
+
 	public String getStringAttributeNull() {
 		return stringAttributeNull;
 	}
@@ -6,14 +6,14 @@ public class BeanValidationWithFilledNotNullFieldConfig {
 	@NotNull
 	private String stringAttributeNotNull;
-	
+
 	@NotNull
 	private Integer intAttibuteNotNull;
-	
+
 	public String getStringAttributeNotNull() {
 		return stringAttributeNotNull;
 	}
-	
+
 	public Integer getIntAttibuteNotNull() {
 		return intAttibuteNotNull;
 	}
@@ -80,7 +80,8 @@ public class ConfigurationBeanValidationFieldTest {
 		JavaArchive deployment = Tests.createDeployment(ConfigurationBeanValidationFieldTest.class);
 		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
 		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.xml"), "demoiselle.xml");
-		deployment.addAsResource(Tests.createFileAsset(PATH + "/two-constrain-validation.properties"), "two-constrain-validation.properties");
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/two-constrain-validation.properties"),
+				"two-constrain-validation.properties");
 		return deployment;
 	}
@@ -136,7 +137,7 @@ public class ConfigurationBeanValidationFieldTest {
 	}
 	@Test
-	public void loadPropertiesWithTwoConstraintViolations(){
+	public void loadPropertiesWithTwoConstraintViolations() {
 		try {
 			propertyWithTwoConstrainViolations.getAttributeWithTwoConstrainValidations();
 			fail();
@@ -41,7 +41,7 @@ public abstract class AbstractClassNotFoundFieldConfig {
 	private Class<MyClass> nonExistentTypedClass;
 	private Class<?> nonExistentUntypedClass;
-	
+
 	public Class<MyClass> getNonExistentTypedClass() {
 		return nonExistentTypedClass;
 	}
@@ -40,9 +40,9 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
 @Configuration
 public class PropertiesNullClassFieldConfig {
-	
+
 	private Class<MyClass> nullClass;
-	
+
 	public Class<MyClass> getNullClass() {
 		return nullClass;
 	}
@@ -45,7 +45,7 @@ public abstract class AbstractMapFieldConfig {
 	private Map<String, String> stringWithUndefinedKeyMap;
 	private Map<String, String> emptyValueMap;
-	
+
 	private Map<String, String> NullMapValue;
 	public Map<String, String> getStringWithUndefinedKeyMap() {
@@ -99,9 +99,9 @@ public class ConfigurationMapFieldTest {
 		assertEquals(expected, propertiesConfig.getEmptyValueMap());
 		assertEquals(expected, xmlConfig.getEmptyValueMap());
 	}
-	
+
 	@Test
-	public void loadNullMap(){
+	public void loadNullMap() {
 		assertNull(propertiesConfig.getNullMapValue());
 		assertNull(xmlConfig.getNullMapValue());
 	}
@@ -45,7 +45,7 @@ public abstract class AbstractPrimitiveOrWrapperErrorFieldConfig {
 	private Integer emptyWrappedField;
 	private Integer conversionErrorWrappedField;
-	
+
 	public int getEmptyPrimitiveField() {
 		return emptyPrimitiveField;
 	}
@@ -78,7 +78,7 @@ public class ConfigurationPrimitiveOrWrapperFieldTest {
 	@Inject
 	private PropertiesNullWrappedField nullWrappedField;
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive deployment = Tests.createDeployment(ConfigurationPrimitiveOrWrapperFieldTest.class);
@@ -210,9 +210,9 @@ public class ConfigurationPrimitiveOrWrapperFieldTest {
 			assertEquals(ConversionException.class, cause.getCause().getClass());
 		}
 	}
-	
+
 	@Test
-	public void loadNullWrappedField(){
+	public void loadNullWrappedField() {
 		assertNull(nullWrappedField.getNullWrappedField());
 	}
 }
@@ -6,7 +6,7 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
 public class PropertiesNullWrappedField {
 	private Integer nullWrappedField;
-	
+
 	public Integer getNullWrappedField() {
 		return nullWrappedField;
 	}
 package configuration.field.string;
-
 public class AbstractNullStringFieldConfig {
 	private String nullString;
@@ -63,7 +63,7 @@ public class ConfigurationStringFieldTest {
 	@Inject
 	private SystemStringFieldConfig systemConfig;
-	
+
 	@Inject
 	private PropertiesNullStringFieldConfig propertiesNullConfig;
@@ -113,9 +113,9 @@ public class ConfigurationStringFieldTest {
 		assertEquals(expected, propertiesConfig.getEmptyString());
 		assertEquals(expected, xmlConfig.getEmptyString());
 	}
-	
+
 	@Test
-	public void loadNullString(){
+	public void loadNullString() {
 		assertNull(propertiesNullConfig.getNullString());
 		assertNull(xmlNullConfig.getNullString());
 		assertNull(systemNullConfig.getNullString());
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.exception.ExceptionHandler;
 public class ExceptionClassNotAnnotated {
 	private boolean nullPointerExceptionHandler = false;
-	
+
 	public boolean isNullPointerExceptionHandler() {
 		return nullPointerExceptionHandler;
 	}
@@ -64,7 +64,7 @@ public class ExceptionHandlerTest {
 	@Inject
 	private ExceptionNested nested;
-	
+
 	@Inject
 	private ExceptionClassNotAnnotated classNotAnnotated;
@@ -127,7 +127,7 @@ public class ExceptionHandlerTest {
 			assertEquals(false, nested.isExceptionHandler());
 		}
 	}
-	
+
 	@Test
 	public void exceptionClassNotAnnotatedController() {
 		try {
@@ -45,7 +45,7 @@ public class SimpleExceptionHandler {
 	private boolean nullPointerExceptionHandler = false;
 	private boolean arithmeticExceptionHandler = false;
-	
+
 	public boolean isNullPointerExceptionHandler() {
 		return nullPointerExceptionHandler;
 	}
@@ -53,7 +53,7 @@ public class SimpleExceptionHandler {
 	public boolean isArithmeticExceptionHandler() {
 		return arithmeticExceptionHandler;
 	}
-	
+
 	public void throwNullPointerException() {
 		throw new NullPointerException();
 	}
@@ -61,11 +61,11 @@ public class SimpleExceptionHandler {
 	public void throwArithmeticException() {
 		throw new ArithmeticException();
 	}
-	
+
 	public void throwExceptionWithoutHandler() {
 		throw new IllegalArgumentException();
-	}	
-	
+	}
+
 	@SuppressWarnings({ "null", "unused" })
 	public void throwTwoException() {
 		String txt = null;
@@ -81,5 +81,5 @@ public class SimpleExceptionHandler {
 	@ExceptionHandler
 	public void handler(ArithmeticException cause) {
 		arithmeticExceptionHandler = true;
-	}	
+	}
 }
@@ -50,12 +50,12 @@ public class CustomExceptionHandler {
 	public void setExceptionHandler(boolean exceptionHandler) {
 		this.exceptionHandler = exceptionHandler;
-	}	
-	
+	}
+
 	public void throwExceptionWithMessage() {
 		throw new CustomException();
 	}
-	
+
 	@ExceptionHandler
 	public void handler(CustomException exception) {
 		setExceptionHandler(true);
@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.lifecycle.Shutdown;
 public class ShutdownWithPriority {
 	private List<Integer> listShutdown = new ArrayList<Integer>();
-	
+
 	public List<Integer> getListShutdown() {
 		return listShutdown;
 	}
@@ -67,7 +67,7 @@ public class ShutdownWithPriority {
 	public void unloadWithPriority1() {
 		listShutdown.add(2);
 	}
-	
+
 	@Shutdown
 	@Priority(MAX_PRIORITY)
 	public void unloadWithMaxPriority() {
@@ -47,11 +47,11 @@ import br.gov.frameworkdemoiselle.lifecycle.Shutdown;
 public class ShutdownSimple {
 	private List<Integer> listShutdown = new ArrayList<Integer>();
-	
+
 	public List<Integer> getListShutdown() {
 		return listShutdown;
 	}
-	
+
 	@Shutdown
 	public void unloadWithoutPriorityFirst() {
 		listShutdown.add(3);
@@ -73,7 +73,7 @@ public class StartupWithPriorityTest {
 		Beans.getBeanManager().fireEvent(new AfterStartupProccess() {
 		});
 	}
-	
+
 	@Test
 	public void startupWithPriority() {
 		expected.add(1);
@@ -65,5 +65,5 @@ public class StartupSimple {
 	@Startup
 	public void loadWithoutPriorityThird() {
 		listStartup.add(2);
-	}	
+	}
 }
@@ -59,9 +59,9 @@ public class StartupSimpleTest {
 	@Inject
 	private StartupSimple startupSimple;
-	
+
 	List<Integer> expected = new ArrayList<Integer>();
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive deployment = Tests.createDeployment(StartupSimpleTest.class);
@@ -73,7 +73,7 @@ public class StartupSimpleTest {
 		Beans.getBeanManager().fireEvent(new AfterStartupProccess() {
 		});
 	}
-	
+
 	@Test
 	public void startup() {
 		expected.add(1);
@@ -83,4 +83,3 @@ public class StartupSimpleTest {
 		Assert.assertEquals(expected, startupSimple.getListStartup());
 	}
 }
-
@@ -0,0 +1,62 @@
+/*
+ * 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 message;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+
+import br.gov.frameworkdemoiselle.message.Message;
+import br.gov.frameworkdemoiselle.message.MessageAppender;
+
+@RequestScoped
+public class DummyMessageAppender implements MessageAppender {
+
+	private static final long serialVersionUID = 1L;
+
+	private List<Message> messages = new ArrayList<Message>();
+
+	@Override
+	public void append(Message message) {
+		messages.add(message);
+	}
+
+	public List<Message> getMessages() {
+		return messages;
+	}
+}
+/*
+ * 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 message;
 import static junit.framework.Assert.assertEquals;
@@ -14,7 +50,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import resourcebundle.parameter.ResourceBundleWithParameter;
 import test.Tests;
 import br.gov.frameworkdemoiselle.internal.context.ContextManager;
 import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
@@ -34,7 +69,7 @@ public class MessageContextTest {
 	private MessageWithResourceBundle bundleCustom;
 	private static final String PATH = "src/test/resources/message/";
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive deployment = Tests.createDeployment(MessageContextTest.class);
@@ -47,8 +82,10 @@ public class MessageContextTest {
 	public void testAddMessageWithoutParams() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Menssage without param");
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message);
-		assertEquals(messageContext.getMessages().size(), 1);
+		assertEquals(appender.getMessages().size(), 1);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
@@ -56,8 +93,10 @@ public class MessageContextTest {
 	public void testAddMessageWithoutParamsIfSeverityIsInfo() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Menssage without param");
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message);
-		assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.INFO);
+		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.INFO);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
@@ -65,8 +104,10 @@ public class MessageContextTest {
 	public void testAddMessageWitSeverityInfo() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Menssage without param", SeverityType.INFO);
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message);
-		assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.INFO);
+		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.INFO);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
@@ -74,28 +115,21 @@ public class MessageContextTest {
 	public void testAddMessageWitSeverityWarn() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Menssage without param", SeverityType.WARN);
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message);
-		assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.WARN);
+		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.WARN);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
-	
+
 	@Test
 	public void testAddMessageWitSeverityErro() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Menssage without param", SeverityType.ERROR);
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message);
-		assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.ERROR);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
-	}
-	
-	@Test
-	public void testCleanMessageContext() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
-		Message message = new DefaultMessage("Menssage without param");
-		messageContext.add(message);
-		assertEquals(messageContext.getMessages().size(), 1);
-		messageContext.clear();
-		assertEquals(messageContext.getMessages().size(), 0);
+		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.ERROR);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
@@ -103,11 +137,13 @@ public class MessageContextTest {
 	public void testRecoverMessageWithParams() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message message = new DefaultMessage("Message with {0} param");
+		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
+
 		messageContext.add(message, 1);
-		assertTrue(messageContext.getMessages().get(0).getText().equals("Message with 1 param"));
+		assertTrue(appender.getMessages().get(0).getText().equals("Message with 1 param"));
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
-	
+
 	@Test
 	public void testMessageWithResourceBundle() {
 		bundleCustom = Beans.getReference(MessageWithResourceBundle.class);
@@ -115,9 +151,9 @@ public class MessageContextTest {
 		String value = bundleCustom.getBundle().getString("MESSAGE_WITHOUT_PARAMETER");
 		Assert.assertEquals(expected, value);
 	}
-	
+
 	@Test
-	public void testMessageParsedText(){
+	public void testMessageParsedText() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message MESSAGE_PARSED = new DefaultMessage("{MESSAGE_PARSED}");
 		String expected = "Message parsed";
@@ -125,9 +161,9 @@ public class MessageContextTest {
 		Assert.assertEquals(expected, value);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
-	
+
 	@Test
-	public void testMessageIsNull(){
+	public void testMessageIsNull() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 		Message NULL_MESSAGE = new DefaultMessage(null);
 		String expected = null;
@@ -135,5 +171,4 @@ public class MessageContextTest {
 		Assert.assertEquals(expected, value);
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.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 message;
 import javax.inject.Inject;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
-public class MessageWithResourceBundle{
+public class MessageWithResourceBundle {
 	@Inject
 	private ResourceBundle bundle;
@@ -67,23 +67,23 @@ public class ResourceBundleDefaultTest {
 	@Test
 	public void loadResourceDefault() {
-		Locale.setDefault(new Locale("pt", "BR"));  
+		Locale.setDefault(new Locale("pt", "BR"));
 		bundleDefault = Beans.getReference(ResourceBundleDefault.class);
 		Assert.assertEquals("mensagem em Portugues", bundleDefault.getMessage());
 	}
 	@Test
 	public void loadResourceDefaultEnglish() {
-		Locale.setDefault(Locale.US);  
+		Locale.setDefault(Locale.US);
 		bundleDefault = Beans.getReference(ResourceBundleDefault.class);
 		Assert.assertEquals("message in English", bundleDefault.getMessage());
 	}
-	
+
 	@Test
 	public void loadResourceWithLocaleNotExist() {
 		Locale.setDefault(Locale.ITALY);
 		bundleDefault = Beans.getReference(ResourceBundleDefault.class);
 		Assert.assertEquals("mensagem em Portugues", bundleDefault.getMessage());
-	}	
+	}
 }
@@ -77,7 +77,7 @@ public class ResourceBundleWithParameterTest {
 		String value = bundleCustom.getBundle().getString("messageTwoParameter", "1", "2");
 		Assert.assertEquals(expected, value);
 	}
-	
+
 	@Test
 	public void loadKeyWithoutParameter() {
 		bundleCustom = Beans.getReference(ResourceBundleWithParameter.class);
@@ -85,15 +85,15 @@ public class ResourceBundleWithParameterTest {
 		String value = bundleCustom.getBundle().getString("messageWithoutParameter", "1", "2", "3");
 		Assert.assertEquals(expected, value);
 	}
-	
+
 	@Test
 	public void loadKeyWithStringParameter() {
 		bundleCustom = Beans.getReference(ResourceBundleWithParameter.class);
 		String expected = "Mensagem número 1";
 		String value = bundleCustom.getBundle().getString("messageParameterString", "1");
 		Assert.assertNotSame(expected, value);
-		
-		expected = "Mensagem número {numero}";	
+
+		expected = "Mensagem número {numero}";
 		Assert.assertEquals(expected, value);
 	}
@@ -83,24 +83,24 @@ public class CustomAuthenticatorTest {
 	@Test
 	public void loginProcess() {
 		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
-		
+
 		context.login();
 		assertTrue(context.isLoggedIn());
 		assertNotNull(observer.getEvent());
 		assertEquals("demoiselle", context.getCurrentUser().getName());
-		
+
 		ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
 	}
 	@Test
 	public void logoutProcess() {
 		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
-		
+
 		context.login();
 		context.logout();
 		assertFalse(context.isLoggedIn());
 		assertNull(context.getCurrentUser());
-		
+
 		ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
 	}
 }
@@ -47,7 +47,7 @@ public final class Tests {
 	private Tests() {
 	}
-	public static JavaArchive createDeployment(Class<?> baseClass) {
+	public static JavaArchive createDeployment(final Class<?> baseClass) {
 		return createDeployment().addPackages(true, baseClass.getPackage());
 	}
@@ -62,7 +62,7 @@ public final class Tests {
 						"services/javax.enterprise.inject.spi.Extension");
 	}
-	public static FileAsset createFileAsset(String pathname) {
+	public static FileAsset createFileAsset(final String pathname) {
 		return new FileAsset(new File(pathname));
 	}
 }
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.transaction.Transaction;
 public class DummyStrategy implements Transaction {
 	private static final long serialVersionUID = 1L;
-	
+
 	private boolean markedRollback = false;
 	private boolean active = false;
@@ -97,35 +97,35 @@ public class TransactionManager {
 		return transactionPassedInSetRollbackOnlyMethod;
 	}
-	public static void setTransactionMarkedRollback(boolean markedRollback) {
+	public static void setTransactionMarkedRollback(final boolean markedRollback) {
 		transactionMarkedRollback = markedRollback;
 	}
-	public static void setTransactionActive(boolean active) {
+	public static void setTransactionActive(final boolean active) {
 		transactionActive = active;
 	}
-	public static void setTransactionPassedInIsActiveMethod(boolean passedInIsActiveMethod) {
+	public static void setTransactionPassedInIsActiveMethod(final boolean passedInIsActiveMethod) {
 		transactionPassedInIsActiveMethod = passedInIsActiveMethod;
 	}
-	public static void setTransactionPassedInIsMarkedRollbackMethod(boolean passedInIsMarkedRollbackMethod) {
+	public static void setTransactionPassedInIsMarkedRollbackMethod(final boolean passedInIsMarkedRollbackMethod) {
 		transactionPassedInIsMarkedRollbackMethod = passedInIsMarkedRollbackMethod;
 	}
-	public static void setTransactionPassedInBeginMethod(boolean passedInBeginMethod) {
+	public static void setTransactionPassedInBeginMethod(final boolean passedInBeginMethod) {
 		transactionPassedInBeginMethod = passedInBeginMethod;
 	}
-	public static void setTransactionPassedInCommitMethod(boolean passedInCommitMethod) {
+	public static void setTransactionPassedInCommitMethod(final boolean passedInCommitMethod) {
 		transactionPassedInCommitMethod = passedInCommitMethod;
 	}
-	public static void setTransactionPassedInRollbackMethod(boolean passedInRollbackMethod) {
+	public static void setTransactionPassedInRollbackMethod(final boolean passedInRollbackMethod) {
 		transactionPassedInRollbackMethod = passedInRollbackMethod;
 	}
-	public static void setTransactionPassedInSetRollbackOnlyMethod(boolean passedInSetRollbackOnlyMethod) {
+	public static void setTransactionPassedInSetRollbackOnlyMethod(final boolean passedInSetRollbackOnlyMethod) {
 		transactionPassedInSetRollbackOnlyMethod = passedInSetRollbackOnlyMethod;
 	}
 }
@@ -41,8 +41,8 @@ import br.gov.frameworkdemoiselle.stereotype.Controller;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
 @Controller
-public class TransactionManagerWithDefaultRollback extends TransactionManager{
-	
+public class TransactionManagerWithDefaultRollback extends TransactionManager {
+
 	@Transactional
 	public void insert() {
 		throw new TransactionExceptionWithDefaultRollback();
@@ -41,7 +41,7 @@ import br.gov.frameworkdemoiselle.stereotype.Controller;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
 @Controller
-public class TransactionManagerWithRollback extends TransactionManager{
+public class TransactionManagerWithRollback extends TransactionManager {
 	@Transactional
 	public void insert() {
@@ -58,16 +58,16 @@ import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
 @RunWith(Arquillian.class)
 public class TransactionRollbackTest {
-	
+
 	@Inject
 	private TransactionManagerWithDefaultRollback managerWithDefaultRollback;
-	
+
 	@Inject
 	private TransactionManagerWithRollback managerWithRollback;
-	
+
 	@Inject
 	private TransactionManagerWithoutRollback managerWithoutRollback;
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive deployment = Tests.createDeployment(TransactionRollbackTest.class);
@@ -78,19 +78,19 @@ public class TransactionRollbackTest {
 	public void activeContext() {
 		ContextManager.activate(ManagedContext.class, RequestScoped.class);
 	}
-	
+
 	@After
-	public void deactiveContext(){
+	public void deactiveContext() {
 		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
 	}
-	
+
 	@Test
-	public void transactionWithDefaultRollback(){
-		try{
+	public void transactionWithDefaultRollback() {
+		try {
 			managerWithDefaultRollback.clean();
 			managerWithDefaultRollback.insert();
 			fail();
-		}catch(TransactionExceptionWithDefaultRollback exception){
+		} catch (TransactionExceptionWithDefaultRollback exception) {
 			assertTrue(managerWithDefaultRollback.isTransactionPassedInIsActiveMethod());
 			assertTrue(managerWithDefaultRollback.isTransactionPassedInBeginMethod());
 			assertTrue(managerWithDefaultRollback.isTransactionMarkedRollback());
@@ -101,14 +101,14 @@ public class TransactionRollbackTest {
 			assertFalse(managerWithDefaultRollback.isTransactionActive());
 		}
 	}
-	
+
 	@Test
-	public void transactionWithRollback(){
-		try{
+	public void transactionWithRollback() {
+		try {
 			managerWithRollback.clean();
 			managerWithRollback.insert();
 			fail();
-		}catch(TransactionExceptionWithRollback exception){
+		} catch (TransactionExceptionWithRollback exception) {
 			assertTrue(managerWithRollback.isTransactionPassedInIsActiveMethod());
 			assertTrue(managerWithRollback.isTransactionPassedInBeginMethod());
 			assertTrue(managerWithRollback.isTransactionMarkedRollback());
@@ -119,14 +119,14 @@ public class TransactionRollbackTest {
 			assertFalse(managerWithRollback.isTransactionActive());
 		}
 	}
-	
-	@Test 
-	public void transactionWithoutRollback(){
-		try{
+
+	@Test
+	public void transactionWithoutRollback() {
+		try {
 			managerWithoutRollback.clean();
 			managerWithoutRollback.insert();
 			fail();
-		}catch(TransactionExceptionWithoutRollback exception){
+		} catch (TransactionExceptionWithoutRollback exception) {
 			assertTrue(managerWithRollback.isTransactionPassedInIsActiveMethod());
 			assertTrue(managerWithRollback.isTransactionPassedInBeginMethod());
 			assertFalse(managerWithRollback.isTransactionMarkedRollback());
@@ -62,7 +62,7 @@ public class ReflectionsTest {
 class SomeClass<T, I> {
-	public void setNumber(T t) {
+	public void setNumber(final T t) {
 	}
 }
@@ -144,7 +144,7 @@ public class StringsTest {
 		assertTrue(result.contains("Test [name=myName, lastname=myLastname, nullField=null, this"));
 	}
-	private void testEqualsGetString(String in, String expected, Object... params) {
+	private void testEqualsGetString(final String in, final String expected, final Object... params) {
 		String out = Strings.getString(in, params);
 		assertEquals(expected, out);
 	}
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
-import br.gov.frameworkdemoiselle.transaction.BasicDataSourceProxy;
+import br.gov.frameworkdemoiselle.internal.proxy.BasicDataSourceProxy;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
@@ -0,0 +1,363 @@
+package br.gov.frameworkdemoiselle.internal.proxy;
+
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collection;
+
+import org.apache.commons.dbcp.BasicDataSource;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+public class BasicDataSourceProxy extends BasicDataSource implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private ResourceBundle bundle;
+
+	private String dataSourceName;
+
+	private JDBCConfig config;
+
+	private transient BasicDataSource delegate;
+
+	public BasicDataSourceProxy(String dataSourceName, JDBCConfig config, ResourceBundle bundle) {
+		this.dataSourceName = dataSourceName;
+		this.config = config;
+		this.bundle = bundle;
+	}
+
+	private BasicDataSource getDelegate() {
+		if (this.delegate == null) {
+			BasicDataSource dataSource = new BasicDataSource();
+
+			try {
+				String driver = config.getDriverClass().get(dataSourceName);
+				String url = config.getUrl().get(dataSourceName);
+				String username = config.getUsername().get(dataSourceName);
+				String password = config.getPassword().get(dataSourceName);
+
+				dataSource.setDriverClassName(driver);
+				dataSource.setUrl(url);
+				dataSource.setUsername(username);
+				dataSource.setPassword(password);
+
+			} catch (ClassCastException cause) {
+				throw new DemoiselleException(bundle.getString("load-duplicated-configuration-failed"), cause);
+			}
+
+			delegate = dataSource;
+		}
+
+		return this.delegate;
+	}
+
+	public boolean getDefaultAutoCommit() {
+		return getDelegate().getDefaultAutoCommit();
+	}
+
+	public void setDefaultAutoCommit(boolean defaultAutoCommit) {
+		getDelegate().setDefaultAutoCommit(defaultAutoCommit);
+	}
+
+	public boolean getDefaultReadOnly() {
+		return getDelegate().getDefaultReadOnly();
+	}
+
+	public void setDefaultReadOnly(boolean defaultReadOnly) {
+		getDelegate().setDefaultReadOnly(defaultReadOnly);
+	}
+
+	public int getDefaultTransactionIsolation() {
+		return getDelegate().getDefaultTransactionIsolation();
+	}
+
+	public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
+		getDelegate().setDefaultTransactionIsolation(defaultTransactionIsolation);
+	}
+
+	public String getDefaultCatalog() {
+		return getDelegate().getDefaultCatalog();
+	}
+
+	public void setDefaultCatalog(String defaultCatalog) {
+		getDelegate().setDefaultCatalog(defaultCatalog);
+	}
+
+	public String getDriverClassName() {
+		return getDelegate().getDriverClassName();
+	}
+
+	public void setDriverClassName(String driverClassName) {
+		getDelegate().setDriverClassName(driverClassName);
+	}
+
+	public ClassLoader getDriverClassLoader() {
+		return getDelegate().getDriverClassLoader();
+	}
+
+	public void setDriverClassLoader(ClassLoader driverClassLoader) {
+		getDelegate().setDriverClassLoader(driverClassLoader);
+	}
+
+	public int getMaxActive() {
+		return getDelegate().getMaxActive();
+	}
+
+	public void setMaxActive(int maxActive) {
+		getDelegate().setMaxActive(maxActive);
+	}
+
+	public int getMaxIdle() {
+		return getDelegate().getMaxIdle();
+	}
+
+	public void setMaxIdle(int maxIdle) {
+		getDelegate().setMaxIdle(maxIdle);
+	}
+
+	public int getMinIdle() {
+		return getDelegate().getMinIdle();
+	}
+
+	public void setMinIdle(int minIdle) {
+		getDelegate().setMinIdle(minIdle);
+	}
+
+	public int getInitialSize() {
+		return getDelegate().getInitialSize();
+	}
+
+	public void setInitialSize(int initialSize) {
+		getDelegate().setInitialSize(initialSize);
+	}
+
+	public long getMaxWait() {
+		return getDelegate().getMaxWait();
+	}
+
+	public void setMaxWait(long maxWait) {
+		getDelegate().setMaxWait(maxWait);
+	}
+
+	public boolean isPoolPreparedStatements() {
+		return getDelegate().isPoolPreparedStatements();
+	}
+
+	public void setPoolPreparedStatements(boolean poolingStatements) {
+		getDelegate().setPoolPreparedStatements(poolingStatements);
+	}
+
+	public int getMaxOpenPreparedStatements() {
+		return getDelegate().getMaxOpenPreparedStatements();
+	}
+
+	public void setMaxOpenPreparedStatements(int maxOpenStatements) {
+		getDelegate().setMaxOpenPreparedStatements(maxOpenStatements);
+	}
+
+	public boolean getTestOnBorrow() {
+		return getDelegate().getTestOnBorrow();
+	}
+
+	public void setTestOnBorrow(boolean testOnBorrow) {
+		getDelegate().setTestOnBorrow(testOnBorrow);
+	}
+
+	public boolean getTestOnReturn() {
+		return getDelegate().getTestOnReturn();
+	}
+
+	public void setTestOnReturn(boolean testOnReturn) {
+		getDelegate().setTestOnReturn(testOnReturn);
+	}
+
+	public long getTimeBetweenEvictionRunsMillis() {
+		return getDelegate().getTimeBetweenEvictionRunsMillis();
+	}
+
+	public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+		getDelegate().setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+	}
+
+	public int getNumTestsPerEvictionRun() {
+		return getDelegate().getNumTestsPerEvictionRun();
+	}
+
+	public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+		getDelegate().setNumTestsPerEvictionRun(numTestsPerEvictionRun);
+	}
+
+	public long getMinEvictableIdleTimeMillis() {
+		return getDelegate().getMinEvictableIdleTimeMillis();
+	}
+
+	public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+		getDelegate().setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+	}
+
+	public boolean getTestWhileIdle() {
+		return getDelegate().getTestWhileIdle();
+	}
+
+	public void setTestWhileIdle(boolean testWhileIdle) {
+		getDelegate().setTestWhileIdle(testWhileIdle);
+	}
+
+	public int getNumActive() {
+		return getDelegate().getNumActive();
+	}
+
+	public int getNumIdle() {
+		return getDelegate().getNumIdle();
+	}
+
+	public String getPassword() {
+		return getDelegate().getPassword();
+	}
+
+	public void setPassword(String password) {
+		getDelegate().setPassword(password);
+	}
+
+	public String getUrl() {
+		return getDelegate().getUrl();
+	}
+
+	public void setUrl(String url) {
+		getDelegate().setUrl(url);
+	}
+
+	public String getUsername() {
+		return getDelegate().getUsername();
+	}
+
+	public void setUsername(String username) {
+		getDelegate().setUsername(username);
+	}
+
+	public String getValidationQuery() {
+		return getDelegate().getValidationQuery();
+	}
+
+	public void setValidationQuery(String validationQuery) {
+		getDelegate().setValidationQuery(validationQuery);
+	}
+
+	public int getValidationQueryTimeout() {
+		return getDelegate().getValidationQueryTimeout();
+	}
+
+	public void setValidationQueryTimeout(int timeout) {
+		getDelegate().setValidationQueryTimeout(timeout);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public Collection getConnectionInitSqls() {
+		return getDelegate().getConnectionInitSqls();
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setConnectionInitSqls(Collection connectionInitSqls) {
+		getDelegate().setConnectionInitSqls(connectionInitSqls);
+	}
+
+	public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
+		getDelegate().setAccessToUnderlyingConnectionAllowed(allow);
+	}
+
+	public Connection getConnection(String user, String pass) throws SQLException {
+		return getDelegate().getConnection(user, pass);
+	}
+
+	public int getLoginTimeout() throws SQLException {
+		return getDelegate().getLoginTimeout();
+	}
+
+	public PrintWriter getLogWriter() throws SQLException {
+		return getDelegate().getLogWriter();
+	}
+
+	public void setLoginTimeout(int loginTimeout) throws SQLException {
+		getDelegate().setLoginTimeout(loginTimeout);
+	}
+
+	public void setLogWriter(PrintWriter logWriter) throws SQLException {
+		getDelegate().setLogWriter(logWriter);
+	}
+
+	public boolean getRemoveAbandoned() {
+		return getDelegate().getRemoveAbandoned();
+	}
+
+	public void setRemoveAbandoned(boolean removeAbandoned) {
+		getDelegate().setRemoveAbandoned(removeAbandoned);
+	}
+
+	public int getRemoveAbandonedTimeout() {
+		return getDelegate().getRemoveAbandonedTimeout();
+	}
+
+	public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+		getDelegate().setRemoveAbandonedTimeout(removeAbandonedTimeout);
+	}
+
+	public boolean getLogAbandoned() {
+		return getDelegate().getLogAbandoned();
+	}
+
+	public void setLogAbandoned(boolean logAbandoned) {
+		getDelegate().setLogAbandoned(logAbandoned);
+	}
+
+	public void addConnectionProperty(String name, String value) {
+		getDelegate().addConnectionProperty(name, value);
+	}
+
+	public void removeConnectionProperty(String name) {
+		getDelegate().removeConnectionProperty(name);
+	}
+
+	public void setConnectionProperties(String connectionProperties) {
+		getDelegate().setConnectionProperties(connectionProperties);
+	}
+
+	public void close() throws SQLException {
+		getDelegate().close();
+	}
+
+	public boolean equals(Object arg0) {
+		return getDelegate().equals(arg0);
+	}
+
+	public Connection getConnection() throws SQLException {
+		return getDelegate().getConnection();
+	}
+
+	public int hashCode() {
+		return getDelegate().hashCode();
+	}
+
+	public boolean isAccessToUnderlyingConnectionAllowed() {
+		return getDelegate().isAccessToUnderlyingConnectionAllowed();
+	}
+
+	public boolean isClosed() {
+		return getDelegate().isClosed();
+	}
+
+	public boolean isWrapperFor(Class<?> iface) throws SQLException {
+		return getDelegate().isWrapperFor(iface);
+	}
+
+	public String toString() {
+		return getDelegate().toString();
+	}
+
+	public <T> T unwrap(Class<T> iface) throws SQLException {
+		return getDelegate().unwrap(iface);
+	}
+}
@@ -1,363 +0,0 @@
-package br.gov.frameworkdemoiselle.transaction;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collection;
-
-import org.apache.commons.dbcp.BasicDataSource;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-public class BasicDataSourceProxy extends BasicDataSource implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	private ResourceBundle bundle;
-
-	private String dataSourceName;
-
-	private JDBCConfig config;
-
-	private transient BasicDataSource delegate;
-
-	public BasicDataSourceProxy(String dataSourceName, JDBCConfig config, ResourceBundle bundle) {
-		this.dataSourceName = dataSourceName;
-		this.config = config;
-		this.bundle = bundle;
-	}
-
-	private BasicDataSource getDelegate() {
-		if (this.delegate == null) {
-			BasicDataSource dataSource = new BasicDataSource();
-
-			try {
-				String driver = config.getDriverClass().get(dataSourceName);
-				String url = config.getUrl().get(dataSourceName);
-				String username = config.getUsername().get(dataSourceName);
-				String password = config.getPassword().get(dataSourceName);
-
-				dataSource.setDriverClassName(driver);
-				dataSource.setUrl(url);
-				dataSource.setUsername(username);
-				dataSource.setPassword(password);
-
-			} catch (ClassCastException cause) {
-				throw new DemoiselleException(bundle.getString("load-duplicated-configuration-failed"), cause);
-			}
-
-			delegate = dataSource;
-		}
-
-		return this.delegate;
-	}
-
-	public boolean getDefaultAutoCommit() {
-		return getDelegate().getDefaultAutoCommit();
-	}
-
-	public void setDefaultAutoCommit(boolean defaultAutoCommit) {
-		getDelegate().setDefaultAutoCommit(defaultAutoCommit);
-	}
-
-	public boolean getDefaultReadOnly() {
-		return getDelegate().getDefaultReadOnly();
-	}
-
-	public void setDefaultReadOnly(boolean defaultReadOnly) {
-		getDelegate().setDefaultReadOnly(defaultReadOnly);
-	}
-
-	public int getDefaultTransactionIsolation() {
-		return getDelegate().getDefaultTransactionIsolation();
-	}
-
-	public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
-		getDelegate().setDefaultTransactionIsolation(defaultTransactionIsolation);
-	}
-
-	public String getDefaultCatalog() {
-		return getDelegate().getDefaultCatalog();
-	}
-
-	public void setDefaultCatalog(String defaultCatalog) {
-		getDelegate().setDefaultCatalog(defaultCatalog);
-	}
-
-	public String getDriverClassName() {
-		return getDelegate().getDriverClassName();
-	}
-
-	public void setDriverClassName(String driverClassName) {
-		getDelegate().setDriverClassName(driverClassName);
-	}
-
-	public ClassLoader getDriverClassLoader() {
-		return getDelegate().getDriverClassLoader();
-	}
-
-	public void setDriverClassLoader(ClassLoader driverClassLoader) {
-		getDelegate().setDriverClassLoader(driverClassLoader);
-	}
-
-	public int getMaxActive() {
-		return getDelegate().getMaxActive();
-	}
-
-	public void setMaxActive(int maxActive) {
-		getDelegate().setMaxActive(maxActive);
-	}
-
-	public int getMaxIdle() {
-		return getDelegate().getMaxIdle();
-	}
-
-	public void setMaxIdle(int maxIdle) {
-		getDelegate().setMaxIdle(maxIdle);
-	}
-
-	public int getMinIdle() {
-		return getDelegate().getMinIdle();
-	}
-
-	public void setMinIdle(int minIdle) {
-		getDelegate().setMinIdle(minIdle);
-	}
-
-	public int getInitialSize() {
-		return getDelegate().getInitialSize();
-	}
-
-	public void setInitialSize(int initialSize) {
-		getDelegate().setInitialSize(initialSize);
-	}
-
-	public long getMaxWait() {
-		return getDelegate().getMaxWait();
-	}
-
-	public void setMaxWait(long maxWait) {
-		getDelegate().setMaxWait(maxWait);
-	}
-
-	public boolean isPoolPreparedStatements() {
-		return getDelegate().isPoolPreparedStatements();
-	}
-
-	public void setPoolPreparedStatements(boolean poolingStatements) {
-		getDelegate().setPoolPreparedStatements(poolingStatements);
-	}
-
-	public int getMaxOpenPreparedStatements() {
-		return getDelegate().getMaxOpenPreparedStatements();
-	}
-
-	public void setMaxOpenPreparedStatements(int maxOpenStatements) {
-		getDelegate().setMaxOpenPreparedStatements(maxOpenStatements);
-	}
-
-	public boolean getTestOnBorrow() {
-		return getDelegate().getTestOnBorrow();
-	}
-
-	public void setTestOnBorrow(boolean testOnBorrow) {
-		getDelegate().setTestOnBorrow(testOnBorrow);
-	}
-
-	public boolean getTestOnReturn() {
-		return getDelegate().getTestOnReturn();
-	}
-
-	public void setTestOnReturn(boolean testOnReturn) {
-		getDelegate().setTestOnReturn(testOnReturn);
-	}
-
-	public long getTimeBetweenEvictionRunsMillis() {
-		return getDelegate().getTimeBetweenEvictionRunsMillis();
-	}
-
-	public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
-		getDelegate().setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
-	}
-
-	public int getNumTestsPerEvictionRun() {
-		return getDelegate().getNumTestsPerEvictionRun();
-	}
-
-	public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
-		getDelegate().setNumTestsPerEvictionRun(numTestsPerEvictionRun);
-	}
-
-	public long getMinEvictableIdleTimeMillis() {
-		return getDelegate().getMinEvictableIdleTimeMillis();
-	}
-
-	public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
-		getDelegate().setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
-	}
-
-	public boolean getTestWhileIdle() {
-		return getDelegate().getTestWhileIdle();
-	}
-
-	public void setTestWhileIdle(boolean testWhileIdle) {
-		getDelegate().setTestWhileIdle(testWhileIdle);
-	}
-
-	public int getNumActive() {
-		return getDelegate().getNumActive();
-	}
-
-	public int getNumIdle() {
-		return getDelegate().getNumIdle();
-	}
-
-	public String getPassword() {
-		return getDelegate().getPassword();
-	}
-
-	public void setPassword(String password) {
-		getDelegate().setPassword(password);
-	}
-
-	public String getUrl() {
-		return getDelegate().getUrl();
-	}
-
-	public void setUrl(String url) {
-		getDelegate().setUrl(url);
-	}
-
-	public String getUsername() {
-		return getDelegate().getUsername();
-	}
-
-	public void setUsername(String username) {
-		getDelegate().setUsername(username);
-	}
-
-	public String getValidationQuery() {
-		return getDelegate().getValidationQuery();
-	}
-
-	public void setValidationQuery(String validationQuery) {
-		getDelegate().setValidationQuery(validationQuery);
-	}
-
-	public int getValidationQueryTimeout() {
-		return getDelegate().getValidationQueryTimeout();
-	}
-
-	public void setValidationQueryTimeout(int timeout) {
-		getDelegate().setValidationQueryTimeout(timeout);
-	}
-
-	@SuppressWarnings("rawtypes")
-	public Collection getConnectionInitSqls() {
-		return getDelegate().getConnectionInitSqls();
-	}
-
-	@SuppressWarnings("rawtypes")
-	public void setConnectionInitSqls(Collection connectionInitSqls) {
-		getDelegate().setConnectionInitSqls(connectionInitSqls);
-	}
-
-	public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
-		getDelegate().setAccessToUnderlyingConnectionAllowed(allow);
-	}
-
-	public Connection getConnection(String user, String pass) throws SQLException {
-		return getDelegate().getConnection(user, pass);
-	}
-
-	public int getLoginTimeout() throws SQLException {
-		return getDelegate().getLoginTimeout();
-	}
-
-	public PrintWriter getLogWriter() throws SQLException {
-		return getDelegate().getLogWriter();
-	}
-
-	public void setLoginTimeout(int loginTimeout) throws SQLException {
-		getDelegate().setLoginTimeout(loginTimeout);
-	}
-
-	public void setLogWriter(PrintWriter logWriter) throws SQLException {
-		getDelegate().setLogWriter(logWriter);
-	}
-
-	public boolean getRemoveAbandoned() {
-		return getDelegate().getRemoveAbandoned();
-	}
-
-	public void setRemoveAbandoned(boolean removeAbandoned) {
-		getDelegate().setRemoveAbandoned(removeAbandoned);
-	}
-
-	public int getRemoveAbandonedTimeout() {
-		return getDelegate().getRemoveAbandonedTimeout();
-	}
-
-	public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
-		getDelegate().setRemoveAbandonedTimeout(removeAbandonedTimeout);
-	}
-
-	public boolean getLogAbandoned() {
-		return getDelegate().getLogAbandoned();
-	}
-
-	public void setLogAbandoned(boolean logAbandoned) {
-		getDelegate().setLogAbandoned(logAbandoned);
-	}
-
-	public void addConnectionProperty(String name, String value) {
-		getDelegate().addConnectionProperty(name, value);
-	}
-
-	public void removeConnectionProperty(String name) {
-		getDelegate().removeConnectionProperty(name);
-	}
-
-	public void setConnectionProperties(String connectionProperties) {
-		getDelegate().setConnectionProperties(connectionProperties);
-	}
-
-	public void close() throws SQLException {
-		getDelegate().close();
-	}
-
-	public boolean equals(Object arg0) {
-		return getDelegate().equals(arg0);
-	}
-
-	public Connection getConnection() throws SQLException {
-		return getDelegate().getConnection();
-	}
-
-	public int hashCode() {
-		return getDelegate().hashCode();
-	}
-
-	public boolean isAccessToUnderlyingConnectionAllowed() {
-		return getDelegate().isAccessToUnderlyingConnectionAllowed();
-	}
-
-	public boolean isClosed() {
-		return getDelegate().isClosed();
-	}
-
-	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		return getDelegate().isWrapperFor(iface);
-	}
-
-	public String toString() {
-		return getDelegate().toString();
-	}
-
-	public <T> T unwrap(Class<T> iface) throws SQLException {
-		return getDelegate().unwrap(iface);
-	}
-}
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.transaction;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.io.Serializable;
 import java.sql.Connection;
@@ -55,7 +55,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
  * @author SERPRO
  * @see Transaction
  */
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class JDBCTransaction implements Transaction {
 	private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.transaction;
-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
 import java.util.Collection;
@@ -53,7 +53,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
  * @author SERPRO
  * @see Transaction
  */
-@Priority(EXTENSIONS_L1_PRIORITY)
+@Priority(L2_PRIORITY)
 public class JPATransaction implements Transaction {
 	private static final long serialVersionUID = 1L;
@@ -0,0 +1,54 @@
+/*
+ * 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 br.gov.frameworkdemoiselle.annotation.Priority.L3_PRIORITY;
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.message.Message;
+import br.gov.frameworkdemoiselle.message.MessageAppender;
+import br.gov.frameworkdemoiselle.util.Faces;
+
+@Priority(L3_PRIORITY)
+public class FacesMessageAppender implements MessageAppender {
+
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	public void append(Message message) {
+		Faces.addMessage(message);
+	}
+}
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	<parent>	45	<parent>
46	<groupId>br.gov.frameworkdemoiselle</groupId>	46	<groupId>br.gov.frameworkdemoiselle</groupId>
47	<artifactId>demoiselle-documentation-parent</artifactId>	47	<artifactId>demoiselle-documentation-parent</artifactId>
48	- <version>8</version>	48	+ <version>9-SNAPSHOT</version>
49	<relativePath>../../../internal/parent/documentation</relativePath>	49	<relativePath>../../../internal/parent/documentation</relativePath>
50	</parent>	50	</parent>
51		51
	@@ -42,7 +42,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;		@@ -42,7 +42,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
42	import java.lang.annotation.Retention;	42	import java.lang.annotation.Retention;
43	import java.lang.annotation.Target;	43	import java.lang.annotation.Target;
44		44
45	-@Target(FIELD)	45	+@Target(FIELD)
46	@Retention(RUNTIME)	46	@Retention(RUNTIME)
47	public @interface Ignore {	47	public @interface Ignore {
48	}	48	}
	@@ -60,6 +60,14 @@ public @interface Priority {		@@ -60,6 +60,14 @@ public @interface Priority {
60	*/	60	*/
61	static int MIN_PRIORITY = Integer.MAX_VALUE;	61	static int MIN_PRIORITY = Integer.MAX_VALUE;
62		62
		63	+ static int L1_PRIORITY = MIN_PRIORITY;
		64	+
		65	+ static int L2_PRIORITY = L1_PRIORITY - 100;
		66	+
		67	+ static int L3_PRIORITY = L2_PRIORITY - 100;
		68	+
		69	+ static int L4_PRIORITY = L3_PRIORITY - 100;
		70	+
63	/**	71	/**
64	* An integer value defines the priority order.	72	* An integer value defines the priority order.
65	*/	73	*/
	@@ -57,5 +57,5 @@ public enum ConfigType {		@@ -57,5 +57,5 @@ public enum ConfigType {
57	* Configuration loaded on properties resources.	57	* Configuration loaded on properties resources.
58	*/	58	*/
59	PROPERTIES;	59	PROPERTIES;
60	-	60	+
61	}	61	}
	@@ -1,56 +0,0 @@	@@ -1,56 +0,0 @@
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.internal.bootstrap;
38	-
39	-import org.slf4j.Logger;
40	-
41	-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
42	-import br.gov.frameworkdemoiselle.security.Authenticator;
43	-
44	-public class AuthenticatorBootstrap extends AbstractStrategyBootstrap<Authenticator> {
45	-
46	- private Logger logger;
47	-
48	- @Override
49	- protected Logger getLogger() {
50	- if (logger == null) {
51	- logger = LoggerProducer.create(AuthenticatorBootstrap.class);
52	- }
53	-
54	- return logger;
55	- }
56	-}
	@@ -96,7 +96,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap<Configurat		@@ -96,7 +96,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap<Configurat
96	String superClassName = type.getCanonicalName();	96	String superClassName = type.getCanonicalName();
97	String chieldClassName = superClassName + "_$$_DemoiselleProxy";	97	String chieldClassName = superClassName + "_$$_DemoiselleProxy";
98		98
99	- Map<String, Class<Object>> cacheProxy = Collections.synchronizedMap(new HashMap<String, Class<Object>>());;	99	+ Map<String, Class<Object>> cacheProxy = Collections.synchronizedMap(new HashMap<String, Class<Object>>());
100		100
101	Class<Object> clazzProxy = null;	101	Class<Object> clazzProxy = null;
102		102
	@@ -139,7 +139,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap<Configurat		@@ -139,7 +139,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap<Configurat
139	@Override	139	@Override
140	protected Logger getLogger() {	140	protected Logger getLogger() {
141	if (logger == null) {	141	if (logger == null) {
142	- logger = LoggerProducer.create(TransactionBootstrap.class);	142	+ logger = LoggerProducer.create(ConfigurationBootstrap.class);
143	}	143	}
144		144
145	return logger;	145	return logger;
	@@ -1,136 +0,0 @@	@@ -1,136 +0,0 @@
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.internal.bootstrap;
38	-
39	-import java.lang.annotation.Annotation;
40	-import java.lang.reflect.Member;
41	-import java.lang.reflect.Type;
42	-import java.util.Arrays;
43	-import java.util.HashSet;
44	-import java.util.Set;
45	-
46	-import javax.enterprise.inject.spi.Annotated;
47	-import javax.enterprise.inject.spi.Bean;
48	-import javax.enterprise.inject.spi.InjectionPoint;
49	-
50	-public class CustomInjectionPoint implements InjectionPoint {
51	-
52	- private final Bean<?> bean;
53	-
54	- private final Type beanType;
55	-
56	- private final Set<Annotation> qualifiers;
57	-
58	- public CustomInjectionPoint(Bean<?> bean, Type beanType, Annotation... qualifiers) {
59	- this.bean = bean;
60	- this.beanType = beanType;
61	- this.qualifiers = new HashSet<Annotation>(Arrays.asList(qualifiers));
62	- }
63	-
64	- @Override
65	- public Type getType() {
66	- return this.beanType;
67	- }
68	-
69	- @Override
70	- public Set<Annotation> getQualifiers() {
71	- return this.qualifiers;
72	- }
73	-
74	- @Override
75	- public Bean<?> getBean() {
76	- return this.bean;
77	- }
78	-
79	- @Override
80	- public Member getMember() {
81	- return null;
82	- }
83	-
84	- @Override
85	- public boolean isDelegate() {
86	- return false;
87	- }
88	-
89	- @Override
90	- public boolean isTransient() {
91	- return false;
92	- }
93	-
94	- @Override
95	- public Annotated getAnnotated() {
96	- return new Annotated() {
97	-
98	- @Override
99	- public Type getBaseType() {
100	- // TODO Auto-generated method stub
101	- return null;
102	- }
103	-
104	- @Override
105	- public Set<Type> getTypeClosure() {
106	- // TODO Auto-generated method stub
107	- return null;
108	- }
109	-
110	- @Override
111	- @SuppressWarnings("unchecked")
112	- public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
113	- T result = null;
114	-
115	- for (Annotation annotation : getAnnotations()) {
116	- if (annotation.annotationType() == annotationType) {
117	- result = (T) annotation;
118	- break;
119	- }
120	- }
121	-
122	- return result;
123	- }
124	-
125	- @Override
126	- public Set<Annotation> getAnnotations() {
127	- return qualifiers;
128	- }
129	-
130	- @Override
131	- public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
132	- return qualifiers.contains(annotationType);
133	- }
134	- };
135	- }
136	-}
	@@ -36,7 +36,7 @@		@@ -36,7 +36,7 @@
36	*/	36	*/
37	package br.gov.frameworkdemoiselle.internal.implementation;	37	package br.gov.frameworkdemoiselle.internal.implementation;
38		38
39	-import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;	39	+import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40		40
41	import java.lang.reflect.Field;	41	import java.lang.reflect.Field;
42		42
	@@ -46,7 +46,7 @@ import org.apache.commons.configuration.DataConfiguration;		@@ -46,7 +46,7 @@ import org.apache.commons.configuration.DataConfiguration;
46	import br.gov.frameworkdemoiselle.annotation.Priority;	46	import br.gov.frameworkdemoiselle.annotation.Priority;
47	import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;	47	import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
48		48
49	-@Priority(EXTENSIONS_L1_PRIORITY)	49	+@Priority(L2_PRIORITY)
50	public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor {	50	public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor {
51		51
52	@Override	52	@Override
@@ -0,0 +1,74 @@		@@ -0,0 +1,74 @@
	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.internal.implementation;
	38	+
	39	+import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
	40	+
	41	+import javax.inject.Inject;
	42	+
	43	+import org.slf4j.Logger;
	44	+
	45	+import br.gov.frameworkdemoiselle.annotation.Priority;
	46	+import br.gov.frameworkdemoiselle.message.Message;
	47	+import br.gov.frameworkdemoiselle.message.MessageAppender;
	48	+
	49	+@Priority(L1_PRIORITY)
	50	+public class LoggerMessageAppender implements MessageAppender {
	51	+
	52	+ private static final long serialVersionUID = 1L;
	53	+
	54	+ @Inject
	55	+ private Logger logger;
	56	+
	57	+ @Override
	58	+ public void append(Message message) {
	59	+ String text = message.getText();
	60	+
	61	+ switch (message.getSeverity()) {
	62	+ case INFO:
	63	+ logger.info(text);
	64	+ break;
	65	+
	66	+ case WARN:
	67	+ logger.warn(text);
	68	+ break;
	69	+
	70	+ default:
	71	+ logger.error(text);
	72	+ }
	73	+ }
	74	+}
	@@ -61,12 +61,12 @@ public class Slf4jLoggerProxy implements Logger, Serializable {		@@ -61,12 +61,12 @@ public class Slf4jLoggerProxy implements Logger, Serializable {
61	private transient Logger delegate;	61	private transient Logger delegate;
62		62
63	private final Class<?> type;	63	private final Class<?> type;
64	-	64	+
65	private Logger getDelegate() {	65	private Logger getDelegate() {
66	- if(delegate == null) {	66	+ if (delegate == null) {
67	delegate = LoggerFactory.getLogger(type);	67	delegate = LoggerFactory.getLogger(type);
68	}	68	}
69	-	69	+
70	return delegate;	70	return delegate;
71	}	71	}
72		72