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

Dancovich
2 parents 3937ab10 66b6180f
Showing 136 changed files with 3155 additions and 3453 deletions Show diff stats
archetype/jsf-jpa/pom.xml
archetype/minimal/pom.xml
documentation/quickstart/pom.xml
documentation/reference/pom.xml
documentation/reference/pt-BR/security.xml
impl/core/pom.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Ignore.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Name.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/StaticScoped.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.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/CoreBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-archetype-parent</artifactId>
-		<version>2.4.0-BETA3-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../parent/archetype</relativePath>
 	</parent>
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-archetype-parent</artifactId>
-		<version>2.4.0-BETA3-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../parent/archetype</relativePath>
 	</parent>
@@ -40,12 +40,12 @@
 	<artifactId>demoiselle-framework-quickstart</artifactId>
 	<packaging>jdocbook</packaging>
-	<version>2.4.0-BETA3-SNAPSHOT</version>
+	<version>2.4.0-BETA4-SNAPSHOT</version>
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-documentation-parent</artifactId>
-		<version>8</version>
+		<version>9</version>
 		<relativePath>../../../internal/parent/documentation</relativePath>
 	</parent>
@@ -40,12 +40,12 @@
 	<artifactId>demoiselle-framework-reference</artifactId>
 	<packaging>jdocbook</packaging>
-	<version>2.4.0-BETA3-SNAPSHOT</version>
+	<version>2.4.0-BETA4-SNAPSHOT</version>
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-documentation-parent</artifactId>
-		<version>8</version>
+		<version>9</version>
 		<relativePath>../../../internal/parent/documentation</relativePath>
 	</parent>
@@ -20,8 +20,7 @@
     	<title>Configurando</title>
     	<para>
-    	Para um correto funcionamento da segurança no Framework Demoiselle é necessário inserir os interceptadores de segurança no arquivo <filename>beans.xml</filename>, localizado
-    	na pasta WEB-INF em projetos WEB ou na pasta META-INF em projetos SE ou EJB.
+    	Para um correto funcionamento do Demoiselle é necessário inserir os interceptadores de segurança no arquivo <filename>src/main/webapp/WEB-INF/beans.xml</filename>.
     	</para>
 		<programlisting role="XML"><![CDATA[<beans xmlns="http://java.sun.com/xml/ns/javaee" 
@@ -239,7 +238,6 @@ class GerenciadorBookmark {
 	} 
 }]]></programlisting>
-
 			<tip>
 				É possível informar mais de um papel para a anotação <code>@RequiredRole</code>, neste caso basta que o usuário
 				autenticado possua um dos papéis listados para ter acesso ao recurso.
@@ -535,8 +533,8 @@ class GerenciadorBookmark {
 	} 
 	@Override 
-	public boolean hasPermission(Object resource, String operation) { 
-		// Verifique se o usuario autenticado tem a permissao adequada, retorne true em caso positivo 
+	public boolean hasPermission(String resource, String operation) { 
+		// Escreva aqui seu codigo de verificação de permissao 
 		return false; 
 	} 
 }]]></programlisting>
@@ -612,5 +610,4 @@ class GerenciadorBookmark {
 			</tgroup>
 		</informaltable>
 	</section>
-	
-</chapter>
 \ No newline at end of file
+</chapter>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.4.0-BETA3-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../parent/framework</relativePath>
 	</parent>
@@ -72,7 +72,7 @@
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
-				<version>2.4.0-BETA3-SNAPSHOT</version>
+				<version>2.4.0-BETA4-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -98,20 +98,59 @@
 				<artifactId>cobertura-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 
-				<version>${jacoco.version}</version> <executions> <execution> <goals> <goal>prepare-agent</goal> 
-				</goals> </execution> <execution> <id>report</id> <phase>prepare-package</phase> 
-				<goals> <goal>report</goal> </goals> </execution> </executions> </plugin> -->
+			<!-- 
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			-->
 		</plugins>
-		<!-- <pluginManagement> <plugins> <plugin> <groupId>org.eclipse.m2e</groupId> 
-			<artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> <configuration> 
-			<lifecycleMappingMetadata> <pluginExecutions> <pluginExecution> <pluginExecutionFilter> 
-			<groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 
-			<versionRange>[${jacoco.version},)</versionRange> <goals> <goal>prepare-agent</goal> 
-			</goals> </pluginExecutionFilter> <action> <ignore></ignore> </action> </pluginExecution> 
-			</pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> 
-			</plugins> </pluginManagement> -->
+		<!-- 
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.jacoco</groupId>
+										<artifactId>jacoco-maven-plugin</artifactId>
+										<versionRange>[${jacoco.version},)</versionRange>
+										<goals>
+											<goal>prepare-agent</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		-->
 	</build>
 	<dependencies>
@@ -163,27 +202,44 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<!--
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- <dependency> <groupId>org.jboss.arquillian.extension</groupId> <artifactId>arquillian-jacoco</artifactId> 
-			<version>1.0.0.Alpha5</version> <scope>test</scope> </dependency> <dependency> 
-			<groupId>org.jacoco</groupId> <artifactId>org.jacoco.core</artifactId> <version>${jacoco.version}</version> 
-			<scope>test</scope> </dependency> -->
-
-		<!-- <dependency> <groupId>org.jboss.shrinkwrap.descriptors</groupId> <artifactId>shrinkwrap-descriptors-spi</artifactId> 
-			<version>2.0.0-alpha-4</version> <scope>test</scope> </dependency> -->
-
-		<!-- <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> 
-			<scope>test</scope> </dependency> -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
+			<groupId>org.jboss.arquillian.extension</groupId>
+			<artifactId>arquillian-jacoco</artifactId>
+			<version>1.0.0.Alpha5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jacoco</groupId>
+			<artifactId>org.jacoco.core</artifactId>
+			<version>${jacoco.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.jboss.shrinkwrap.descriptors</groupId>
+			<artifactId>shrinkwrap-descriptors-spi</artifactId>
+			<version>2.0.0-alpha-4</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
 	</dependencies>
 	<repositories>
@@ -42,6 +42,15 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+/**
+ * <p>
+ * Should be used only in attributes of configuration classes (those annotated with @Configuration).
+ * </p>
+ * When an attribute in a configuration class is annotated with @Ignore, that attribute is not 
+ * </br>considerated in loading of configurations.
+ * 
+ * @author SERPRO
+ */
 @Target(FIELD)
 @Retention(RUNTIME)
 public @interface Ignore {
@@ -49,6 +49,40 @@ import java.lang.annotation.Target;
 import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
+/**
+ * This annotation is used to make passible:
+ * 
+ * <ul>
+ * <li>map an attribute that belongs to a configuration class in a key with a different name of this attribute</li>
+ * <li>map a Resource Bundle object to a file with different name of this object</li>
+ * </ul>
+ * 
+ * <p>
+ * The examples below shows how these annotation could be used:
+ * <p>
+ * 
+ * <blockquote>
+ * 
+ * <pre>
+ * public class NameConfig {
+ * 
+ * 	&#064;Name("other.name.attrib")
+ *   private int nameOfAttribute;
+ *   ...
+ * }
+ * 
+ * public class NameResourceBundle {
+ * 
+ * 	&#064;Name("other.name.bundle")
+ *   &#064;Inject
+ *   private ResourceBundle bundle;
+ *   ...
+ * }
+ * </pre>
+ * </blockquote>
+ * 
+ * @author SERPRO
+ */
 @Qualifier
 @Inherited
 @Retention(RUNTIME)
@@ -44,6 +44,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 /**
+ * Used to prioritize some execution flow, as methods annoted with @startup or @shutdown
+ * 
  * @author SERPRO
  */
 @Target({ TYPE, METHOD })
@@ -59,17 +61,32 @@ public @interface Priority {
 	 * Less important priority value.
 	 */
 	static int MIN_PRIORITY = Integer.MAX_VALUE;
-
+	
+	/**
+	 * Less important priority value.
+	 */
 	static int L1_PRIORITY = MIN_PRIORITY;
+	/**
+	 * Higher priority than L1_PRIORITY
+	 */
 	static int L2_PRIORITY = L1_PRIORITY - 100;
+	/**
+	 * Higher priority than L2_PRIORITY
+	 */
 	static int L3_PRIORITY = L2_PRIORITY - 100;
+	/**
+	 * Higher priority than L3_PRIORITY
+	 */
 	static int L4_PRIORITY = L3_PRIORITY - 100;
 	/**
+	 * <p>
 	 * An integer value defines the priority order.
+	 * <p>
+	 * The lower the value, the greater priority.
 	 */
 	int value();
 }
@@ -47,6 +47,11 @@ import java.lang.annotation.Target;
 import javax.enterprise.context.NormalScope;
+/**
+ *This scope stores the classes just as if it was a static attribute.
+ * 
+ * @author SERPRO
+ */
 @Inherited
 @Target({ METHOD, TYPE, FIELD })
 @Retention(RUNTIME)
@@ -47,6 +47,11 @@ import java.lang.annotation.Target;
 import javax.enterprise.context.NormalScope;
+/**
+ * This scope maintains the context for viewed page; when the viewed page change, the data will be lost.
+ * 
+ * @author SERPRO
+ */
 @Inherited
 @Target({ METHOD, TYPE, FIELD })
 @Retention(RUNTIME)
@@ -40,9 +40,37 @@ import java.lang.reflect.Field;
 import org.apache.commons.configuration.Configuration;
+/**
+ * Interface that defining the way to extract the values of configurations attributes from property file.
+ * It should be implemented if is wanted to extract values of a configuration attribute, in a different way or 
+ * for a type not yet offered by Demoiselle Framework.
+ * 
+ * @author SERPRO
+ */
 public interface ConfigurationValueExtractor {
+	/**
+	 * Method that must appropriately extract the value from a property file and set this value to a 
+	 * field in a configuration class.
+	 * 
+	 * @param prefix
+	 * 			optional parte of property name that must be concatenated with <b>key</b> to form the whole 
+	 * 			property name.
+	 * @param key
+	 * 			key of the property.
+	 * @param field
+	 * 			configuration field to be setted.
+	 * @param configuration
+	 * 			a configuration object.
+	 */
 	Object getValue(String prefix, String key, Field field, Configuration configuration) throws Exception;
+	/**
+	 * Checks if the extractor class is appropriate to extract values to the type of deffined by parameter
+	 * <b>field</b>.
+	 * 
+	 * @param field
+	 * 			field to be checked.
+	 */
 	boolean isSupported(Field field);
 }
@@ -57,6 +57,57 @@ import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
+/**
+ * <p>
+ * Intercepts some thrown exceptions, and calls the appropriate method. These interceptor works only in
+ * classes annotated with <b>@Contoller</b>. Above we discribe which kind of exception is intercepted and 
+ * what is an appropriate method. 
+ * <p>
+ * To be interceptable, the thrown exception must be from a type which is annotated with 
+ * <b>@ApplicationException</b>.
+ * <p>
+ * An appropriate method must be annotated with <b>@ExceptionHandler</b>, and receive as parameter some 
+ * exception that could be thrown for it's class (which have to be annotated with <b>@ApplicationException</b>).
+ * So, when this method is called, it's receive the thrown exception as parameter. In the same class shouldn't 
+ * be more than one method annotated with <b>@ExceptionHandler</b> and receiving the same type of exception.
+ * <p>
+ * <p>
+ * The examples below shows how these interceptor works:
+ * <p>
+ * 
+ * <blockquote>
+ * 
+ * <pre>
+ * &#064;ApplicationException
+ * public class CustomException extends RuntimeException {
+ * }
+ * 
+ * &#064;Controller
+ * public class CustomExceptionHandler {
+ * 
+ * 	public void throwException() {
+ *		throw new CustomException();
+ *	}
+ *	
+ *	&#064;ExceptionHandler
+ *	public void handler(CustomException exception) {
+ *		...
+ *	}
+ *
+ * }
+ * </pre>
+ * </blockquote>
+ * 
+ * <p>
+ * When the method <b>throwException</b> throw a <b>CustomException</b>, once CustomException is annotated 
+ * with @ApplicationException and CustomExceptionHandle is annotated with @Controller, the interceptor will 
+ * looking for some method (in CustomExceptionHandle) annotated with @ExceptionHandle and that receive a 
+ * CustomException as parameter to call. In the case shown, the method <b>handler</b> is called when a 
+ * <b>CustomException</b> is thrown.
+ * <p>
+ * 
+ * @author SERPRO
+ */
 @Interceptor
 @Controller
 public class ExceptionHandlerInterceptor implements Serializable {
@@ -68,7 +119,7 @@ public class ExceptionHandlerInterceptor implements Serializable {
 	private static transient Logger logger;
 	private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();
-
+	
 	private boolean handleException(final Exception cause, final Object target) throws Exception {
 		getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName()));
@@ -41,7 +41,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.RequestScoped;
@@ -60,7 +59,8 @@ import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.internal.context.ContextManager;
 import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
 import br.gov.frameworkdemoiselle.internal.implementation.AnnotatedMethodProcessor;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.Reflections;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
@@ -74,16 +74,16 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 	private boolean registered = false;
-	private ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	protected abstract Logger getLogger();
-	protected ResourceBundle getBundle() {
-		if (this.bundle == null) {
-			this.bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+	protected static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
-		return this.bundle;
+		return bundle;
 	}
 	protected <T> AnnotatedMethodProcessor<T> newProcessorInstance(AnnotatedMethod<T> annotatedMethod) {
@@ -52,7 +52,6 @@ import br.gov.frameworkdemoiselle.annotation.StaticScoped;
 import br.gov.frameworkdemoiselle.internal.context.ContextManager;
 import br.gov.frameworkdemoiselle.internal.context.StaticContext;
 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.ResourceBundle;
@@ -60,7 +59,7 @@ public class CoreBootstrap implements Extension {
 	private Logger logger;
-	private ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
 	private Logger getLogger() {
 		if (this.logger == null) {
@@ -70,12 +69,12 @@ public class CoreBootstrap implements Extension {
 		return this.logger;
 	}
-	private ResourceBundle getBundle() {
-		if (this.bundle == null) {
-			this.bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
 		}
-		return this.bundle;
+		return bundle;
 	}
 	public void engineOn(@Observes final BeforeBeanDiscovery event, BeanManager beanManager) {
@@ -91,7 +90,7 @@ public class CoreBootstrap implements Extension {
 		ContextManager.activate(StaticContext.class, StaticScoped.class);
 	}
-	
+
 	public void terminateCustomContexts(@Observes final BeforeShutdown event) {
 		ContextManager.shutdown();
 	}
@@ -48,7 +48,7 @@ public class ManagementBootstrap implements Extension {
 	@SuppressWarnings("unchecked")
 	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event, BeanManager beanManager) {
-		ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+		ResourceBundle bundle = new ResourceBundleProducer().create("demoiselle-core-bundle", Locale.getDefault());
 		Management monitoringManager = Beans.getReference(Management.class);
 		for (AnnotatedType<?> type : types) {
@@ -16,7 +16,6 @@ import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.StaticScoped;
 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.ResourceBundle;
@@ -40,14 +39,14 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * 
  * @author serpro
  */
-public class ContextManager {
+public final class ContextManager {
 	private static List<CustomContextCounter> contexts = Collections
 			.synchronizedList(new ArrayList<CustomContextCounter>());
 	private static boolean initialized = false;
-	private static ResourceBundle bundle;
+	private static transient ResourceBundle bundle;
 	private static Logger logger;
@@ -217,7 +216,7 @@ public class ContextManager {
 	static ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+			bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
 		}
 		return bundle;
@@ -37,7 +37,6 @@
 package br.gov.frameworkdemoiselle.internal.implementation;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
 import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -46,9 +45,9 @@ import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.message.SeverityType;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -61,7 +60,7 @@ public class AnnotatedMethodProcessor&lt;T&gt; implements Comparable&lt;AnnotatedMethodPr
 	private AnnotatedMethod<T> annotatedMethod;
-	private ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	public AnnotatedMethodProcessor(final AnnotatedMethod<T> annotatedMethod) {
 		this.annotatedMethod = annotatedMethod;
@@ -132,9 +131,9 @@ public class AnnotatedMethodProcessor&lt;T&gt; implements Comparable&lt;AnnotatedMethodPr
 		return priority;
 	}
-	protected ResourceBundle getBundle() {
-		if (this.bundle == null) {
-			this.bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
+	protected static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
 		}
 		return bundle;
@@ -42,10 +42,11 @@ 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.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -59,7 +60,7 @@ public class DefaultAuthenticator implements Authenticator {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	/**
 	 * @see br.gov.frameworkdemoiselle.security.Authenticator#authenticate()
@@ -92,7 +93,7 @@ public class DefaultAuthenticator implements Authenticator {
 	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;
@@ -39,9 +39,10 @@ package br.gov.frameworkdemoiselle.internal.implementation;
 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;
 import br.gov.frameworkdemoiselle.security.Authorizer;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -55,7 +56,7 @@ public class DefaultAuthorizer implements Authorizer {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	@Override
 	public boolean hasRole(String role) {
@@ -74,7 +75,7 @@ public class DefaultAuthorizer implements Authorizer {
 	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;
@@ -39,9 +39,10 @@ package br.gov.frameworkdemoiselle.internal.implementation;
 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;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -55,7 +56,7 @@ public class DefaultTransaction implements Transaction {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	@Override
 	public void begin() {
@@ -94,7 +95,7 @@ public class DefaultTransaction implements Transaction {
 	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;
@@ -37,19 +37,19 @@
 package br.gov.frameworkdemoiselle.internal.implementation;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 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.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.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -61,9 +61,6 @@ public class MessageContextImpl implements Serializable, MessageContext {
 	private static final long serialVersionUID = 1L;
-	@Deprecated
-	private transient final List<Message> messages = new ArrayList<Message>();
-
 	private transient static ResourceBundle bundle;
 	private transient static Logger logger;
@@ -101,19 +98,22 @@ public class MessageContextImpl implements Serializable, MessageContext {
 	@Override
 	@Deprecated
 	public List<Message> getMessages() {
-		return messages;
+		throw new DemoiselleException(
+				"Este método não é mais suportado desde a versão 2.4.0 do Demoiselle Framework. Considere atualizar a sua aplicação ou o componente com uma nova versão que faça uso do "
+						+ MessageAppender.class.getCanonicalName() + ".");
 	}
 	@Override
 	@Deprecated
 	public void clear() {
-		getLogger().debug(getBundle().getString("cleaning-message-context"));
-		messages.clear();
+		throw new DemoiselleException(
+				"Este método não é mais suportado desde a versão 2.4.0 do Demoiselle Framework. Considere atualizar a sua aplicação ou o componente com uma nova versão que faça uso do "
+						+ MessageAppender.class.getCanonicalName() + ".");
 	}
 	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;
@@ -43,7 +43,6 @@ import javax.inject.Named;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.security.AfterLoginSuccessful;
 import br.gov.frameworkdemoiselle.security.AfterLogoutSuccessful;
 import br.gov.frameworkdemoiselle.security.AuthenticationException;
@@ -53,6 +52,7 @@ import br.gov.frameworkdemoiselle.security.NotLoggedInException;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.security.User;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
@@ -66,6 +66,8 @@ public class SecurityContextImpl implements SecurityContext {
 	private static final long serialVersionUID = 1L;
+	private transient static ResourceBundle bundle;
+
 	private Authenticator authenticator;
 	private Authorizer authorizer;
@@ -199,11 +201,18 @@ public class SecurityContextImpl implements SecurityContext {
 	public void checkLoggedIn() throws NotLoggedInException {
 		if (!isLoggedIn()) {
-			ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
-			throw new NotLoggedInException(bundle.getString("user-not-authenticated"));
+			throw new NotLoggedInException(getBundle().getString("user-not-authenticated"));
 		}
 	}
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
+		}
+
+		return bundle;
+	}
+
 	private static class EmptyUser implements Principal, Serializable {
 		private static final long serialVersionUID = 1L;
@@ -50,27 +50,19 @@ 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.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 public final class StrategySelector implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private transient static ResourceBundle bundle;
 	private StrategySelector() {
 	}
-	private static ResourceBundle getBundle() {
-		if (bundle == null) {
-			bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
-		}
-
-		return bundle;
-	}
-
 	@SuppressWarnings("unchecked")
 	public static <T> T selectInstance(Class<T> type, Collection<? extends T> options) {
@@ -162,4 +154,12 @@ public final class StrategySelector implements Serializable {
 		return result;
 	}
+
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle"));
+		}
+
+		return bundle;
+	}
 }
@@ -77,7 +77,7 @@ public class ManagedType {
 	private String description;
 	public ManagedType(Class<?> type) {
-		bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
+		bundle = new ResourceBundleProducer().create("demoiselle-core-bundle");
 		if (type == null) {
 			throw new DemoiselleException(bundle.getString("management-null-class-defined"));
@@ -36,6 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.management;
+import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -73,7 +74,9 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * @author serpro
  */
 @ApplicationScoped
-public class Management {
+public class Management implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 	@Inject
 	private Logger logger;
@@ -62,7 +62,8 @@ public class ResourceBundleProducer implements Serializable {
 	 * @param String
 	 *            baseName
 	 */
-	public static ResourceBundle create(String baseName) {
+	@Deprecated
+	public ResourceBundle create(String baseName) {
 		return create(baseName, Beans.getReference(Locale.class));
 	}
@@ -72,7 +73,8 @@ public class ResourceBundleProducer implements Serializable {
 	 * @param String
 	 *            baseName
 	 */
-	public static ResourceBundle create(String baseName, Locale locale) {
+	@Deprecated
+	public ResourceBundle create(String baseName, Locale locale) {
 		return new ResourceBundle(baseName, locale);
 	}
@@ -83,7 +85,7 @@ public class ResourceBundleProducer implements Serializable {
 	@Default
 	@Produces
 	public ResourceBundle createDefault(InjectionPoint ip) {
-		return create("messages", Beans.getReference(Locale.class));
+		return new ResourceBundle("messages", Beans.getReference(Locale.class));
 	}
 	/**
@@ -94,6 +96,6 @@ public class ResourceBundleProducer implements Serializable {
 	@Produces
 	public ResourceBundle createNamed(InjectionPoint ip) {
 		String baseName = ip.getAnnotated().getAnnotation(Name.class).value();
-		return create(baseName, Beans.getReference(Locale.class));
+		return new ResourceBundle(baseName, Beans.getReference(Locale.class));
 	}
 }
@@ -36,6 +36,11 @@
  */
 package br.gov.frameworkdemoiselle.lifecycle;
+/**
+ *  This interface represents an event that is fired when the shutdown process is finalized.
+ * 
+ * @author SERPRO
+ */
 public interface AfterShutdownProccess {
 }
@@ -36,6 +36,11 @@
  */
 package br.gov.frameworkdemoiselle.lifecycle;
+/**
+ *  This interface represents an event that is fired when the start up process is finalized.
+ * 
+ * @author SERPRO
+ */
 public interface AfterStartupProccess {
 }
@@ -40,24 +40,40 @@ package br.gov.frameworkdemoiselle.management;
  * Special notification to denote an attribute has changed values.
  * 
  * @see GenericNotification
- * 
  * @author serpro
- *
  */
 public class AttributeChangeNotification extends GenericNotification {
-	
+
 	private String attributeName;
-	
+
 	private Class<? extends Object> attributeType;
-	
+
 	private Object oldValue;
-	
+
 	private Object newValue;
-	
-	public AttributeChangeNotification(){}
-	
-	public AttributeChangeNotification(Object message, String attributeName, Class<? extends Object> attributeType, Object oldValue,
-			Object newValue) {
+
+	/**
+	 * Constructor without params.
+	 */
+	public AttributeChangeNotification() {
+	}
+
+	/**
+	 * Set all the class attibutes, according to the parameters received.
+	 * 
+	 * @param message
+	 * 			message to be displayed.
+	 * @param attributeName
+	 * 			name of the monitored attribute.
+	 * @param attributeType
+	 * 			type of the monitored attribute.
+	 * @param oldValue
+	 * 			old value of the monitored attribute.
+	 * @param newValue
+	 * 			new value for the monitored attribute.
+	 */
+	public AttributeChangeNotification(Object message, String attributeName, Class<? extends Object> attributeType,
+			Object oldValue, Object newValue) {
 		super(message);
 		this.attributeName = attributeName;
 		this.attributeType = attributeType;
@@ -65,46 +81,36 @@ public class AttributeChangeNotification extends GenericNotification {
 		this.newValue = newValue;
 	}
-
 	public String getAttributeName() {
 		return attributeName;
 	}
-	
 	public void setAttributeName(String attributeName) {
 		this.attributeName = attributeName;
 	}
-	
 	public Class<? extends Object> getAttributeType() {
 		return attributeType;
 	}
-	
 	public void setAttributeType(Class<? extends Object> attributeType) {
 		this.attributeType = attributeType;
 	}
-	
 	public Object getOldValue() {
 		return oldValue;
 	}
-	
 	public void setOldValue(Object oldValue) {
 		this.oldValue = oldValue;
 	}
-	
 	public Object getNewValue() {
 		return newValue;
 	}
-	
 	public void setNewValue(Object newValue) {
 		this.newValue = newValue;
 	}
-	
-	
 }
@@ -37,40 +37,44 @@
 package br.gov.frameworkdemoiselle.management;
 /**
- * 
  * Notification that can be sent by the {@link NotificationManager}.
  * 
  * @author serpro
- *
  */
 public class GenericNotification {
-	
+
 	private Object message;
-	
-	public GenericNotification(){
+
+	/**
+	 * Constructor without params.
+	 */
+	public GenericNotification() {
 	}
-	
+
+	/**
+	 * Constructor with message to notification.
+	 * 
+	 * @param message
+	 * 			message to notification.
+	 */
 	public GenericNotification(Object message) {
 		super();
 		this.message = message;
 	}
-
 	public Object getMessage() {
 		return message;
 	}
-	
 	public void setMessage(Object message) {
 		this.message = message;
 	}
-	
 	public Class<? extends Object> getType() {
-		if (message!=null){
+		if (message != null) {
 			return message.getClass();
 		}
-		
+
 		return null;
 	}
@@ -39,9 +39,18 @@ package br.gov.frameworkdemoiselle.message;
 import java.io.Serializable;
 /**
+ * Classes that will treat what to do with messages added to the context must implement this interface.
+ * 
  * @author SERPRO
  */
 public interface MessageAppender extends Serializable {
-
+	
+	/**
+	 * Method that must hold message in an appropriate way and in an appropriate local.
+	 * Demoiselle holds a message in a Logger or in a FacesContext, depending on the project.
+	 * 
+	 * @param message
+	 * 			message to be stored.
+	 */
 	void append(Message message);
 }
@@ -1,12 +0,0 @@
-package br.gov.frameworkdemoiselle.transaction;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-
-public class TransactionException extends DemoiselleException {
-
-	private static final long serialVersionUID = 1L;
-
-	public TransactionException(Throwable cause) {
-		super(cause);
-	}
-}
@@ -189,7 +189,7 @@ public class TransactionalInterceptor implements Serializable {
 	}
 	@RequestScoped
-	static class TransactionInfo implements Serializable {
+	public static class TransactionInfo implements Serializable {
 		private static final long serialVersionUID = 1L;
@@ -52,6 +52,14 @@ import javax.enterprise.inject.spi.InjectionPoint;
 import br.gov.frameworkdemoiselle.DemoiselleException;
+/**
+ * <p>
+ * Utilizes a {@link BeanManager}, obtained in the bootstrap process, to provide custom operations for obtaining contextual references for beans.
+ * <p>
+ * All its public methods are static.
+ * 
+ * @author SERPRO
+ */
 public final class Beans {
 	private static transient ResourceBundle bundle;
@@ -69,6 +77,20 @@ public final class Beans {
 		return manager;
 	}
+	/**
+	 * Obtains a injectble instance of a bean, which have the given required type and qualifiers, 
+     * and are available for injection in the point where this method was call. 
+	 * 
+	 * @param beanClass
+	 * 			the beanClass which instace is requested to be obtained.
+	 * @param qualifiers
+	 * 			a set of qualifiers with any quantity of elements (zero including).
+	 * @return Type
+	 * 			a instace of the injected beanClass.
+	 * @throws DemoiselleException
+	 * 			if no bean are avaliable to be injected for the given Class and qualifiers.
+	 *            
+	 */
 	public static <T> T getReference(final Class<T> beanClass, Annotation... qualifiers) {
 		T instance;
@@ -91,6 +113,18 @@ public final class Beans {
 		return instance;
 	}
+	/**
+	 * Obtains a injectble instance of a bean, which have the given required type 
+     * and are available for injection in the point where this method was call. 
+	 * 
+	 * @param beanClass
+	 * 			the beanClass which instace is requested to be obtained.
+	 * @return Type
+	 * 			a instace of the injected beanClass.
+	 * @throws DemoiselleException
+	 * 			if no bean are avaliable to be injected for the given Class.
+	 *            
+	 */
 	public static <T> T getReference(final Class<T> beanClass) {
 		T instance;
@@ -105,6 +139,18 @@ public final class Beans {
 		return instance;
 	}
+	/**
+	 * Obtains a injectble instance of a bean, which have the given EL name 
+     * and are available for injection in the point where this method was call. 
+	 * 
+	 * @param beanName
+	 * 			the EL name for the requested bean.
+	 * @return Type
+	 * 			a instace of the injected beanClass.
+	 * @throws DemoiselleException
+	 * 			if no bean are avaliable to be injected for the given bean name.
+	 *            
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T getReference(String beanName) {
 		T instance;
@@ -38,15 +38,39 @@ package br.gov.frameworkdemoiselle.util;
 import br.gov.frameworkdemoiselle.exception.ApplicationException;
+/**
+ *Class that offer tow methods that can help with manipulation of throwable exceptions. 
+ * 
+ * @author SERPRO
+ */
 public final class Exceptions {
+	/**
+	 * Constructor without parameters.
+	 */
 	private Exceptions() {
 	}
+	/**
+	 * Informs if a Throwable class is annotated with @ApplicationException or not.
+	 * 
+	 * @param throwable
+	 * 			a throwable object.
+	 *      
+	 * @return a boolean, true if thowable is annotated with @ApplicationException, and false otherwise.          
+	 */
 	public static boolean isApplicationException(final Throwable throwable) {
 		return throwable != null && throwable.getClass().isAnnotationPresent(ApplicationException.class);
 	}
+	/**
+	 * Receives as parameter any kind of Throwable objects, and throws a RuntimeException instead. 
+	 * 
+	 * @param throwable
+	 * 			a throwable object.
+	 *    
+	 * @throws RuntimeException throws this kind of exception every time that is called.             
+	 */
 	public static void handleToRuntimeException(final Throwable throwable) throws RuntimeException {
 		if (throwable instanceof RuntimeException) {
 			throw (RuntimeException) throwable;
@@ -40,6 +40,15 @@ import javax.enterprise.util.AnnotationLiteral;
 import br.gov.frameworkdemoiselle.annotation.Name;
+/**
+ * Creates a instance of an java annotation, specifically for qualification @Name. 
+ * This is required to get some classes by calling Beans.getReference method.
+ * 
+ * @see Beans
+ * @see Name
+ * 
+ * @author SERPRO
+ */
 @SuppressWarnings("all")
 public class NameQualifier extends AnnotationLiteral<Name> implements Name {
@@ -47,6 +56,12 @@ public class NameQualifier extends AnnotationLiteral&lt;Name&gt; implements Name {
 	private final String value;
+	/**
+	 * Constructor with string value of name qualifier.
+	 * 
+	 * @param value
+	 * 			value of name qualifier.
+	 */
 	public NameQualifier(String value) {
 		this.value = value;
 	}
@@ -47,11 +47,19 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+/**
+ * Provides some features to do some operations relating to java reflection.
+ * 
+ * @author SERPRO
+ */
 public final class Reflections {
 	private Reflections() {
 	}
+	/**
+	 * TODO 
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Class<T> getGenericTypeArgument(final Class<?> clazz, final int idx) {
 		final Type type = clazz.getGenericSuperclass();
@@ -66,6 +74,9 @@ public final class Reflections {
 		return (Class<T>) paramType.getActualTypeArguments()[idx];
 	}
+	/**
+	 * TODO 
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Class<T> getGenericTypeArgument(final Field field, final int idx) {
 		final Type type = field.getGenericType();
@@ -74,6 +85,9 @@ public final class Reflections {
 		return (Class<T>) paramType.getActualTypeArguments()[idx];
 	}
+	/**
+	 * TODO 
+	 */
 	public static <T> Class<T> getGenericTypeArgument(final Member member, final int idx) {
 		Class<T> result = null;
@@ -86,11 +100,23 @@ public final class Reflections {
 		return result;
 	}
+	/**
+	 * TODO 
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Class<T> getGenericTypeArgument(final Method method, final int pos) {
 		return (Class<T>) method.getGenericParameterTypes()[pos];
 	}
+	/**
+	 * Returns the value contained in the given field. 
+	 * 
+	 * @param field
+	 * 			field to be extracted the value.
+	 * @param object
+	 * 			object that contains the field.
+	 * @return value of the field.
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T getFieldValue(Field field, Object object) {
 		T result = null;
@@ -108,6 +134,16 @@ public final class Reflections {
 		return result;
 	}
+	/**
+	 * Sets a value in a field.
+	 * 
+	 * @param field
+	 * 			field to be setted.
+	 * @param object
+	 * 			object that contains the field.
+	 * @param value
+	 * 			value to be setted in the field.
+	 */
 	public static void setFieldValue(Field field, Object object, Object value) {
 		try {
 			boolean acessible = field.isAccessible();
@@ -120,6 +156,9 @@ public final class Reflections {
 		}
 	}
+	/**
+	 * TODO 
+	 */
 	public static Field[] getNonStaticDeclaredFields(Class<?> type) {
 		List<Field> fields = new ArrayList<Field>();
@@ -134,6 +173,9 @@ public final class Reflections {
 		return fields.toArray(new Field[0]);
 	}
+	/**
+	 * TODO 
+	 */
 	public static List<Field> getNonStaticFields(Class<?> type) {
 		List<Field> fields = new ArrayList<Field>();
@@ -145,10 +187,13 @@ public final class Reflections {
 		return fields;
 	}
-	public static <T> T instantiate(Class<T> clasz) {
+	/**
+	 * TODO 
+	 */
+	public static <T> T instantiate(Class<T> clazz) {
 		T object = null;
 		try {
-			object = clasz.newInstance();
+			object = clazz.newInstance();
 		} catch (InstantiationException e) {
 			Exceptions.handleToRuntimeException(e);
 		} catch (IllegalAccessException e) {
@@ -157,14 +202,40 @@ public final class Reflections {
 		return object;
 	}
+	/**
+	 * Verifies if a given class could be converted to a given type. 
+	 * 
+	 * @param clazz
+	 * 			class to be checked.
+	 * @param type
+	 * 			type to be checked.
+	 * @return {@link Boolean}
+	 * 			true if the given class can be converted to a given type, and false otherwise.
+	 */
 	public static boolean isOfType(Class<?> clazz, Class<?> type) {
 		return type.isAssignableFrom(clazz) && clazz != type;
 	}
+	/**
+	 * Obtains the {@link ClassLoader} for the given class, from his canonical name.
+	 * 
+	 * @param canonicalName
+	 * 			canonical name of the the given class.
+	 * @return {@link ClassLoader}
+	 * 			ClassLoader for the given class.
+	 */
 	public static ClassLoader getClassLoaderForClass(final String canonicalName) {
 		return Reflections.getClassLoaderForResource(canonicalName.replaceAll("\\.", "/") + ".class");
 	}
+	/**
+	 * Obtains the {@link ClassLoader} for the given resource.
+	 * 
+	 * @param resource
+	 * 			
+	 * @return {@link ClassLoader}
+	 * 			ClassLoader for the given resource.
+	 */
 	public static ClassLoader getClassLoaderForResource(final String resource) {
 		final String stripped = resource.charAt(0) == '/' ? resource.substring(1) : resource;
@@ -187,11 +258,17 @@ public final class Reflections {
 		return result;
 	}
+	/**
+	 * TODO 
+	 */
 	public static URL getResourceAsURL(final String resource) {
 		ClassLoader classLoader = getClassLoaderForResource(resource);
 		return classLoader != null ? classLoader.getResource(resource) : null;
 	}
+	/**
+	 * TODO 
+	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Class<T> forName(final String className) throws ClassNotFoundException {
 		ClassLoader classLoader = getClassLoaderForClass(className);
@@ -43,6 +43,12 @@ import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.Set;
+/**
+ * The Demoiselle's ResourceBundle extends the abstraction java.util.ResourceBundle, 
+ * and provide the locale and the base name for the bundle.
+ * 
+ * @author SERPRO
+ */
 public class ResourceBundle extends java.util.ResourceBundle implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -67,6 +73,15 @@ public class ResourceBundle extends java.util.ResourceBundle implements Serializ
 		return delegate;
 	}
+	/**
+	 * Constructor that set values of baseName and locale.
+	 * 
+	 * @param baseName
+	 * 			the base name to construct the complete bundle name.
+	 * 
+	 * @param locale
+	 * 			locale to define the choosen bundle.
+	 */
 	public ResourceBundle(String baseName, Locale locale) {
 		this.baseName = baseName;
 		this.locale = locale;
@@ -43,15 +43,41 @@ import java.util.regex.Pattern;
 import br.gov.frameworkdemoiselle.annotation.Ignore;
+/**
+ * Contain a set of methods that implements a set of functionalities that envolves manipulation of strings.
+ * 
+ * @author SERPRO
+ */
 public final class Strings {
 	private Strings() {
 	}
+	/**
+	 * Returns if some string matches with the format of a ResourceBundle key or not.
+	 * 
+	 * @param key
+	 * 			string to check if matches with key format of ResourceBundle.
+	 * 
+	 * @return boolean
+	 * 			true if matches and false otherwise.
+	 */
 	public static boolean isResourceBundleKeyFormat(final String key) {
 		return Pattern.matches("^\\{(.+)\\}$", key == null ? "" : key);
 	}
+	/**
+	 * Removes specific characteres from a given string.
+	 * 
+	 * @param string
+	 * 			string to be changed, by the removing of some characters.
+	 * 
+	 * @param chars
+	 * 			characters to be removed from string.
+	 * 
+	 * @return String
+	 * 			returns the given string without the given characters. 
+	 */
 	public static String removeChars(String string, char... chars) {
 		String result = string;
@@ -63,6 +89,20 @@ public final class Strings {
 		return result;
 	}
+	/**
+	 * Inserts the character "0" in the begin of a given string. The quantity of zeros that will be placed 
+	 * depends on the difference between the length of the given string and the value of howMuchZeros.
+	 * 
+	 * @param string
+	 * 			string to insert zeros characthers.
+	 * 
+	 * @param howMuchZeros
+	 * 			its controls how much zeros will be insert.  
+	 * 
+	 * @return String
+	 * 			Retuns the string, added with appropriate number of zeros.
+	 * 			For exemplo, if string = "yes" and howMuchZeros = 5, the returned string will be "00yes".
+	 */
 	public static String insertZeros(String string, int howMuchZeros) {
 		StringBuffer result = new StringBuffer((string == null ? "" : string).trim());
 		int difference = howMuchZeros - result.toString().length();
@@ -74,6 +114,22 @@ public final class Strings {
 		return result.toString();
 	}
+	/**
+	 * <p>
+	 * Replaces the numbers between braces in the given string with the given parameters. 
+	 * The process will replace a number between braces for the parameter for which its order
+	 * in the set of parameters matches with the number of the given string.   
+	 * <p>
+	 * For exemple, if is received the following string "Treats an {0} exception" and the set of parameters 
+	 * {"DemoiselleException"}, the return will be the following string: "Treats an DemoiselleException exception". 
+	 * 
+	 * @param string 
+	 * 			with the numbers with braces to be replaced with the parameters.
+	 * @param params
+	 * 			parameters that will replace the number with braces in the given string.
+	 * @return String
+	 * 			string with numbers replaced with the matching parameter.
+	 */
 	public static String getString(final String string, final Object... params) {
 		String result = null;
@@ -92,10 +148,28 @@ public final class Strings {
 		return result;
 	}
+	/**
+	 * Verifies if a given string is empty or null.
+	 * 
+	 * @param string
+	 * 			string to be verified.	
+	 * 
+	 * @return boolean
+	 * 		returns true if the given string is empty or null and returns false otherwise.
+	 */
 	public static boolean isEmpty(String string) {
 		return string == null || string.trim().isEmpty();
 	}
+	/**
+	 * Converts any object to string. 
+	 * 
+	 * @param object
+	 * 			object to be converted.
+	 * 
+	 * @return String
+	 * 			the given object converted to string.
+	 */
 	public static String toString(Object object) {
 		StringBuffer result = new StringBuffer();
 		Object fieldValue;
@@ -127,6 +201,16 @@ public final class Strings {
 		return result.toString();
 	}
+	/**
+	 * Replace the camel case string for a lowercase string separated for a given symbol. 
+	 * 
+	 * @param string
+	 * 			string that separeted with camel case.
+	 * @param symbol
+	 * 			simbol to be the new separator for the given string.
+	 * @return String
+	 * 			the given string separated with the given symbol.
+	 */
 	public static String camelCaseToSymbolSeparated(String string, String symbol) {
 		if (symbol == null) {
 			symbol = "";
@@ -135,6 +219,14 @@ public final class Strings {
 		return string == null ? null : string.replaceAll("\\B([A-Z])", symbol + "$1").toLowerCase();
 	}
+	/**
+	 * Sets the first character of a given string to upper case. 
+	 * 
+	 * @param string
+	 * 			
+	 * @return String
+	 * 			the given string with the first character setted to upper case.
+	 */
 	public static String firstToUpper(String string) {
 		String result = string;
@@ -145,6 +237,14 @@ public final class Strings {
 		return result;
 	}
+	/**
+	 * Removes braces from a given string. 
+	 * 
+	 * @param string
+	 * 
+	 * @return String
+	 * 			the given string without braces.
+	 */
 	public static String removeBraces(String string) {
 		String result = string;
@@ -155,6 +255,14 @@ public final class Strings {
 		return result;
 	}
+	/**
+	 * Inserts braces in a given string. 
+	 * 
+	 * @param string
+	 * 
+	 * @return String
+	 * 			the given string with braces.
+	 */
 	public static String insertBraces(String string) {
 		String result = string;
@@ -87,7 +87,6 @@ for= \ para\:
 file-not-found=O arquivo {0} n\u00E3o foi encontrado
 adding-message-to-context=Adicionando uma mensagem no contexto: [{0}]
-cleaning-message-context=Limpando o contexto de mensagens
 access-checking=Verificando permiss\u00E3o do usu\u00E1rio {0} para executar a a\u00E7\u00E3o {1} no recurso {2}
 access-allowed=O usu\u00E1rio {0} acessou o recurso {2} com a a\u00E7\u00E3o {1}
 access-denied=O usu\u00E1rio {0} n\u00E3o possui permiss\u00E3o para executar a a\u00E7\u00E3o {1} no recurso {2}
@@ -44,6 +44,7 @@ import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -99,6 +100,7 @@ public class ExceptionHandlerTest {
 		assertEquals(false, exceptionHandler.isArithmeticExceptionHandler());
 	}
+	@Ignore
 	@Test
 	public void exceptionWithMultiHandler() {
 		multiExceptionHandler.throwIllegalArgumentException();
@@ -0,0 +1,83 @@
+/*
+ * 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 logger;
+
+import static junit.framework.Assert.assertTrue;
+
+import javax.inject.Inject;
+
+import logger.appender.LoggerMemory;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+
+import test.Tests;
+
+@RunWith(Arquillian.class)
+public class LoggerTest {
+
+	private static final String LOGGER_MESSAGE = "Testing log4j proxy";
+
+	@Inject
+	private Logger logger;
+
+	@Inject
+	private LoggerMemory loggerMemory;
+
+	@Deployment
+	public static JavaArchive createDeployment() {
+
+		JavaArchive deployment = Tests.createDeployment(LoggerTest.class);
+
+		return deployment;
+		
+	}
+
+	@Test
+	public void testLoggerProducer() {
+
+		logger.info(LOGGER_MESSAGE);
+
+		assertTrue(loggerMemory.checkMessage(LOGGER_MESSAGE));
+
+	}
+
+}
@@ -0,0 +1,56 @@
+package logger.appender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+
+public class LoggerMemory {
+
+	@Inject
+	private Logger logger;
+	
+	private static List<String> messages = new ArrayList<String>();
+
+	public boolean checkMessage(String loggerMessage) {
+
+		logger.info("Verificando a mensagem [" + loggerMessage + "]");
+		this.showMessages();
+		
+		for (String mensagem : messages) {
+
+			if (mensagem.equals(loggerMessage)) {
+				
+				logger.info("Mensagem encontrada");
+				return true;
+				
+			}
+
+		}
+
+		logger.info("Mensagem não encontrada");
+		return false;
+
+	}
+
+	private void showMessages() {
+		
+		logger.debug("Inicio da listagem de mensagens armazenadas...");		
+		for (String message : messages) {
+			
+			logger.debug("\"" + message + "\"");
+			
+		}		
+		logger.debug("Fim da listagem de mensagens armazenadas...");
+		
+	}
+
+	public static void addMessage(String mensagem) {
+
+		messages.add(mensagem);
+
+	}
+
+}
@@ -0,0 +1,28 @@
+package logger.appender;
+
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.spi.LoggingEvent;
+
+public class MemoryAppender extends AppenderSkeleton {
+
+	@Override
+	public void close() {
+	}
+
+	@Override
+	public boolean requiresLayout() {
+		return false;
+	}
+
+	@Override
+	protected void append(LoggingEvent loggingEvent) {
+		
+		if (!LoggerMemory.class.getName().equals(loggingEvent.getLoggerName())) {
+			
+			LoggerMemory.addMessage(loggingEvent.getMessage().toString());
+			
+		}
+		
+	}
+	
+}
@@ -53,7 +53,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import test.LocaleProducer;
+import test.Tests;
 //TODO O arquillian está com um problema onde, embora os testes rodem todos individualmente,
 //ao pedir para rodar todos este teste individual causa todos os testes executados após esse
@@ -70,9 +70,9 @@ public class AnnotationTestCase {
 	public static JavaArchive createWrongAnnotationDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
@@ -55,7 +55,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import test.LocaleProducer;
+import test.Tests;
 import br.gov.frameworkdemoiselle.internal.management.ManagedType;
 import br.gov.frameworkdemoiselle.lifecycle.ManagementExtension;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -72,11 +72,11 @@ public class ManagementBootstrapTestCase {
 	public static JavaArchive createDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
 				.addAsResource(
 						new FileAsset(new File(
-								"src/test/resources/test/beans.xml")),
+								"src/test/resources/beans.xml")),
 						"beans.xml")
 				.addAsManifestResource(
 						new File(
@@ -53,7 +53,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import test.LocaleProducer;
+import test.Tests;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -70,18 +70,15 @@ public class ManagementTestCase {
 	public static JavaArchive createMultithreadedDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
 				.addPackages(false, ManagementTestCase.class.getPackage())
-				.addClasses(DummyManagementExtension.class
-						, DummyManagedClass.class
-						, ManagedClassStore.class
-						, RequestScopeBeanClient.class
-						, RequestScopedClass.class);
+				.addClasses(DummyManagementExtension.class, DummyManagedClass.class, ManagedClassStore.class,
+						RequestScopeBeanClient.class, RequestScopedClass.class);
 	}
 	@Test
@@ -167,32 +164,31 @@ public class ManagementTestCase {
 		}
 	}
-	
+
 	@Test
-	public void testAccessLevelControl(){
-		//tentamos escrever em uma propriedade que, apesar de ter método setter, está marcada como read-only.
+	public void testAccessLevelControl() {
+		// tentamos escrever em uma propriedade que, apesar de ter método setter, está marcada como read-only.
 		ManagedClassStore store = Beans.getReference(ManagedClassStore.class);
-		
-		try{
-			store.setProperty(DummyManagedClass.class, "readOnlyPropertyWithSetMethod","A Value");
+
+		try {
+			store.setProperty(DummyManagedClass.class, "readOnlyPropertyWithSetMethod", "A Value");
 			Assert.fail();
-		}
-		catch(DemoiselleException de){
+		} catch (DemoiselleException de) {
 			System.out.println(de.getMessage());
-			//success
+			// success
 		}
 	}
-	
+
 	@Test
 	public void testRequestScopedOperation() {
 		ManagedClassStore store = Beans.getReference(ManagedClassStore.class);
-		
-		//Esta operação faz multiplos acessos a um bean RequestScoped. Durante a operação todos os acessos devem
-		//operar sob a mesma instância, mas uma segunda invocação deve operar em uma instância nova
+
+		// Esta operação faz multiplos acessos a um bean RequestScoped. Durante a operação todos os acessos devem
+		// operar sob a mesma instância, mas uma segunda invocação deve operar em uma instância nova
 		Object info = store.invoke(DummyManagedClass.class, "requestScopedOperation");
 		Assert.assertEquals("-OPERATION ONE CALLED--OPERATION TWO CALLED-", info);
-		
-		//Segunda invocação para testar se uma nova instância é criada, já que esse é um novo request.
+
+		// Segunda invocação para testar se uma nova instância é criada, já que esse é um novo request.
 		info = store.invoke(DummyManagedClass.class, "requestScopedOperation");
 		Assert.assertEquals("-OPERATION ONE CALLED--OPERATION TWO CALLED-", info);
 	}
@@ -52,7 +52,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import test.LocaleProducer;
+import test.Tests;
 import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.internal.management.ManagedType;
 import br.gov.frameworkdemoiselle.internal.management.Management;
@@ -63,74 +63,74 @@ import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
- * Test the {@link NotificationManager} with a dummy extension
- * to check if notifications are correctly propagated
+ * Test the {@link NotificationManager} with a dummy extension to check if notifications are correctly propagated
  * 
  * @author serpro
- *
  */
 @RunWith(Arquillian.class)
 public class NotificationTestCase {
-	
+
 	@Inject
 	private NotificationManager manager;
-	
+
 	@Inject
 	@Name("demoiselle-core-bundle")
 	private ResourceBundle bundle;
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
 				.addPackages(false, NotificationTestCase.class.getPackage())
-				.addClasses(DummyNotificationListener.class,DummyManagedClass.class);
+				.addClasses(DummyNotificationListener.class, DummyManagedClass.class);
 	}
-	
+
 	/**
 	 * Test sending a normal notification
 	 */
 	@Test
-	public void testSendGenericNotification(){
+	public void testSendGenericNotification() {
 		manager.sendNotification(new GenericNotification("Test Message"));
 		DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class);
 		Assert.assertEquals("Test Message", listener.getMessage());
 	}
-	
+
 	/**
 	 * Test sending a notification of change in attribute
 	 */
 	@Test
-	public void testSendAttributeChangeNotification(){
-		manager.sendNotification(new AttributeChangeNotification("Test Message", "attribute", String.class, "old", "new"));
+	public void testSendAttributeChangeNotification() {
+		manager.sendNotification(new AttributeChangeNotification("Test Message", "attribute", String.class, "old",
+				"new"));
 		DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class);
 		Assert.assertEquals("Test Message - attribute", listener.getMessage());
 	}
-	
+
 	/**
-	 * Test if notifications are automatically sent when an attribute from a managed
-	 * class change values 
+	 * Test if notifications are automatically sent when an attribute from a managed class change values
 	 */
 	@Test
-	public void testNotifyChangeManagedClass(){
+	public void testNotifyChangeManagedClass() {
 		Management manager = Beans.getReference(Management.class);
-		
-		for (ManagedType type : manager.getManagedTypes()){
-			if (type.getType().equals(DummyManagedClass.class)){
+
+		for (ManagedType type : manager.getManagedTypes()) {
+			if (type.getType().equals(DummyManagedClass.class)) {
 				manager.setProperty(type, "id", new Integer(10));
 				break;
 			}
 		}
-		
+
 		DummyNotificationListener listener = Beans.getReference(DummyNotificationListener.class);
-		Assert.assertEquals( bundle.getString("management-notification-attribute-changed","id",DummyManagedClass.class.getCanonicalName()) + " - id"
-				, listener.getMessage());
+		Assert.assertEquals(
+				bundle.getString("management-notification-attribute-changed", "id",
+						DummyManagedClass.class.getCanonicalName())
+						+ " - id", listener.getMessage());
 	}
 }
@@ -17,7 +17,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import test.LocaleProducer;
+import test.Tests;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -28,18 +28,15 @@ public class ValidationTestCase {
 	public static JavaArchive createDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
-				.addAsResource(new FileAsset(new File("src/test/resources/test/beans.xml")), "beans.xml")
+				.addAsResource(new FileAsset(new File("src/test/resources/beans.xml")), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension")
 				.addPackages(false, NotificationTestCase.class.getPackage())
-				.addClasses(DummyManagementExtension.class
-						, ManagedClassStore.class
-						, DummyManagedClass.class
-						, DummyValidator.class
-						, DummyValidatorAnnotation.class);
+				.addClasses(DummyManagementExtension.class, ManagedClassStore.class, DummyManagedClass.class,
+						DummyValidator.class, DummyValidatorAnnotation.class);
 	}
 	/**
@@ -87,7 +84,7 @@ public class ValidationTestCase {
 			Assert.fail();
 		} catch (DemoiselleException e) {
-			Assert.assertTrue( e.getMessage().contains("Test Message") );
+			Assert.assertTrue(e.getMessage().contains("Test Message"));
 		}
 	}
@@ -0,0 +1,132 @@
+/*
+ * 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 template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.template.Crud;
+
+@RequestScoped
+public class CrudImpl implements Crud<DummyEntity, Long> {
+
+	private static final long serialVersionUID = 1L;
+
+	private List<DummyEntity> entities;
+
+	public CrudImpl() {
+
+		super();
+
+		this.entities = new ArrayList<DummyEntity>();
+
+	}
+
+	public void resetEntities() {
+
+		this.entities.clear();
+
+		this.entities.add(new DummyEntity(1L, "Dummy1 Label 1"));
+		this.entities.add(new DummyEntity(2L, "Dummy1 Label 2"));
+		this.entities.add(new DummyEntity(3L, "Dummy1 Label 3"));
+		this.entities.add(new DummyEntity(4L, "Dummy1 Label 4"));
+		this.entities.add(new DummyEntity(5L, "Dummy1 Label 5"));
+		this.entities.add(new DummyEntity(6L, "Dummy1 Label 6"));
+		this.entities.add(new DummyEntity(7L, "Dummy1 Label 7"));
+		this.entities.add(new DummyEntity(8L, "Dummy1 Label 8"));
+		this.entities.add(new DummyEntity(9L, "Dummy1 Label 9"));
+		this.entities.add(new DummyEntity(10L, "Dummy1 Label 10"));
+
+	}
+
+	@Override
+	public void delete(Long id) {
+
+		this.entities.remove(this.load(id));
+
+	}
+
+	@Override
+	public List<DummyEntity> findAll() {
+
+		return this.entities;
+
+	}
+
+	@Override
+	public DummyEntity insert(DummyEntity bean) {
+
+		if (this.entities.add(bean)) {
+			return bean;
+		} else {
+			throw new DemoiselleException("Erro ao inserir entity");
+		}
+
+	}
+
+	@Override
+	public DummyEntity load(Long id) {
+
+		for (DummyEntity dummyEntity : this.entities) {
+
+			if (dummyEntity.getId().equals(id)) {
+
+				return dummyEntity;
+
+			}
+
+		}
+
+		return null;
+
+	}
+
+	@Override
+	public DummyEntity update(DummyEntity bean) {
+
+		DummyEntity dummyEntity = this.load(bean.getId());
+
+		dummyEntity.setName(bean.getName());
+
+		return dummyEntity;
+
+	}
+
+}
@@ -0,0 +1,100 @@
+/*
+ * 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 template;
+
+public class DummyEntity {
+	
+	private Long id;
+	private String name;
+	
+	public DummyEntity(Long id, String name) {
+		
+		super();
+		
+		this.id = id;
+		this.name = name;
+		
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.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;
+		DummyEntity other = (DummyEntity) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
+
+}
@@ -0,0 +1,11 @@
+package template;
+
+import br.gov.frameworkdemoiselle.stereotype.BusinessController;
+import br.gov.frameworkdemoiselle.template.DelegateCrud;
+
+@BusinessController
+public class TemplateDelegateCrud extends DelegateCrud<DummyEntity, Long, CrudImpl>{
+
+	private static final long serialVersionUID = 1L;
+
+}
@@ -0,0 +1,156 @@
+/*
+ * 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 template;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+import br.gov.frameworkdemoiselle.internal.context.ContextManager;
+import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
+
+@RunWith(Arquillian.class)
+public class TemplateTest {
+
+	private static final String DUMMY_NAME = "Dummy De Meu Deus";
+	private static final Long INSERT_ID = 15L;
+	private static final Long VALID_ID = 1L;
+
+	@Inject
+	private TemplateDelegateCrud templateBC;
+
+	@Inject
+	private CrudImpl crudImpl;
+
+	@Deployment
+	public static JavaArchive createDeployment() {
+
+		JavaArchive deployment = Tests.createDeployment(TemplateTest.class);
+
+		return deployment;
+
+	}
+
+	@Before
+	public void initialize() {
+
+		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		
+		this.crudImpl.resetEntities();
+
+	}
+
+	@After
+	public void finalize() {
+
+		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		
+	}
+
+	@Test
+	public void testInsert() {
+
+		assertNull(this.crudImpl.load(INSERT_ID));
+		
+		this.templateBC.insert(new DummyEntity(INSERT_ID, DUMMY_NAME));
+		
+		assertNotNull(this.crudImpl.load(INSERT_ID));
+		
+	}
+
+	@Test
+	public void testRemove() {
+
+		assertNotNull(this.crudImpl.load(VALID_ID));
+		
+		this.templateBC.delete(VALID_ID);
+		
+		assertNull(this.crudImpl.load(VALID_ID));
+		
+	}
+
+	@Test
+	public void testFindAll() {
+
+		List<DummyEntity> listImpl = this.crudImpl.findAll();
+		List<DummyEntity> listDelegate = this.templateBC.findAll();
+		
+		assertEquals(listImpl, listDelegate);
+		
+	}
+
+	@Test
+	public void testLoad() {
+
+		DummyEntity dummyEntityImpl = this.crudImpl.load(VALID_ID);
+		DummyEntity dummyEntityDelegate = this.templateBC.load(VALID_ID);
+		
+		assertEquals(dummyEntityImpl, dummyEntityDelegate);
+		
+	}
+
+	@Test
+	public void testUpdate() {
+
+		DummyEntity dummyEntity = this.crudImpl.load(VALID_ID);
+		
+		assertFalse(DUMMY_NAME.equals(dummyEntity.getName()));
+		
+		dummyEntity.setName(DUMMY_NAME);
+		
+		this.templateBC.update(dummyEntity);
+		
+		assertEquals(this.crudImpl.load(VALID_ID).getName(), DUMMY_NAME);
+		
+	}
+	
+}
@@ -1,51 +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 test;
-
-import java.util.Locale;
-
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-
-public class LocaleProducer {
-
-	@Default
-	@Produces
-	public Locale create() {
-		return Locale.getDefault();
-	}
-}
@@ -34,18 +34,24 @@
  * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
+
 package test;
 import java.io.File;
+import java.util.Locale;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
+import org.junit.Ignore;
+@Ignore
 public final class Tests {
-	public Tests() {
+	private Tests() {
 	}
 	public static JavaArchive createDeployment(final Class<?> baseClass) {
@@ -55,9 +61,9 @@ public final class Tests {
 	public static JavaArchive createDeployment() {
 		return ShrinkWrap
 				.create(JavaArchive.class)
-				.addClass(LocaleProducer.class)
+				.addClass(Tests.class)
 				.addPackages(true, "br")
-				.addAsResource(Tests.createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
+				.addAsResource(Tests.createFileAsset("src/test/resources/beans.xml"), "beans.xml")
 				.addAsManifestResource(
 						new File("src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension"),
 						"services/javax.enterprise.inject.spi.Extension");
@@ -66,8 +72,10 @@ public final class Tests {
 	public static FileAsset createFileAsset(final String pathname) {
 		return new FileAsset(new File(pathname));
 	}
-	
-	@Test
-	public void test(){
+
+	@Default
+	@Produces
+	public Locale create() {
+		return Locale.getDefault();
 	}
 }
@@ -37,61 +37,21 @@
 package util;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import java.util.Enumeration;
 import java.util.Locale;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
-@Ignore
 public class ResourceBundleTest {
-	/**
-	 * This is a workaround to mock java.util.ResourceBundle. Since getString(key) method is defined as final, there is
-	 * no way to extend and override it. For that reason, setting expectations (i.e. expect(...)) won't work.
-	 */
 	private ResourceBundle resourceBundle;
 	@Before
 	public void setUp() throws Exception {
-		resourceBundle = new ResourceBundle("resource-bundle", new Locale("pt"));
-	}
-
-	@Test
-	public void containsKey() {
-		assertTrue(resourceBundle.containsKey("msgWithoutParams"));
-
-		assertFalse(resourceBundle.containsKey("inexistentKey"));
-	}
-
-	@Test
-	public void getKeys() {
-		int keyCount = 0;
-
-		Enumeration<String> e = resourceBundle.getKeys();
-
-		while (e.hasMoreElements()) {
-			keyCount++;
-			e.nextElement();
-		}
-
-		assertEquals(resourceBundle.keySet().size(), keyCount);
-	}
-
-	@Test
-	public void testGetLocale() {
-		assertEquals(resourceBundle.getLocale(), new Locale("pt"));
-	}
-
-	@Test
-	public void testKeySet() {
-		assertEquals(2, resourceBundle.keySet().size());
+		resourceBundle = new ResourceBundle("resourcebundle/resource-bundle", new Locale("pt"));
 	}
 	@Test
@@ -103,24 +63,4 @@ public class ResourceBundleTest {
 		assertEquals("params: {0}, {1}", resourceBundle.getString("msgWithParams"));
 	}
-	/**
-	 * For this test, java.util.ResourceBundle is mocked to force an exception. Since the getString method is called
-	 * from the actual ResourceBundle, not from the mock, it tries to find a handleGetObject method that doesn't exist.
-	 * 
-	 * @throws Exception
-	 */
-	// @Test(expected = RuntimeException.class)
-	// public void getStringWhenHandleGetObjectThrowsException() {
-	// mockResourceBundle = createMock(java.util.ResourceBundle.class);
-	// resourceBundle = new ResourceBundle(mockResourceBundle);
-	//
-	// replay(mockResourceBundle);
-	//
-	// resourceBundle.getString("msgWithParams");
-	//
-	// verify(mockResourceBundle);
-	//
-	// Assert.fail();
-	// }
-
 }
@@ -0,0 +1,112 @@
+/*
+ * 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 util.beans;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.NoSuchElementException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.util.Beans;
+
+@RunWith(Arquillian.class)
+public class BeansTest {
+
+	@Deployment
+	public static JavaArchive createDeployment() {
+		JavaArchive deployment = Tests.createDeployment(BeansTest.class);
+		return deployment;
+	}
+
+	@Test
+	public void beanClassAndQualifierTest() {
+		assertEquals(DummyQualifierOne.class,
+				(Beans.getReference(DummyQualifier.class, DummyQualifierOne.class.getAnnotations())).getClass());
+		assertEquals(DummyQualifierTwo.class,
+				(Beans.getReference(DummyQualifier.class, DummyQualifierTwo.class.getAnnotations())).getClass());
+	}
+
+	@Test
+	public void beanClassAndQualifierExceptionTest() {
+		try {
+			Beans.getReference(DummyQualifier.class, DummyQualifierOne.class.getAnnotations()[0],
+					DummyQualifierTwo.class.getAnnotations()[0]);
+			fail();
+		} catch (DemoiselleException cause) {
+			assertEquals(NoSuchElementException.class, cause.getCause().getClass());
+		}
+	}
+
+	@Test
+	public void beanClassTest() {
+		assertEquals(DummyImplementation.class, Beans.getReference(Dummy.class).getClass());
+	}
+
+	@Test
+	public void beanClassExceptionTest() {
+		try {
+			Beans.getReference(InexistentImplementationInterface.class);
+			fail();
+		} catch (DemoiselleException cause) {
+			assertEquals(NoSuchElementException.class, cause.getCause().getClass());
+		}
+	}
+
+	@Test
+	public void beanNameTest() {
+		assertEquals(DummyEL.class, Beans.getReference("DummyClass").getClass());
+	}
+
+	@Test
+	public void beanNameExceptionTest() {
+		try {
+			Beans.getReference("DummyEL");
+			fail();
+		} catch (DemoiselleException cause) {
+			assertEquals(NoSuchElementException.class, cause.getCause().getClass());
+		}
+	}
+}
@@ -0,0 +1,42 @@
+/*
+ * 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 util.beans;
+
+public interface Dummy {
+	
+	public void dummyMethod();
+}
@@ -0,0 +1,43 @@
+/*
+ * 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 util.beans;
+
+import javax.inject.Named;
+
+@Named("DummyClass")
+public class DummyEL {
+}
@@ -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 util.beans;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+
+@Priority(value = 1)
+public class DummyImplementation implements Dummy {
+
+	@Override
+	public void dummyMethod() {
+	}
+}
@@ -0,0 +1,40 @@
+/*
+ * 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 util.beans;
+
+public interface DummyQualifier {
+}
@@ -0,0 +1,41 @@
+/*
+ * 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 util.beans;
+
+@QualifierOne
+public class DummyQualifierOne implements DummyQualifier {
+}
@@ -0,0 +1,41 @@
+/*
+ * 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 util.beans;
+
+@QualifierTwo
+public class DummyQualifierTwo implements DummyQualifier{
+}
@@ -0,0 +1,40 @@
+/*
+ * 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 util.beans;
+
+public interface InexistentImplementationInterface {
+}
@@ -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 util.beans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Target({TYPE,  METHOD, PARAMETER, FIELD})
+@Retention(RUNTIME)
+public @interface QualifierOne {
+}
@@ -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 util.beans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Target({TYPE,  METHOD, PARAMETER, FIELD})
+@Retention(RUNTIME)
+public @interface QualifierTwo {
+}
 \ No newline at end of file
@@ -40,7 +40,7 @@
 	<!--
 	<engine>
-		<property name="deploymentExportPath">target/arquillian</property>
+		<property name="deploymentExportPath">target/deployments</property>
 	</engine>
 	-->
@@ -0,0 +1,11 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+	<interceptors>
+		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
+	</interceptors>
+
+</beans>
@@ -33,10 +33,13 @@
 # ou escreva para a Fundação do Software Livre (FSF) Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-log4j.rootCategory=INFO, stdout
+log4j.logger.br.gov.frameworkdemoiselle=DEBUG, STDOUT
+log4j.logger.org.jboss.weld=WARN, STDOUT
-log4j.logger.br.gov.frameworkdemoiselle=TRACE
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=%-5p [%c{1}] %m%n
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p [%c{1}] %m%n
+# Custom Appender to log4j that holds messages in memory 
+log4j.logger.logger=TRACE, MEMORYAPPENDER
+log4j.appender.MEMORYAPPENDER=logger.appender.MemoryAppender
@@ -0,0 +1,2 @@
+msgWithoutParams=no params
+msgWithParams=params\: {0}, {1}
@@ -1,11 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-	<interceptors>
-		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
-		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
-	</interceptors>
-
-</beans>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.4.0-BETA3-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
@@ -45,6 +45,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.internal.producer.ConnectionProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -97,7 +98,7 @@ public class JDBCTransaction implements Transaction {
 			try {
 				connection.commit();
 			} catch (Exception cause) {
-				throw new TransactionException(cause);
+				throw new DemoiselleException(cause);
 			}
 		}
 	}
@@ -108,7 +109,7 @@ public class JDBCTransaction implements Transaction {
 			try {
 				connection.rollback();
 			} catch (Exception cause) {
-				throw new TransactionException(cause);
+				throw new DemoiselleException(cause);
 			}
 		}
 	}
@@ -34,8 +34,7 @@
  ou escreva para a Fundação do Software Livre (FSF) Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>demoiselle-jmx</artifactId>
@@ -45,7 +44,7 @@
 	<parent>
 		<artifactId>demoiselle-extension-parent</artifactId>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
-		<version>2.4.0-BETA2-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
@@ -79,7 +79,7 @@ public class DynamicMBeanProxy implements DynamicMBean {
 	private ManagedType managedType;
-	private ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-jmx-bundle", Locale.getDefault());
+	private ResourceBundle bundle = new ResourceBundleProducer().create("demoiselle-jmx-bundle", Locale.getDefault());
 	public DynamicMBeanProxy(ManagedType type) {
 		if (type == null) {
@@ -59,7 +59,7 @@ public class MBeanHelper {
 	private static final Logger logger = LoggerProducer.create(MBeanHelper.class);
-	private static ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-jmx-bundle", Locale.getDefault());
+	private static ResourceBundle bundle = new ResourceBundleProducer().create("demoiselle-jmx-bundle", Locale.getDefault());
 	private static final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
@@ -52,12 +52,15 @@ import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
-import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import br.gov.frameworkdemoiselle.jmx.internal.MBeanManager;
+import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
+import br.gov.frameworkdemoiselle.lifecycle.AfterStartupProccess;
 import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
@@ -73,12 +76,21 @@ public class DynamicMBeanProxyTestCase {
 				.addPackages(false, DynamicMBeanProxyTestCase.class.getPackage())
 				.addClasses(LocaleProducer.class, ManagedTestClass.class);
-		mainDeployment.as(ZipExporter.class).exportTo(
-			    new File("/home/81986912515/myPackage.jar"), true);
-		
 		return mainDeployment;
 	}
+	@BeforeClass
+	public static void fireEventStartupProccess() {
+		Beans.getBeanManager().fireEvent(new AfterStartupProccess() {
+		});
+	}
+	
+	@AfterClass
+	public static void fireEventShutdownProccess() {
+		Beans.getBeanManager().fireEvent(new AfterShutdownProccess() {
+		});
+	}	
+	
 	/**
 	 * Testa se o bootstrap está corretamente carregando e registrando classes anotadas com {@link Managed} como MBeans.
 	 */
@@ -55,11 +55,15 @@ import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import br.gov.frameworkdemoiselle.jmx.configuration.JMXConfig;
 import br.gov.frameworkdemoiselle.jmx.internal.MBeanManager;
+import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
+import br.gov.frameworkdemoiselle.lifecycle.AfterStartupProccess;
 import br.gov.frameworkdemoiselle.management.AttributeChangeNotification;
 import br.gov.frameworkdemoiselle.management.GenericNotification;
 import br.gov.frameworkdemoiselle.management.NotificationManager;
@@ -67,7 +71,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class NotificationBroadcasterTestCase {
-	
+
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive mainDeployment = ShrinkWrap.create(JavaArchive.class);
@@ -80,129 +84,140 @@ public class NotificationBroadcasterTestCase {
 		return mainDeployment;
 	}
-	
+
+	@BeforeClass
+	public static void fireEventStartupProccess() {
+		Beans.getBeanManager().fireEvent(new AfterStartupProccess() {
+		});
+	}
+
+	@AfterClass
+	public static void fireEventShutdownProccess() {
+		Beans.getBeanManager().fireEvent(new AfterShutdownProccess() {
+		});
+	}
+
 	/**
 	 * Testa o envio de uma mensagem para clientes conectados
 	 */
 	@Test
-	public void sendMessageTest(){
+	public void sendMessageTest() {
 		JMXConfig config = Beans.getReference(JMXConfig.class);
-		
-		//Este será o lado cliente. Este manager é usado para enviar notificações a partir do código da aplicação
+
+		// Este será o lado cliente. Este manager é usado para enviar notificações a partir do código da aplicação
 		NotificationManager notificationManager = Beans.getReference(NotificationManager.class);
-		
-		//Obtém o servidor MBean onde anexaremos um listener para a notificação
+
+		// Obtém o servidor MBean onde anexaremos um listener para a notificação
 		MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-		
-		//Aqui obtemos o MBean de notificações já registrado pelo bootstrap
+
+		// Aqui obtemos o MBean de notificações já registrado pelo bootstrap
 		StringBuffer notificationMBeanName = new StringBuffer()
-			.append( config.getNotificationDomain()!=null ? config.getNotificationDomain() : "br.gov.frameworkdemoiselle.jmx" )
-			.append(":name=")
-			.append( config.getNotificationMBeanName());
-		
+				.append(config.getNotificationDomain() != null ? config.getNotificationDomain()
+						: "br.gov.frameworkdemoiselle.jmx").append(":name=").append(config.getNotificationMBeanName());
+
 		ObjectName name = null;
 		try {
 			name = new ObjectName(notificationMBeanName.toString());
 		} catch (MalformedObjectNameException e) {
 			Assert.fail();
 		}
-		
-		//StringBuffer vazio
+
+		// StringBuffer vazio
 		StringBuffer notificationBuffer = new StringBuffer();
-		
-		//Este notification listener será chamado quando o Demoiselle enviar a notificação e vai colocar
-		//a mensagem enviada em "notificationBuffer"
+
+		// Este notification listener será chamado quando o Demoiselle enviar a notificação e vai colocar
+		// a mensagem enviada em "notificationBuffer"
 		NotificationListener listener = new TestNotificationListener(notificationBuffer);
-		
+
 		try {
-			//Anexa o listener no servidor MBean
-			server.addNotificationListener(name,listener,null,null);
+			// Anexa o listener no servidor MBean
+			server.addNotificationListener(name, listener, null, null);
 		} catch (InstanceNotFoundException e) {
 			Assert.fail();
 		}
-		
-		//Manda a notificação pelo Demoiselle
+
+		// Manda a notificação pelo Demoiselle
 		GenericNotification n = new GenericNotification("Notification test successful");
 		notificationManager.sendNotification(n);
-		
-		//Se o componente funcionou, o Demoiselle propagou a notificação para o servidor MBean e o listener preencheu
-		//o StringBuffer com nossa mensagem.
+
+		// Se o componente funcionou, o Demoiselle propagou a notificação para o servidor MBean e o listener preencheu
+		// o StringBuffer com nossa mensagem.
 		Assert.assertEquals("Notification test successful", notificationBuffer.toString());
-		
+
 	}
-	
+
 	/**
 	 * Testa o envio de uma mensagem de mudança de atributo para clientes conectados
 	 */
 	@Test
-	public void sendAttributeChangedMessageTest(){
+	public void sendAttributeChangedMessageTest() {
 		JMXConfig config = Beans.getReference(JMXConfig.class);
-		
-		//Obtém o servidor MBean onde anexaremos um listener para a notificação
+
+		// Obtém o servidor MBean onde anexaremos um listener para a notificação
 		MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-		
+
 		NotificationManager notificationManager = Beans.getReference(NotificationManager.class);
 		MBeanManager mBeanManager = Beans.getReference(MBeanManager.class);
-		
-		//Aqui obtemos o MBean de notificações já registrado pelo bootstrap
+
+		// Aqui obtemos o MBean de notificações já registrado pelo bootstrap
 		StringBuffer notificationMBeanName = new StringBuffer()
-			.append( config.getNotificationDomain()!=null ? config.getNotificationDomain() : "br.gov.frameworkdemoiselle.jmx" )
-			.append(":name=")
-			.append( config.getNotificationMBeanName());
+				.append(config.getNotificationDomain() != null ? config.getNotificationDomain()
+						: "br.gov.frameworkdemoiselle.jmx").append(":name=").append(config.getNotificationMBeanName());
 		ObjectInstance instance = mBeanManager.findMBeanInstance(notificationMBeanName.toString());
-		
-		//StringBuffer vazio
+
+		// StringBuffer vazio
 		StringBuffer notificationBuffer = new StringBuffer();
-		
-		//Este notification listener será chamado quando o Demoiselle enviar a notificação e vai colocar
-		//a mensagem enviada em "notificationBuffer"
+
+		// Este notification listener será chamado quando o Demoiselle enviar a notificação e vai colocar
+		// a mensagem enviada em "notificationBuffer"
 		NotificationListener listener = new TestNotificationListener(notificationBuffer);
-		
+
 		try {
-			//Anexa o listener no servidor MBean
-			server.addNotificationListener(instance.getObjectName(),listener,null,null);
+			// Anexa o listener no servidor MBean
+			server.addNotificationListener(instance.getObjectName(), listener, null, null);
 		} catch (InstanceNotFoundException e) {
 			Assert.fail();
 		}
-		
-		//Manda a notificação pelo Demoiselle
-		AttributeChangeNotification notification = new AttributeChangeNotification("Attribute Changed","name",String.class,"Demoiselle 1","Demoiselle 2");
+
+		// Manda a notificação pelo Demoiselle
+		AttributeChangeNotification notification = new AttributeChangeNotification("Attribute Changed", "name",
+				String.class, "Demoiselle 1", "Demoiselle 2");
 		notificationManager.sendNotification(notification);
-		
-		//Se o componente funcionou, o Demoiselle propagou a notificação para o servidor MBean e o listener preencheu
-		//o StringBuffer com nossa mensagem.
+
+		// Se o componente funcionou, o Demoiselle propagou a notificação para o servidor MBean e o listener preencheu
+		// o StringBuffer com nossa mensagem.
 		Assert.assertEquals("Attribute Changed: name = Demoiselle 2", notificationBuffer.toString());
-		
+
 	}
-	
+
 	/**
-	 * Implementação do {@link NotificationListener} do Java que vai por qualquer notificação recebida em um StringBuffer.
+	 * Implementação do {@link NotificationListener} do Java que vai por qualquer notificação recebida em um
+	 * StringBuffer.
 	 * 
 	 * @author serpro
-	 *
 	 */
 	class TestNotificationListener implements NotificationListener {
-		
+
 		StringBuffer message;
-		
-		public TestNotificationListener(StringBuffer testMessage){
+
+		public TestNotificationListener(StringBuffer testMessage) {
 			this.message = testMessage;
 		}
 		@Override
 		public void handleNotification(javax.management.Notification notification, Object handback) {
-			if (message!=null){
+			if (message != null) {
 				message.append(notification.getMessage());
-				
-				if (notification instanceof javax.management.AttributeChangeNotification){
+
+				if (notification instanceof javax.management.AttributeChangeNotification) {
 					message.append(": ")
-						.append( ((javax.management.AttributeChangeNotification)notification).getAttributeName() )
-						.append(" = ")
-						.append(((javax.management.AttributeChangeNotification)notification).getNewValue());
+							.append(((javax.management.AttributeChangeNotification) notification).getAttributeName())
+							.append(" = ")
+							.append(((javax.management.AttributeChangeNotification) notification).getNewValue());
 				}
 			}
 		}
-		
+
 	}
 }
@@ -4,3 +4,4 @@
 /.settings
 /.externalToolBuilders
 /.DS_Store
+/*.log
@@ -36,7 +36,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>demoiselle-jpa</artifactId>
@@ -45,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.4.0-BETA3-SNAPSHOT</version>
+		<version>2.4.0-BETA4-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
@@ -67,27 +66,278 @@
 		<url>http://www.serpro.gov.br</url>
 	</organization>
+	<build>
+		<testResources>
+			<testResource>
+				<directory>src/test/resources</directory>
+				<filtering>true</filtering>
+			</testResource>
+		</testResources>
+	
+		<plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>process-test-classes</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.jboss.as</groupId>
+									<artifactId>jboss-as-dist</artifactId>
+									<version>${jbossas.version}</version>
+									<type>zip</type>
+									<overWrite>false</overWrite>
+									<outputDirectory>target</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!--
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<environmentVariables>
+						<JBOSS_HOME>${project.build.directory}/jboss-as-${jbossas.version}</JBOSS_HOME>
+					</environmentVariables>
+					<systemProperties>
+						<jboss.version>${jbossas.version}</jboss.version>
+					</systemProperties>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>process-test-classes</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.jboss.as</groupId>
+									<artifactId>jboss-as-dist</artifactId>
+									<version>${jbossas.version}</version>
+									<type>zip</type>
+									<overWrite>false</overWrite>
+									<outputDirectory>${project.build.directory}</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			-->
+			<!--
+			<plugin>
+				
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+				<systemPropertyVariables>
+					<tomee.httpPort>-1</tomee.httpPort>
+					<tomee.stopPort>-1</tomee.stopPort>
+				</systemPropertyVariables>
+			</configuration>
+		</plugin>
+			-->
+			<!--
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<systemPropertyVariables>
+						<java.util.logging.config.file>
+							${project.build.testOutputDirectory}/logging.properties
+						</java.util.logging.config.file>
+						<derby.stream.error.file>
+							${project.build.directory}/derby.log
+						</derby.stream.error.file>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+			-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.16</version>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>javax.persistence</artifactId>
 		</dependency>
+		
+		<!-- for tests -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
+			<groupId>org.jboss.arquillian.junit</groupId>
+			<artifactId>arquillian-junit-container</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!--
+		<dependency>
+			<groupId>org.jboss.as</groupId>
+			<artifactId>jboss-as-arquillian-container-embedded</artifactId>
+			<version>7.2.0.Final</version>
+			<scope>test</scope>
+		</dependency>
+		-->
+
+		<dependency>
+			<groupId>org.jboss.as</groupId>
+			<artifactId>jboss-as-arquillian-container-managed</artifactId>
+			<version>${jbossas.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.protocol</groupId>
+			<artifactId>arquillian-protocol-servlet</artifactId>
+		</dependency>
+                
+		<!--
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>arquillian-tomee-embedded</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+		-->
+
+		<!--
+		<dependency>
+			<groupId>org.jboss.arquillian.container</groupId>
+			<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.main.extras</groupId>
+			<artifactId>glassfish-embedded-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.main.extras</groupId>
+			<artifactId>glassfish-embedded-all</artifactId>
+			<version>3.1.2</version>
+			<scope>test</scope>
+		</dependency>
+		-->
+		<!--
+		<dependency>
+			<groupId>org.jboss.as</groupId>
+			<artifactId>jboss-as-arquillian-container-managed</artifactId>
+			<version>7.1.1.Final</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.protocol</groupId>
+			<artifactId>arquillian-protocol-servlet</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
+		
+		<!--
+		<dependency>
+			<groupId>org.jboss.as</groupId>
+			<artifactId>jboss-as-arquillian-container-managed</artifactId>
+			<version>7.1.1.Final</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.protocol</groupId>
+			<artifactId>arquillian-protocol-servlet</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
+
+		<dependency>
+			<groupId>org.jboss.shrinkwrap.resolver</groupId>
+			<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!--
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-depchain</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+		-->
+        
+		<!--
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>arquillian-tomee-embedded</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>tomee-embedded</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+		-->
+		
+		<!--
+		<dependency>
+			<groupId>org.jboss.arquillian.extension</groupId>
+			<artifactId>arquillian-persistence-impl</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		-->
+		
+		<!--
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<scope>test</scope>
 		</dependency>
+		-->
+		
+		<!--
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>	
+		-->
+
+		<!--
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<scope>test</scope>
+		</dependency>
+		-->
 	</dependencies>
 	<repositories>
@@ -114,4 +364,46 @@
 			</releases>
 		</repository>
 	</repositories>
+
+	<profiles>
+		<profile>
+			<id>arquillian-test</id>
+
+			<dependencies>
+				<dependency>
+					<groupId>br.gov.frameworkdemoiselle</groupId>
+					<artifactId>demoiselle-core</artifactId>
+					<exclusions>
+						<exclusion>
+							<groupId>javax.enterprise</groupId>
+							<artifactId>cdi-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<artifactId>validation-api</artifactId>
+							<groupId>javax.validation</groupId>
+						</exclusion>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-api</artifactId>
+						</exclusion>
+						<!--
+						-->
+						<exclusion>
+							<groupId>org.javassist</groupId>
+							<artifactId>javassist</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.persistence</groupId>
+					<artifactId>javax.persistence</artifactId>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<properties>
+		<jbossas.version>7.1.1.Final</jbossas.version>
+	</properties>
 </project>
@@ -26,6 +26,7 @@ import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @ApplicationScoped
+// @StaticScoped
 public class EntityManagerFactoryProducer implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -124,8 +124,11 @@ public class JPATransaction implements Transaction {
 	public boolean isActive() {
 		boolean active = false;
+		EntityTransaction transaction;
 		for (EntityManager entityManager : getDelegate()) {
-			if (entityManager.getTransaction().isActive()) {
+			transaction = entityManager.getTransaction();
+
+			if (transaction.isActive()) {
 				active = true;
 				break;
 			}
@@ -1,65 +0,0 @@
-package br.gov.frameworkdemoiselle.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * Simle entity for test classes
- * @author serpro
- *
- */
-@Entity
-public class Client implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-
-	private Long id;
-	
-	private String name;
-	
-	private Date birthDate;
-
-	@Id
-	@GeneratedValue
-	public Long getId() {
-		return id;
-	}
-
-	
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	
-	public String getName() {
-		return name;
-	}
-
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-
-
-	@Temporal(TemporalType.DATE)
-	public Date getBirthDate() {
-		return birthDate;
-	}
-
-
-	
-	public void setBirthDate(Date birthDate) {
-		this.birthDate = birthDate;
-	}
-	
-	
-	
-	
-
-}
@@ -1,28 +0,0 @@
-package br.gov.frameworkdemoiselle.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Contact implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue
-	@Column
-	private Long id;
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-}
@@ -1,102 +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.configuration;
-//import static org.easymock.EasyMock.createMock;
-//import static org.easymock.EasyMock.expect;
-//import static org.junit.Assert.assertEquals;
-//
-//import java.util.Locale;
-//
-//import org.junit.After;
-//import org.junit.Before;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.api.easymock.PowerMock;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//import org.powermock.reflect.Whitebox;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
-//import br.gov.frameworkdemoiselle.util.ResourceBundle;
-//
-///**
-// * @author e-saito
-// */
-///**
-// * @author 80342167553
-// */
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest(CoreBootstrap.class)
-//public class EntityManagerConfigTest {
-//
-//	private EntityManagerConfig config = new EntityManagerConfig();
-//
-//	@Before
-//	public void setUp() throws Exception {
-//		Logger logger = LoggerFactory.getLogger(this.getClass());
-//		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-//
-//		ConfigurationLoader configurationLoader = new ConfigurationLoader();
-//		
-//		Whitebox.setInternalState(configurationLoader, "bundle", bundle);
-//		Whitebox.setInternalState(configurationLoader, "logger", logger);
-//
-//		CoreBootstrap bootstrap = createMock(CoreBootstrap.class);
-//		expect(bootstrap.isAnnotatedType(config.getClass())).andReturn(true);
-//		PowerMock.replay(bootstrap);
-//		
-//		Whitebox.setInternalState(configurationLoader, "bootstrap", bootstrap);
-//
-//		configurationLoader.load(config);
-//	}
-//
-//	@After
-//	public void tearDown() throws Exception {
-//		config = null;
-//	}
-//
-//	/**
-//	 * Test method for
-//	 * {@link br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig#getDefaultPersistenceUnitName()}.
-//	 */
-//	@Test
-//	public void testGetDefaultPersistenceUnitName() {
-//		assertEquals("PersistenceUnitName", config.getDefaultPersistenceUnitName());
-//	}
-//}
@@ -1,176 +0,0 @@
-package br.gov.frameworkdemoiselle.internal.producer;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.verify;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.reflect.Whitebox.setInternalState;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(Persistence.class)
-public class EntityManagerFactoryProducerTest {
-
-	private EntityManagerFactory emFactory;
-
-	private EntityManagerFactoryProducer producer;
-
-	private Map<ClassLoader, Map<String, EntityManagerFactory>> cache;
-
-	private Logger logger;
-
-	private ResourceBundle bundle;
-
-	@Before
-	public void setUp() {
-		logger = createMock(Logger.class);
-		bundle = ResourceBundleProducer.create("demoiselle-jpa-bundle", Locale.getDefault());
-		producer = new EntityManagerFactoryProducer();
-		cache = Collections.synchronizedMap(new HashMap<ClassLoader, Map<String, EntityManagerFactory>>());
-		setInternalState(producer, "factoryCache", cache);
-		setInternalState(producer, Logger.class, logger);
-		setInternalState(producer, ResourceBundle.class, bundle);
-		emFactory = createMock(EntityManagerFactory.class);
-	}
-
-	@Test
-	public void testCreateWithUnitPersistenceExisting() {
-		ClassLoader cl = this.getClass().getClassLoader();
-		HashMap<String, EntityManagerFactory> emEntry = new HashMap<String, EntityManagerFactory>();
-		emEntry.put("pu1", emFactory);
-		cache.put(cl, emEntry);
-
-		Assert.assertEquals(emFactory, producer.create("pu1"));
-	}
-
-	@Test
-	public void testCreateWithUnitPersistenceNotExisting() {
-
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
-
-		replay(Persistence.class);
-
-		Assert.assertEquals(emFactory, producer.create("pu1"));
-	}
-
-	/**
-	 * Test if after producing an entity manager, the EntityManagerFactory is correctly stored in the cache associated
-	 * with the current class loader.
-	 */
-	@Test
-	public void testStorageCacheAfterCreate() {
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
-		replay(Persistence.class);
-
-		Map<String, EntityManagerFactory> producerCache = producer.getCache();
-		Assert.assertNotNull(producerCache);
-		Assert.assertTrue(producerCache.containsKey("pu1"));
-		Assert.assertTrue(producerCache.containsValue(emFactory));
-	}
-
-	@Test
-	public void testInitWithoutError() {
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
-		replay(Persistence.class);
-
-		producer.loadPersistenceUnits();
-
-		ClassLoader cl = this.getClass().getClassLoader();
-		Map<String, EntityManagerFactory> internalCache = cache.get(cl);
-
-		Assert.assertNotNull(internalCache);
-		Assert.assertEquals(emFactory, internalCache.get("pu1"));
-	}
-
-	/*
-	 * @Test public void testInitWithError() { try { producer.loadPersistenceUnits(); Assert.fail();
-	 * }catch(DemoiselleException cause) { Assert.assertTrue(true); } }
-	 */
-
-	@Test
-	public void testGetCache() {
-		ClassLoader cl = this.getClass().getClassLoader();
-		HashMap<String, EntityManagerFactory> emEntry = new HashMap<String, EntityManagerFactory>();
-		emEntry.put("pu1", emFactory);
-		cache.put(cl, emEntry);
-
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
-		replay(Persistence.class);
-
-		Assert.assertEquals(cache.get(this.getClass().getClassLoader()), producer.getCache());
-	}
-
-	@Test
-	public void testClose() {
-		ClassLoader cl = this.getClass().getClassLoader();
-		HashMap<String, EntityManagerFactory> emEntry = new HashMap<String, EntityManagerFactory>();
-		emEntry.put("pu1", emFactory);
-		cache.put(cl, emEntry);
-
-		emFactory.close();
-		replay(emFactory);
-		producer.close();
-		verify(emFactory);
-	}
-
-	/**
-	 * Test if detecting the persistence unit with an empty name throws correct error.
-	 */
-	// @Test
-	// public void testEmptyPersistenceUnitName(){
-	// EntityManagerFactoryProducer.ENTITY_MANAGER_RESOURCE = "persistence-empty-name.xml";
-	//
-	// try{
-	// producer.getCache();
-	// Assert.fail();
-	// }
-	// catch(DemoiselleException de){
-	// //
-	// }
-	// }
-
-	/**
-	 * Test if asking to create an entity manager still not in the cache will correctly create it and put it in the
-	 * cache.
-	 */
-	@Test
-	public void testCreatePersistenceUnitNotInCache() {
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emFactory);
-		replay(Persistence.class);
-
-		ClassLoader cl = this.getClass().getClassLoader();
-		HashMap<String, EntityManagerFactory> emEntry = new HashMap<String, EntityManagerFactory>();
-		cache.put(cl, emEntry);
-
-		producer.create("pu1");
-
-		Map<String, EntityManagerFactory> producerCache = producer.getCache();
-		Assert.assertNotNull(producerCache);
-		Assert.assertTrue(producerCache.containsKey("pu1"));
-		Assert.assertTrue(producerCache.containsValue(emFactory));
-	}
-}
@@ -1,189 +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.producer;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.verify;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.reflect.Whitebox.setInternalState;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-import junit.framework.Assert;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(Persistence.class)
-public class EntityManagerProducerTest {
-
-	private EntityManagerProducer producer;
-
-	private Logger logger;
-
-	private ResourceBundle bundle;
-
-	private InjectionPoint ip;
-
-	private EntityManagerConfig config;
-
-	private Annotated annotated;
-
-	private Name name;
-
-	private EntityManagerFactory emf;
-
-	private Map<String, EntityManager> cache;
-
-	private EntityManager em;
-
-	@Before
-	public void setUp() {
-		emf = createMock(EntityManagerFactory.class);
-		em = createMock(EntityManager.class);
-
-		mockStatic(Persistence.class);
-		expect(Persistence.createEntityManagerFactory("pu1")).andReturn(emf);
-		expect(emf.createEntityManager()).andReturn(em);
-
-		replay(emf, Persistence.class);
-
-		producer = new EntityManagerProducer();
-		bundle = ResourceBundleProducer.create("demoiselle-jpa-bundle", Locale.getDefault());
-		logger = createMock(Logger.class);
-
-		setInternalState(producer, ResourceBundle.class, bundle);
-		setInternalState(producer, Logger.class, logger);
-
-		ip = createMock(InjectionPoint.class);
-		config = createMock(EntityManagerConfig.class);
-		annotated = createMock(Annotated.class);
-	}
-
-	@Test
-	public void testClose() {
-		em.close();
-		replay(em);
-		cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
-		cache.put("pu1", em);
-		setInternalState(producer, Map.class, cache);
-		producer.close();
-		verify(em);
-	}
-
-	@Test
-	public void testGetCache() {
-		cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
-		setInternalState(producer, Map.class, cache);
-		Assert.assertEquals(cache, producer.getCache());
-	}
-
-	@After
-	public void tearDown() {
-		producer = null;
-	}
-
-	// @Test
-	// public void testCreateWithEntityManagerAnnotatedWithName() {
-	// name = createMock(Name.class);
-	// expect(name.value()).andReturn("pu1");
-	// expect(annotated.isAnnotationPresent(Name.class)).andReturn(true);
-	// expect(annotated.getAnnotation(Name.class)).andReturn(name);
-	// expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
-	// replay(name, annotated, ip);
-	//
-	// EntityManagerProxy entityManagerProxy = (EntityManagerProxy) producer.create(ip, config);
-	// assertNotNull(entityManagerProxy);
-	// }
-
-	// @Test
-	// public void testCreateWithPersistenceUnitNameFromDemoiselleProperties() {
-	// expect(annotated.isAnnotationPresent(Name.class)).andReturn(false);
-	// expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
-	// expect(config.getDefaultPersistenceUnitName()).andReturn("pu1");
-	//
-	// replay(annotated, ip, config);
-	//
-	// EntityManagerProxy entityManagerProxy = (EntityManagerProxy) producer.create(ip, config);
-	// assertNotNull(entityManagerProxy);
-	// }
-
-	// @Test
-	// public void testCreateWithPersistenceUnitNameFromPersistenceXML() {
-	//
-	// Map<String, EntityManagerFactory> cache = Collections
-	// .synchronizedMap(new HashMap<String, EntityManagerFactory>());
-	//
-	// cache.put("pu1", emf);
-	//
-	// EntityManagerFactoryProducer entityManagerFactoryProducer = createMock(EntityManagerFactoryProducer.class);
-	//
-	// expect(entityManagerFactoryProducer.getCache()).andReturn(cache);
-	//
-	// expect(annotated.isAnnotationPresent(Name.class)).andReturn(false);
-	// expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
-	// expect(config.getDefaultPersistenceUnitName()).andReturn(null);
-	//
-	// replay(annotated, ip, config, entityManagerFactoryProducer);
-	//
-	// setInternalState(producer, EntityManagerFactoryProducer.class, entityManagerFactoryProducer);
-	//
-	// EntityManagerProxy entityManagerProxy = (EntityManagerProxy) producer.create(ip, config);
-	// assertNotNull(entityManagerProxy);
-	// }
-}
@@ -1,277 +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.producer;
-
-import java.util.Map;
-
-import javax.enterprise.inject.Alternative;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.metamodel.Metamodel;
-
-@Alternative
-public class FakeEntityManager implements EntityManager {
-
-	private boolean closed = false;
-
-	private boolean equals = true;
-
-	private int hashCode = 1;
-
-	private String toString = "";
-
-	@Override
-	public void clear() {
-	}
-
-	@Override
-	public void close() {
-		closed = true;
-	}
-
-	@Override
-	public boolean contains(Object arg0) {
-		return false;
-	}
-
-	@Override
-	public Query createNamedQuery(String arg0) {
-		return null;
-	}
-
-	@Override
-	public <T> TypedQuery<T> createNamedQuery(String arg0, Class<T> arg1) {
-		return null;
-	}
-
-	@Override
-	public Query createNativeQuery(String arg0) {
-		return null;
-	}
-
-	@Override
-	public Query createNativeQuery(String arg0, @SuppressWarnings("rawtypes") Class arg1) {
-		return null;
-	}
-
-	@Override
-	public Query createNativeQuery(String arg0, String arg1) {
-		return null;
-	}
-
-	@Override
-	public Query createQuery(String arg0) {
-		return null;
-	}
-
-	@Override
-	public <T> TypedQuery<T> createQuery(CriteriaQuery<T> arg0) {
-		return null;
-	}
-
-	@Override
-	public <T> TypedQuery<T> createQuery(String arg0, Class<T> arg1) {
-		return null;
-	}
-
-	@Override
-	public void detach(Object arg0) {
-	}
-
-	@Override
-	public <T> T find(Class<T> arg0, Object arg1) {
-		return null;
-	}
-
-	@Override
-	public <T> T find(Class<T> arg0, Object arg1, Map<String, Object> arg2) {
-		return null;
-	}
-
-	@Override
-	public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2) {
-		return null;
-	}
-
-	@Override
-	public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2, Map<String, Object> arg3) {
-		return null;
-	}
-
-	@Override
-	public void flush() {
-	}
-
-	@Override
-	public CriteriaBuilder getCriteriaBuilder() {
-		return null;
-	}
-
-	@Override
-	public Object getDelegate() {
-		return null;
-	}
-
-	@Override
-	public EntityManagerFactory getEntityManagerFactory() {
-		return null;
-	}
-
-	@Override
-	public FlushModeType getFlushMode() {
-		return null;
-	}
-
-	@Override
-	public LockModeType getLockMode(Object arg0) {
-		return null;
-	}
-
-	@Override
-	public Metamodel getMetamodel() {
-		return null;
-	}
-
-	@Override
-	public Map<String, Object> getProperties() {
-		return null;
-	}
-
-	@Override
-	public <T> T getReference(Class<T> arg0, Object arg1) {
-		return null;
-	}
-
-	@Override
-	public EntityTransaction getTransaction() {
-		return null;
-	}
-
-	@Override
-	public boolean isOpen() {
-		return !closed;
-	}
-
-	@Override
-	public void joinTransaction() {
-	}
-
-	@Override
-	public void lock(Object arg0, LockModeType arg1) {
-	}
-
-	@Override
-	public void lock(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
-	}
-
-	@Override
-	public <T> T merge(T arg0) {
-		return null;
-	}
-
-	@Override
-	public void persist(Object arg0) {
-	}
-
-	@Override
-	public void refresh(Object arg0) {
-	}
-
-	@Override
-	public void refresh(Object arg0, Map<String, Object> arg1) {
-	}
-
-	@Override
-	public void refresh(Object arg0, LockModeType arg1) {
-	}
-
-	@Override
-	public void refresh(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
-	}
-
-	@Override
-	public void remove(Object arg0) {
-	}
-
-	@Override
-	public void setFlushMode(FlushModeType arg0) {
-	}
-
-	@Override
-	public void setProperty(String arg0, Object arg1) {
-	}
-
-	@Override
-	public <T> T unwrap(Class<T> arg0) {
-		return null;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return equals;
-	}
-
-	public void setEquals(boolean equals) {
-		this.equals = equals;
-	}
-
-	@Override
-	public int hashCode() {
-		return hashCode;
-	}
-
-	public void setHashCode(int hash) {
-		this.hashCode = hash;
-	}
-
-	@Override
-	public String toString() {
-		return toString;
-	}
-
-	public void setToString(String toString) {
-		this.toString = toString;
-	}
-
-}
@@ -1,536 +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.proxy;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.metamodel.Metamodel;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
-import br.gov.frameworkdemoiselle.internal.producer.FakeEntityManager;
-import br.gov.frameworkdemoiselle.util.Beans;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Beans.class })
-public class EntityManagerProxyTest {
-
-	private EntityManagerProxy entityManagerProxy;
-
-	private EntityManager entityManager;
-
-	private EntityManagerProducer entityManagerContext;
-	
-	@Before
-	public void setUp() throws Exception {
-		mockStatic(Beans.class);
-		this.entityManager = EasyMock.createMock(EntityManager.class);
-		this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class);
-
-		expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes();
-		expect(this.entityManagerContext.getEntityManager("teste")).andReturn(this.entityManager).anyTimes();
-		replay(this.entityManagerContext);
-		//expect(this.entityManager.getTransaction()).andReturn(transaction).anyTimes();
-		//replay(this.entityManager);
-		replayAll();
-
-		this.entityManagerProxy = new EntityManagerProxy("teste");
-
-	}
-
-	@Test
-	public void testJoinTransactionIfNecessaryException() {
-		this.entityManager.persist("teste");
-		expect(this.entityManager.getTransaction()).andThrow(new IllegalStateException()).anyTimes();
-		this.entityManager.joinTransaction();
-		replay(this.entityManager);
-		
-		this.entityManagerProxy.persist("teste");
-		verify(this.entityManager);
-	}
-	
-	@Test
-	public void testPersist() {
-		this.entityManager.persist("teste");
-		expect(this.entityManager.getTransaction()).andReturn(null);
-		replay(this.entityManager);
-		this.entityManagerProxy.persist("teste");
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testRemove() {
-		this.entityManager.remove("teste");
-		expect(this.entityManager.getTransaction()).andReturn(null);
-		replay(this.entityManager);
-		this.entityManagerProxy.remove("teste");
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFlush() {
-		this.entityManager.flush();
-		replay(this.entityManager);
-		this.entityManagerProxy.flush();
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testSetFlushMode() {
-		FlushModeType flushModeType = null;
-		this.entityManager.setFlushMode(flushModeType);
-		replay(this.entityManager);
-		this.entityManagerProxy.setFlushMode(flushModeType);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testLockWithParamsStringAndLockModeType() {
-		LockModeType lockMode = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.lock("teste", lockMode);
-		replay(this.entityManager);
-		this.entityManagerProxy.lock("teste", lockMode);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testLockWithParamsStringLockModeTypeAndMap() {
-		LockModeType lockMode = null;
-		Map<String, Object> map = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.lock("teste", lockMode, map);
-		replay(this.entityManager);
-		this.entityManagerProxy.lock("teste", lockMode, map);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testRefresh() {
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.refresh("teste");
-		replay(this.entityManager);
-		this.entityManagerProxy.refresh("teste");
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testRefreshWithParamsStringAndMap() {
-		Map<String, Object> map = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.refresh("teste", map);
-		replay(this.entityManager);
-		this.entityManagerProxy.refresh("teste", map);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testRefreshWithParamsStringAndLockModeType() {
-		LockModeType lockMode = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.refresh("teste", lockMode);
-		replay(this.entityManager);
-		this.entityManagerProxy.refresh("teste", lockMode);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testRefreshWithParamsStringLockModeTypeAndMap() {
-		LockModeType lockMode = null;
-		Map<String, Object> map = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		this.entityManager.refresh("teste", lockMode, map);
-		replay(this.entityManager);
-		this.entityManagerProxy.refresh("teste", lockMode, map);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testClear() {
-		this.entityManager.clear();
-		replay(this.entityManager);
-		this.entityManagerProxy.clear();
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testDetach() {
-		this.entityManager.detach("teste");
-		replay(this.entityManager);
-		this.entityManagerProxy.detach("teste");
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testSetProperty() {
-		this.entityManager.setProperty("teste", "teste");
-		replay(this.entityManager);
-		this.entityManagerProxy.setProperty("teste", "teste");
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testJoinTransaction() {
-		this.entityManager.joinTransaction();
-		replay(this.entityManager);
-		this.entityManagerProxy.joinTransaction();
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testClose() {
-		this.entityManager.close();
-		replay(this.entityManager);
-		this.entityManagerProxy.close();
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testMerge() {
-		expect(this.entityManager.merge("teste")).andReturn("xxx");
-		expect(this.entityManager.getTransaction()).andReturn(null);
-		replay(this.entityManager);
-		assertEquals("xxx", this.entityManagerProxy.merge("teste"));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFindWithParamsClassAndObject() {
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.find(String.class, "teste")).andReturn("retorno");
-		replay(this.entityManager);
-		assertEquals("retorno", this.entityManagerProxy.find(String.class, "teste"));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFindWithParamsClassObjectAndMap() {
-		Map<String, Object> map = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.find(String.class, "teste", map)).andReturn("retorno");
-		replay(this.entityManager);
-		assertEquals("retorno", this.entityManagerProxy.find(String.class, "teste", map));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFindWithParamsClassObjectAndLockModeType() {
-		LockModeType lock = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.find(String.class, "teste", lock)).andReturn("retorno");
-		replay(this.entityManager);
-		assertEquals("retorno", this.entityManagerProxy.find(String.class, "teste", lock));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFindWithParamsClassObjectLockModeTypeAndMap() {
-		Map<String, Object> map = null;
-		LockModeType lock = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.find(String.class, "teste", lock, map)).andReturn("retorno");
-		replay(this.entityManager);
-		assertEquals("retorno", this.entityManagerProxy.find(String.class, "teste", lock, map));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetReference() {
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.getReference(String.class, "teste")).andReturn("retorno");
-		replay(this.entityManager);
-		assertEquals("retorno", this.entityManagerProxy.getReference(String.class, "teste"));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetFlushMode() {
-		FlushModeType flushModeType = null;
-		expect(this.entityManager.getFlushMode()).andReturn(flushModeType);
-		replay(this.entityManager);
-		assertEquals(flushModeType, this.entityManagerProxy.getFlushMode());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testContains() {
-		expect(this.entityManager.contains("teste")).andReturn(true);
-		replay(this.entityManager);
-		assertTrue(this.entityManagerProxy.contains("teste"));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetLockMode() {
-		LockModeType lockModeType = null;
-		expect(this.entityManager.getTransaction()).andReturn(null).anyTimes();
-		expect(this.entityManager.getLockMode("teste")).andReturn(lockModeType);
-		replay(this.entityManager);
-		assertEquals(lockModeType, this.entityManagerProxy.getLockMode("teste"));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetProperties() {
-		Map<String, Object> map = null;
-		expect(this.entityManager.getProperties()).andReturn(map);
-		replay(this.entityManager);
-		assertEquals(map, this.entityManagerProxy.getProperties());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateQuery() {
-		Query query = EasyMock.createMock(Query.class);
-		expect(this.entityManager.createQuery("teste")).andReturn(query);
-		replay(this.entityManager);
-		assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste").getClass()) );
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateQueryWithParamCriteria() {
-		@SuppressWarnings("unchecked")
-		TypedQuery<Object> typedQuery = EasyMock.createMock(TypedQuery.class);
-
-		CriteriaQuery<Object> criteriaQuery = null;
-		expect(this.entityManager.createQuery(criteriaQuery)).andReturn(typedQuery);
-		replay(this.entityManager);
-		assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery(criteriaQuery).getClass()));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateQueryWithParamStringAndClass() {
-		@SuppressWarnings("unchecked")
-		TypedQuery<String> typeQuery = EasyMock.createMock(TypedQuery.class);
-
-		expect(this.entityManager.createQuery("teste", String.class)).andReturn(typeQuery);
-		replay(this.entityManager);
-		assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste", String.class).getClass()));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateNamedQuery() {
-		Query query = EasyMock.createMock(Query.class);
-		expect(this.entityManager.createNamedQuery("teste")).andReturn(query);
-		replay(this.entityManager);
-		assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createNamedQuery("teste").getClass()));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateNamedQueryWithParamsStringAndClass() {
-		@SuppressWarnings("unchecked")
-		TypedQuery<String> typedQuery = EasyMock.createMock(TypedQuery.class);
-		expect(this.entityManager.createNamedQuery("teste", String.class)).andReturn(typedQuery);
-		replay(this.entityManager);
-		assertEquals(typedQuery, this.entityManagerProxy.createNamedQuery("teste", String.class));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateNativeQuery() {
-		Query query = null;
-		expect(this.entityManager.createNativeQuery("teste")).andReturn(query);
-		replay(this.entityManager);
-		assertEquals(QueryProxy.class, this.entityManagerProxy.createNativeQuery("teste").getClass());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateNativeQueryWithParamsStringAndClass() {
-		Query query = null;
-		expect(this.entityManager.createNativeQuery("teste", String.class)).andReturn(query);
-		replay(this.entityManager);
-		assertEquals(QueryProxy.class, this.entityManagerProxy.createNativeQuery("teste", String.class).getClass());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testCreateNativeQueryWithParamsStringAndString() {
-		Query query = null;
-		expect(this.entityManager.createNativeQuery("teste", "teste")).andReturn(query);
-		replay(this.entityManager);
-		assertEquals(QueryProxy.class, this.entityManagerProxy.createNativeQuery("teste", "teste").getClass());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testUnwrap() {
-		String query = null;
-		expect(this.entityManager.unwrap(String.class)).andReturn(query);
-		replay(this.entityManager);
-		assertEquals(query, this.entityManagerProxy.unwrap(String.class));
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetDelegate() {
-		Object obj = null;
-		expect(this.entityManager.getDelegate()).andReturn(obj);
-		replay(this.entityManager);
-		assertEquals(obj, this.entityManagerProxy.getDelegate());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testIsOpen() {
-		expect(this.entityManager.isOpen()).andReturn(true);
-		replay(this.entityManager);
-		assertTrue(this.entityManagerProxy.isOpen());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetTransaction() {
-		EntityTransaction entityTransaction = null;
-		expect(this.entityManager.getTransaction()).andReturn(entityTransaction);
-		replay(this.entityManager);
-		assertEquals(entityTransaction, this.entityManagerProxy.getTransaction());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetEntityManagerFactory() {
-		EntityManagerFactory entityManagerFactory = null;
-		expect(this.entityManager.getEntityManagerFactory()).andReturn(entityManagerFactory);
-		replay(this.entityManager);
-		assertEquals(entityManagerFactory, this.entityManagerProxy.getEntityManagerFactory());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetCriteriaBuilder() {
-		CriteriaBuilder criteriaBuilder = null;
-		expect(this.entityManager.getCriteriaBuilder()).andReturn(criteriaBuilder);
-		replay(this.entityManager);
-		assertEquals(criteriaBuilder, this.entityManagerProxy.getCriteriaBuilder());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testGetMetamodel() {
-		Metamodel metamodel = null;
-		expect(this.entityManager.getMetamodel()).andReturn(metamodel);
-		replay(this.entityManager);
-		assertEquals(metamodel, this.entityManagerProxy.getMetamodel());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testEquals() {
-		Object obj = null;
-
-		mockStatic(Beans.class);
-		// Method "equals" can't be mocked...
-		EntityManager em = new FakeEntityManager();
-		((FakeEntityManager) em).setEquals(true);
-
-		this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class);
-		expect(this.entityManagerContext.getEntityManager("teste")).andReturn(em).anyTimes();
-
-		expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes();
-		replay(this.entityManagerContext);
-		replayAll();
-
-		EntityManagerProxy emp = new EntityManagerProxy("teste");
-
-		assertTrue(emp.equals(obj));
-	}
-
-	@Test
-	public void testHashCode() {
-		mockStatic(Beans.class);
-		// Method "hashCode" can't be mocked...
-		EntityManager em = new FakeEntityManager();
-		((FakeEntityManager) em).setHashCode(1);
-
-		this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class);
-		expect(this.entityManagerContext.getEntityManager("teste")).andReturn(em).anyTimes();
-
-		expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes();
-		replay(this.entityManagerContext);
-		replayAll();
-
-		EntityManagerProxy emp = new EntityManagerProxy("teste");
-
-		assertEquals(1, emp.hashCode());
-	}
-
-	@Test
-	public void testToString() {
-		mockStatic(Beans.class);
-		// Method "toString" can't be mocked...
-		EntityManager em = new FakeEntityManager();
-		((FakeEntityManager) em).setToString("testing");
-
-		this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class);
-		expect(this.entityManagerContext.getEntityManager("teste")).andReturn(em).anyTimes();
-
-		expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes();
-		replay(this.entityManagerContext);
-		replayAll();
-
-		EntityManagerProxy emp = new EntityManagerProxy("teste");
-
-		assertEquals("testing", emp.toString());
-	}
-}
@@ -1,294 +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.proxy;
-
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import br.gov.frameworkdemoiselle.domain.Client;
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
-import br.gov.frameworkdemoiselle.util.Beans;
-
-/**
- * Test the proxied {@link Query} class, {@link QueryProxy}.
- * 
- * @author 81986912515
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Beans.class })
-public class QueryProxyTest {
-
-	private EntityManager manager;
-
-	private EntityManagerProducer producer;
-
-	private QueryProxy queryProxy;
-
-	@Before
-	public void setUp() {
-
-		Map<String, Object> configOverrides = new HashMap<String, Object>();
-		configOverrides.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
-
-		configOverrides.put("javax.persistence.jdbc.url", "jdbc:hsqldb:mem:.");
-		configOverrides.put("javax.persistence.jdbc.driver", "org.hsqldb.jdbcDriver");
-		configOverrides.put("javax.persistence.jdbc.user", "sa");
-		configOverrides.put("javax.persistence.jdbc.password", "");
-
-		configOverrides.put("hibernate.show_sql", "true");
-		configOverrides.put("hibernate.hbm2ddl.auto", "create-drop");
-
-		EntityManagerFactory factory = Persistence.createEntityManagerFactory("pu1", configOverrides);
-		EntityManager delegate = factory.createEntityManager();
-
-		Map<String, EntityManager> cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
-		cache.put("pu1", delegate);
-
-		producer = new EntityManagerProducer();
-		Whitebox.setInternalState(producer, "cache", cache);
-
-		PowerMock.mockStatic(Beans.class);
-		EasyMock.expect(Beans.getReference(EntityManagerProducer.class)).andReturn(producer).anyTimes();
-		PowerMock.replayAll();
-
-		manager = new EntityManagerProxy("pu1");
-	}
-
-	@Test
-	public void testGetResultList() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		List<String> result = new ArrayList<String>();
-		result.add("x");
-		EasyMock.expect(queryDelegate.getResultList()).andReturn(result).anyTimes();
-
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.getResultList();
-		assertEquals(queryProxy.getResultList().size(), queryDelegate.getResultList().size());
-
-		verifyAll();
-	}
-
-	@Test
-	public void testSingleResult() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		String result = "Resultado";
-		EasyMock.expect(queryDelegate.getSingleResult()).andReturn(result).anyTimes();
-
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertEquals(queryProxy.getSingleResult(), queryDelegate.getSingleResult());
-
-		verifyAll();
-	}
-
-	@Test
-	public void testExecuteUpdate() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		EasyMock.expect(queryDelegate.executeUpdate()).andReturn(1).anyTimes();
-
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertEquals(queryProxy.executeUpdate(), 1);
-
-		verifyAll();
-	}
-
-	@Test
-	public void testPagination() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		expect(queryDelegate.getMaxResults()).andReturn(4).times(2);
-		expect(queryDelegate.getFirstResult()).andReturn(2).times(2);
-		expect(queryDelegate.setMaxResults(EasyMock.anyInt())).andReturn(queryDelegate);
-		expect(queryDelegate.setFirstResult(EasyMock.anyInt())).andReturn(queryDelegate);
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.setMaxResults(4);
-		queryProxy.setFirstResult(2);
-		assertEquals(queryProxy.getMaxResults(), queryDelegate.getMaxResults());
-		assertEquals(queryProxy.getFirstResult(), queryDelegate.getFirstResult());
-
-		verifyAll();
-	}
-
-	@Test
-	public void testHint() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		Map<String, Object> map = new HashMap<String, Object>();
-		Client client = new Client();
-		map.put("1", client);
-		expect(queryDelegate.getHints()).andReturn(map).times(2);
-		expect(queryDelegate.setHint(EasyMock.anyObject(String.class), EasyMock.anyObject())).andReturn(queryDelegate);
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.setHint("1", client);
-		assertEquals(queryProxy.getHints(), queryDelegate.getHints());
-
-		verifyAll();
-	}
-
-	@SuppressWarnings({ "unused", "rawtypes", "unchecked" })
-	@Test
-	public void testParameters() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		Date dateValue = new Date();
-		Calendar calendar = PowerMock.createMock(Calendar.class);
-		Class<Date> type = Date.class;
-		Parameter parameter = PowerMock.createMock(Parameter.class);
-
-		expect(queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class)))
-				.andReturn(queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyObject(String.class))).andReturn("Named Parameter")
-				.anyTimes();
-		expect(queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(String.class)))
-				.andReturn(queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyInt())).andReturn("Client").anyTimes();
-		expect(
-				queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(Date.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(
-				queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(Date.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(queryDelegate.setParameter(EasyMock.anyObject(Parameter.class), EasyMock.anyObject())).andReturn(
-				queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyObject(Parameter.class))).andReturn(parameter).anyTimes();
-		expect(
-				queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(Calendar.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(
-				queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(Calendar.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-
-		replay(queryDelegate, parameter, calendar);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.setParameter("name", "Named Parameter");
-		assertEquals(queryProxy.getParameterValue("name"), queryDelegate.getParameterValue("name"));
-		queryProxy.setParameter(1, "Client");
-		assertEquals(queryProxy.getParameterValue("1"), queryDelegate.getParameterValue("1"));
-		queryProxy.setParameter("dateName", dateValue, TemporalType.DATE);
-		queryProxy.setParameter(2, dateValue, TemporalType.DATE);
-		queryProxy.setParameter(parameter, "X");
-		queryProxy.getParameterValue(parameter);
-		assertEquals(queryProxy.getParameterValue(parameter), parameter);
-		queryProxy.setParameter("dateName", calendar, TemporalType.DATE);
-		queryProxy.setParameter(2, calendar, TemporalType.DATE);
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Test
-	public void testIsBound() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		Parameter parameter = PowerMock.createMock(Parameter.class);
-		expect(queryDelegate.isBound(EasyMock.anyObject(Parameter.class))).andReturn(true);
-
-		replay(queryDelegate, parameter);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertTrue(queryProxy.isBound(parameter));
-
-		verifyAll();
-	}
-
-	@Test
-	public void testFlushMode() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		FlushModeType flushModeType = FlushModeType.AUTO;
-
-		expect(queryDelegate.setFlushMode(FlushModeType.AUTO)).andReturn(queryDelegate);
-		expect(queryDelegate.getFlushMode()).andReturn(flushModeType).anyTimes();
-
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.setFlushMode(FlushModeType.AUTO);
-		assertEquals(queryProxy.getFlushMode(), queryDelegate.getFlushMode());
-		verifyAll();
-	}
-
-	@Test
-	public void testLockMode() {
-		Query queryDelegate = PowerMock.createMock(Query.class);
-		LockModeType lockModeType = LockModeType.OPTIMISTIC;
-
-		expect(queryDelegate.setLockMode(lockModeType)).andReturn(queryDelegate);
-		expect(queryDelegate.getLockMode()).andReturn(lockModeType).anyTimes();
-
-		replay(queryDelegate);
-
-		queryProxy = new QueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		queryProxy.setLockMode(lockModeType);
-		assertEquals(queryProxy.getLockMode(), queryDelegate.getLockMode());
-		verifyAll();
-	}
-}
@@ -1,258 +0,0 @@
-package br.gov.frameworkdemoiselle.internal.proxy;
-
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import br.gov.frameworkdemoiselle.domain.Client;
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
-import br.gov.frameworkdemoiselle.util.Beans;
-
-/**
- * Test the proxied {@link Query} class, {@link TypedQueryProxy}.
- * 
- * @author 81986912515
- * @param <X>
- */
-
-@SuppressWarnings("rawtypes")
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Beans.class })
-public class TypedQueryProxyTest {
-
-	private EntityManager manager;
-
-	private EntityManagerProducer producer;
-
-	private TypedQueryProxy typedQueryProxy;
-
-	@Before
-	public void setUp() {
-
-		Map<String, Object> configOverrides = new HashMap<String, Object>();
-		configOverrides.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
-
-		configOverrides.put("javax.persistence.jdbc.url", "jdbc:hsqldb:mem:.");
-		configOverrides.put("javax.persistence.jdbc.driver", "org.hsqldb.jdbcDriver");
-		configOverrides.put("javax.persistence.jdbc.user", "sa");
-		configOverrides.put("javax.persistence.jdbc.password", "");
-
-		configOverrides.put("hibernate.show_sql", "true");
-		configOverrides.put("hibernate.hbm2ddl.auto", "create-drop");
-
-		EntityManagerFactory factory = Persistence.createEntityManagerFactory("pu1", configOverrides);
-		EntityManager delegate = factory.createEntityManager();
-
-		Map<String, EntityManager> cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
-		cache.put("pu1", delegate);
-
-		producer = new EntityManagerProducer();
-		Whitebox.setInternalState(producer, "cache", cache);
-
-		PowerMock.mockStatic(Beans.class);
-		EasyMock.expect(Beans.getReference(EntityManagerProducer.class)).andReturn(producer).anyTimes();
-		PowerMock.replayAll();
-
-		manager = new EntityManagerProxy("pu1");
-
-		// PowerMock.resetAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testResultList() {
-
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		List<String> result = new ArrayList<String>();
-		result.add("x");
-		EasyMock.expect(queryDelegate.getResultList()).andReturn(result).anyTimes();
-
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertEquals(typedQueryProxy.getResultList().size(), queryDelegate.getResultList().size());
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testSingleResult() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		String result = "Resultado";
-		EasyMock.expect(queryDelegate.getSingleResult()).andReturn(result).anyTimes();
-
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertEquals(typedQueryProxy.getSingleResult(), queryDelegate.getSingleResult());
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testPagination() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		expect(queryDelegate.getMaxResults()).andReturn(4).times(2);
-		expect(queryDelegate.getFirstResult()).andReturn(2).times(2);
-		expect(queryDelegate.setMaxResults(EasyMock.anyInt())).andReturn(queryDelegate);
-		expect(queryDelegate.setFirstResult(EasyMock.anyInt())).andReturn(queryDelegate);
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		typedQueryProxy.setMaxResults(4);
-		typedQueryProxy.setFirstResult(2);
-		assertEquals(typedQueryProxy.getMaxResults(), queryDelegate.getMaxResults());
-		assertEquals(typedQueryProxy.getFirstResult(), queryDelegate.getFirstResult());
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testHint() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		Map<String, Object> map = new HashMap<String, Object>();
-		Client client = new Client();
-		map.put("1", client);
-		expect(queryDelegate.getHints()).andReturn(map).times(2);
-		expect(queryDelegate.setHint(EasyMock.anyObject(String.class), EasyMock.anyObject())).andReturn(queryDelegate);
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		typedQueryProxy.setHint("1", client);
-		assertEquals(typedQueryProxy.getHints(), queryDelegate.getHints());
-
-		verifyAll();
-	}
-
-	@SuppressWarnings({ "unchecked", "unused" })
-	@Test
-	public void testParameters() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		Date dateValue = new Date();
-		Calendar calendar = PowerMock.createMock(Calendar.class);
-		Class<Date> type = Date.class;
-		Parameter parameter = PowerMock.createMock(Parameter.class);
-
-		expect(queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class)))
-				.andReturn(queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyObject(String.class))).andReturn("Named Parameter")
-				.anyTimes();
-		expect(queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(String.class)))
-				.andReturn(queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyInt())).andReturn("Client").anyTimes();
-		expect(
-				queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(Date.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(
-				queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(Date.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(queryDelegate.setParameter(EasyMock.anyObject(Parameter.class), EasyMock.anyObject())).andReturn(
-				queryDelegate);
-		expect(queryDelegate.getParameterValue(EasyMock.anyObject(Parameter.class))).andReturn(parameter).anyTimes();
-		expect(
-				queryDelegate.setParameter(EasyMock.anyObject(String.class), EasyMock.anyObject(Calendar.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-		expect(
-				queryDelegate.setParameter(EasyMock.anyInt(), EasyMock.anyObject(Calendar.class),
-						EasyMock.anyObject(TemporalType.class))).andReturn(queryDelegate);
-
-		replay(queryDelegate, parameter, calendar);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		typedQueryProxy.setParameter("name", "Named Parameter");
-		assertEquals(typedQueryProxy.getParameterValue("name"), queryDelegate.getParameterValue("name"));
-		typedQueryProxy.setParameter(1, "Client");
-		assertEquals(typedQueryProxy.getParameterValue("1"), queryDelegate.getParameterValue("1"));
-		typedQueryProxy.setParameter("dateName", dateValue, TemporalType.DATE);
-		typedQueryProxy.setParameter(2, dateValue, TemporalType.DATE);
-		typedQueryProxy.setParameter(parameter, "X");
-		typedQueryProxy.getParameterValue(parameter);
-		assertEquals(typedQueryProxy.getParameterValue(parameter), parameter);
-		typedQueryProxy.setParameter("dateName", calendar, TemporalType.DATE);
-		typedQueryProxy.setParameter(2, calendar, TemporalType.DATE);
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testIsBound() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		Parameter parameter = PowerMock.createMock(Parameter.class);
-		expect(queryDelegate.isBound(EasyMock.anyObject(Parameter.class))).andReturn(true);
-
-		replay(queryDelegate, parameter);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		assertTrue(typedQueryProxy.isBound(parameter));
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testFlushMode() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		FlushModeType flushModeType = FlushModeType.AUTO;
-
-		expect(queryDelegate.setFlushMode(FlushModeType.AUTO)).andReturn(queryDelegate);
-		expect(queryDelegate.getFlushMode()).andReturn(flushModeType).anyTimes();
-
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		typedQueryProxy.setFlushMode(FlushModeType.AUTO);
-		assertEquals(typedQueryProxy.getFlushMode(), queryDelegate.getFlushMode());
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testLockMode() {
-		TypedQuery queryDelegate = PowerMock.createMock(TypedQuery.class);
-		LockModeType lockModeType = LockModeType.OPTIMISTIC;
-
-		expect(queryDelegate.setLockMode(lockModeType)).andReturn(queryDelegate);
-		expect(queryDelegate.getLockMode()).andReturn(lockModeType).anyTimes();
-
-		replay(queryDelegate);
-
-		typedQueryProxy = new TypedQueryProxy(queryDelegate, (EntityManagerProxy) manager);
-		typedQueryProxy.setLockMode(lockModeType);
-		assertEquals(typedQueryProxy.getLockMode(), queryDelegate.getLockMode());
-		verifyAll();
-	}
-
-}
@@ -1,434 +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.template;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-import static org.powermock.reflect.Whitebox.setInternalState;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.Instance;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-import javax.persistence.TransactionRequiredException;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import junit.framework.Assert;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.configuration.Configuration;
-import br.gov.frameworkdemoiselle.domain.Contact;
-import br.gov.frameworkdemoiselle.internal.implementation.PaginationImpl;
-import br.gov.frameworkdemoiselle.pagination.Pagination;
-import br.gov.frameworkdemoiselle.pagination.PaginationContext;
-import br.gov.frameworkdemoiselle.util.Beans;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ ResourceBundle.class, Instance.class, Beans.class })
-public class JPACrudTest {
-
-	private EntityManager entityManager;
-
-	private Contact contact;
-
-	private ContactDAO contactDAO;
-
-	class ContactDAO extends JPACrud<Contact, Long> {
-
-		private static final long serialVersionUID = 1L;
-
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		this.entityManager = EasyMock.createMock(EntityManager.class);
-		this.contact = new Contact();
-		this.contactDAO = new ContactDAO();
-		setInternalState(this.contactDAO, EntityManager.class, this.entityManager);
-	}
-
-	@Test
-	public void testDelete() {
-		expect(this.entityManager.getReference(Contact.class, null)).andReturn(null);
-		this.entityManager.remove(null);
-		replay(this.entityManager);
-		this.contactDAO.delete(this.contact.getId());
-		verify(this.entityManager);
-	}
-	
-	private TypedQuery<Contact> makeTypedQuery() {
-		@SuppressWarnings("unchecked")
-		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
-		expect(typeQuery.setFirstResult(EasyMock.anyInt())).andReturn(null);
-		expect(typeQuery.setMaxResults(EasyMock.anyInt())).andReturn(null);
-		expect(typeQuery.getResultList()).andReturn(createContacts(1));
-		return typeQuery;
-	}
-	
-	@Test
-	public void testCountAll() {
-
-		Pagination pagination = new PaginationImpl();
-		pagination.setPageSize(10);
-		setInternalState(this.contactDAO, "pagination", pagination);
-		
-		TypedQuery<Contact> typeQuery = makeTypedQuery();		
-
-		Query query = EasyMock.createMock(Query.class);
-		expect(query.getSingleResult()).andReturn(10L);
-		
-		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
-		//expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);
-		expect(this.entityManager.createQuery("select COUNT(this) from Contact this")).andReturn(query);
-
-		replayAll(typeQuery, query, this.entityManager);
-
-		List<Contact> find = this.contactDAO.findAll();
-
-		assertEquals(1, find.size());
-		assertTrue(find.iterator().next().getId().equals(1L));
-
-		verifyAll();
-	}
-
-	@Test
-	public void testFailCountAll() {
-
-		Pagination pagination = new PaginationImpl();
-		setInternalState(this.contactDAO, "pagination", pagination);
-
-		TypedQuery<Contact> typeQuery = makeTypedQuery();		
-		
-		Query query = EasyMock.createMock(Query.class);
-
-		expect(query.getSingleResult()).andThrow(new DemoiselleException(""));
-		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
-		expect(this.entityManager.createQuery("select COUNT(this) from Contact this")).andReturn(query);	
-
-		replayAll(query, this.entityManager);
-
-		try {
-			this.contactDAO.findAll();
-			fail();
-		} catch (DemoiselleException exception) {
-		}
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testHandleException() throws Throwable {
-		try {
-			TransactionRequiredException throwed = new TransactionRequiredException();
-			ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
-			Instance<ResourceBundle> instance = PowerMock.createMock(Instance.class);
-			expect(
-					bundle.getString("no-transaction-active", "frameworkdemoiselle.transaction.class",
-							Configuration.DEFAULT_RESOURCE)).andReturn("message");
-			expect(instance.get()).andReturn(bundle);
-			setInternalState(contactDAO, "bundle", instance);
-			replayAll();
-			contactDAO.handleException(throwed);
-			fail();
-		} catch (DemoiselleException exception) {
-			assertEquals(exception.getMessage(), "message");
-		}
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testFailFindByExample() {
-
-		CriteriaBuilder criteriaBuilder = PowerMock.createMock(CriteriaBuilder.class);
-		CriteriaQuery<Contact> criteriaQuery = PowerMock.createMock(CriteriaQuery.class);
-		Root<Contact> root = PowerMock.createMock(Root.class);
-
-		expect(this.entityManager.getCriteriaBuilder()).andReturn(criteriaBuilder);
-		expect(criteriaBuilder.createQuery(Contact.class)).andReturn(criteriaQuery);
-		expect(criteriaQuery.from(Contact.class)).andReturn(root);
-
-		expect(this.entityManager.createQuery(criteriaQuery)).andThrow(new DemoiselleException(""));
-
-		Predicate predicate = PowerMock.createMock(Predicate.class);
-
-		expect(root.get("id")).andReturn(null);
-		expect(criteriaBuilder.equal(EasyMock.anyObject(Predicate.class), EasyMock.anyObject())).andReturn(predicate);
-		expect(criteriaQuery.where(new Predicate[] { EasyMock.anyObject(Predicate.class) })).andReturn(criteriaQuery);
-		expect(criteriaQuery.select(EasyMock.anyObject(Root.class))).andReturn(criteriaQuery);
-
-		replayAll(criteriaBuilder, criteriaQuery, root, this.entityManager);
-
-		Contact example = new Contact();
-		example.setId(1L);
-		try {
-			this.contactDAO.findByExample(example);
-			fail();
-		} catch (DemoiselleException ce) {
-		}
-
-		verifyAll();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testFindByExample() {
-
-		TypedQuery<Contact> typedQuery = EasyMock.createMock(TypedQuery.class);
-		CriteriaBuilder criteriaBuilder = PowerMock.createMock(CriteriaBuilder.class);
-		CriteriaQuery<Contact> criteriaQuery = PowerMock.createMock(CriteriaQuery.class);
-		Root<Contact> root = PowerMock.createMock(Root.class);
-
-		expect(this.entityManager.getCriteriaBuilder()).andReturn(criteriaBuilder);
-		expect(criteriaBuilder.createQuery(Contact.class)).andReturn(criteriaQuery);
-		expect(criteriaQuery.from(Contact.class)).andReturn(root);
-
-		expect(this.entityManager.createQuery(criteriaQuery)).andReturn(typedQuery);
-		expect(typedQuery.getResultList()).andReturn(createContacts(1));
-
-		Predicate predicate = PowerMock.createMock(Predicate.class);
-
-		expect(root.get("id")).andReturn(null);
-		expect(criteriaBuilder.equal(EasyMock.anyObject(Predicate.class), EasyMock.anyObject())).andReturn(predicate);
-		expect(criteriaQuery.where(new Predicate[] { EasyMock.anyObject(Predicate.class) })).andReturn(criteriaQuery);
-		expect(criteriaQuery.select(EasyMock.anyObject(Root.class))).andReturn(criteriaQuery);
-
-		replayAll(typedQuery, criteriaBuilder, criteriaQuery, root, this.entityManager);
-
-		Contact example = new Contact();
-		example.setId(1L);
-		List<Contact> find = this.contactDAO.findByExample(example);
-
-		assertEquals(1, find.size());
-		assertTrue(find.iterator().next().getId().equals(1L));
-
-		verifyAll();
-	}
-
-	@Test
-	public void testFindAll() {
-		
-		Pagination pagination = new PaginationImpl();
-		pagination.setPageSize(10);
-		setInternalState(this.contactDAO, "pagination", pagination);
-		
-		TypedQuery<Contact> typeQuery = makeTypedQuery();		
-
-		Query query = EasyMock.createMock(Query.class);
-		expect(query.getSingleResult()).andReturn(10L);
-		
-		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
-		expect(this.entityManager.createQuery("select COUNT(this) from Contact this")).andReturn(query);		
-
-		replayAll(typeQuery, query, this.entityManager);
-
-		List<Contact> find = this.contactDAO.findAll();
-
-		assertEquals(1, find.size());
-		assertTrue(find.iterator().next().getId().equals(1L));
-		
-		verifyAll();
-	}
-
-	@Test
-	public void testFailFindAll() {
-
-		PaginationContext actualContext = PowerMock.createMock(PaginationContext.class);
-		expect(actualContext.getPagination(Contact.class)).andReturn(null);
-		/*@SuppressWarnings("unchecked")
-		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
-		expect(paginationContext.get()).andReturn(actualContext);*/
-		
-		PowerMock.mockStatic(Beans.class);
-		expect(Beans.getReference(PaginationContext.class)).andReturn(actualContext);
-		
-		@SuppressWarnings("unchecked")
-		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
-		expect(typeQuery.getResultList()).andThrow(new DemoiselleException(""));
-
-		Query query = EasyMock.createMock(Query.class);
-		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);		
-
-		replayAll(typeQuery, query, this.entityManager);
-
-		try {
-			this.contactDAO.findAll();
-			fail();
-		} catch (DemoiselleException exception) {
-		}
-
-		verifyAll();
-	}
-
-	private List<Contact> createContacts(int quantity) {
-		List<Contact> contacts = new ArrayList<Contact>();
-		for (int i = 0; i < quantity; i++) {
-			Contact contact = new Contact();
-			contact.setId((long) quantity);
-			contacts.add(contact);
-		}
-		return contacts;
-	}
-
-	@Test
-	public void testFailInsert() {
-		this.entityManager.persist(null);
-		EasyMock.expectLastCall().andThrow(new DemoiselleException(""));
-		replay(this.entityManager);
-		try {
-			this.contactDAO.insert(null);
-			fail();
-		} catch (DemoiselleException exc) {
-		}
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testInsert() {
-		this.entityManager.persist(this.contact);
-		replay(this.entityManager);
-		setInternalState(this.contactDAO, EntityManager.class, this.entityManager);
-		this.contactDAO.insert(this.contact);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testLoad() {
-		Contact contact = new Contact();
-		expect(this.entityManager.find(Contact.class, 1L)).andReturn(contact);
-		replay(this.entityManager);
-		Contact returnedContact = this.contactDAO.load(1L);
-		assertEquals(contact.hashCode(), returnedContact.hashCode());
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFailLoad() {
-		expect(this.entityManager.find(Contact.class, 1L)).andThrow(new DemoiselleException(""));
-		replay(this.entityManager);
-		try {
-			this.contactDAO.load(1L);
-			fail();
-		} catch (DemoiselleException exc) {
-		}
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testUpdate() {
-		expect(this.entityManager.merge(this.contact)).andReturn(null);
-		replay(this.entityManager);
-		setInternalState(this.contactDAO, EntityManager.class, this.entityManager);
-		this.contactDAO.update(this.contact);
-		verify(this.entityManager);
-	}
-
-	@Test
-	public void testFailUpdate() {
-		this.entityManager.merge(null);
-		EasyMock.expectLastCall().andThrow(new DemoiselleException(""));
-		replay(this.entityManager);
-		try {
-			this.contactDAO.update(null);
-			fail();
-		} catch (DemoiselleException exc) {
-		}
-		verify(this.entityManager);
-	}
-	
-	/**
-	 * Test if the JPACrud will correctly obtain a new entity manager the first
-	 * time it is called and the entity manager is still null.
-	 */
-	@Test
-	public void testCreateEntityManagerIfNotExist(){
-		PowerMock.mockStatic(Beans.class);
-		expect(Beans.getReference(EntityManager.class)).andReturn(entityManager);
-		PowerMock.replay(Beans.class);
-		
-		setInternalState(this.contactDAO, EntityManager.class, (EntityManager)null);
-		Assert.assertNotNull(this.contactDAO.getEntityManager());
-	}
-	
-	@Test
-	public void testCriteriaQuery(){
-		Map<String, Object> configOverrides = new HashMap<String, Object>();
-		configOverrides.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
-		configOverrides.put("javax.persistence.jdbc.url", "jdbc:hsqldb:hsql:.");
-		configOverrides.put("hibernate.show_sql", "true");
-		configOverrides.put("hibernate.hbm2ddl.auto", "create-drop");
-		
-		EntityManagerFactory factory = Persistence.createEntityManagerFactory("pu1", configOverrides);
-		this.entityManager = factory.createEntityManager();
-		Whitebox.setInternalState(this.contactDAO, EntityManager.class, (EntityManager)null);
-		
-		PowerMock.mockStatic(Beans.class);
-		expect(Beans.getReference(EntityManager.class)).andReturn(entityManager);
-		PowerMock.replay(Beans.class);
-		
-		CriteriaQuery<Contact> query = this.contactDAO.createCriteriaQuery();
-		query.select( query.from(Contact.class) );
-
-	}
-
-}
@@ -1,222 +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.transaction;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.easymock.PowerMock.replayAll;
-import static org.powermock.api.easymock.PowerMock.verifyAll;
-import static org.powermock.reflect.Whitebox.setInternalState;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.omg.CORBA.SystemException;
-
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
-
-/**
- * @author SERPRO
- * @see JPATransaction
- */
-public class JPATransactionTest {
-
-	private JPATransaction tx;
-
-	private EntityManager em;
-
-	private EntityTransaction et;
-
-	private Map<String, EntityManager> cache;
-
-	private EntityManagerProducer producer;
-
-	@Before
-	public void setUp() {
-		et = createMock(EntityTransaction.class);
-		em = createMock(EntityManager.class);
-		cache = new HashMap<String, EntityManager>();
-		producer = EasyMock.createMock(EntityManagerProducer.class);
-
-		tx = new JPATransaction();
-		setInternalState(tx, EntityManagerProducer.class, producer);
-	}
-
-	@After
-	public void tearDown() {
-		tx = null;
-		em = null;
-		et = null;
-		cache = null;
-		producer = null;
-	}
-
-	@Test
-	public void testBegin() throws SystemException {
-		et.begin();
-		expect(et.isActive()).andReturn(false);
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		tx.begin();
-		verifyAll();
-	}
-
-	@Test
-	public void testCommit() throws Exception {
-		et.commit();
-		expect(et.isActive()).andReturn(true);
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		tx.commit();
-		verifyAll();
-	}
-
-	@Test
-	public void testRollback() throws Exception {
-		et.rollback();
-		expect(et.isActive()).andReturn(true);
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		em.clear();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		tx.rollback();
-		verifyAll();
-	}
-
-	@Test
-	public void testSetRollbackOnly() throws Exception {
-		et.setRollbackOnly();
-		expect(et.isActive()).andReturn(true);
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		tx.setRollbackOnly();
-		verifyAll();
-	}
-
-	@Test
-	public void testIsActiveTrue() throws Exception {
-		expect(et.isActive()).andReturn(true).anyTimes();
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		assertEquals(true, tx.isActive());
-		verifyAll();
-	}
-
-	@Test
-	public void testIsActiveFalse() throws Exception {
-		expect(et.isActive()).andReturn(false).anyTimes();
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		assertEquals(false, tx.isActive());
-		verifyAll();
-	}
-
-	@Test
-	public void testIsMarkedRollbackTrue() throws Exception {
-		expect(et.isActive()).andReturn(true);
-		expect(et.getRollbackOnly()).andReturn(true).anyTimes();
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		assertEquals(true, tx.isMarkedRollback());
-		verifyAll();
-	}
-
-	@Test
-	public void testIsMarkedRollbackFalse() throws Exception {
-		expect(et.isActive()).andReturn(true);
-		expect(et.getRollbackOnly()).andReturn(false).anyTimes();
-		expect(em.getTransaction()).andReturn(et).anyTimes();
-		cache.put("teste", em);
-		expect(producer.getCache()).andReturn(cache);
-		replay(producer);
-		replayAll();
-		replay(em);
-		replay(et);
-
-		assertEquals(false, tx.isMarkedRollback());
-		verifyAll();
-	}
-}
@@ -0,0 +1,84 @@
+package template;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+
+@RunWith(Arquillian.class)
+public class JPACrudTest {
+
+	private static final String PATH = "src/test/resources/template";
+
+	@Inject
+	private MyCrud crud;
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		WebArchive deployment = Tests.createDeployment(JPACrudTest.class);
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
+
+		return deployment;
+	}
+
+	@Test
+	public void x() {
+
+	}
+
+	@Test
+	public void successfullyInserted() {
+		populate(1, 0);
+
+		MyEntity persisted = crud.load(createId("id-1"));
+		assertNotNull(persisted);
+	}
+
+	@Test
+	public void successfullyDeleted() {
+		populate(1, 10);
+
+		crud.delete(createId("id-11"));
+		MyEntity persisted = crud.load(createId("id-11"));
+		assertNull(persisted);
+	}
+
+	@Test
+	public void successfullyUpdated() {
+		populate(1, 20);
+
+		MyEntity persisted;
+		persisted = crud.load(createId("id-21"));
+		persisted.setDescription("update example");
+
+		crud.update(persisted);
+		persisted = crud.load(createId("id-21"));
+
+		assertEquals("update example", persisted.getDescription());
+	}
+
+	private void populate(int size, int offset) {
+		MyEntity entity;
+
+		for (int i = 0; i < size; i++) {
+			entity = new MyEntity();
+			entity.setId(createId("id-" + (i + 1 + offset)));
+			entity.setDescription("desc-" + (i + 1 + offset));
+
+			crud.insert(entity);
+		}
+	}
+
+	private String createId(String id) {
+		return this.getClass().getName() + "_" + id;
+	}
+}
@@ -0,0 +1,9 @@
+package template;
+
+import br.gov.frameworkdemoiselle.template.JPACrud;
+
+public class MyCrud extends JPACrud<MyEntity, String> {
+
+	private static final long serialVersionUID = 1L;
+
+}
@@ -0,0 +1,29 @@
+package template;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyEntity {
+
+	@Id
+	private String id;
+
+	private String description;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}
@@ -0,0 +1,102 @@
+/*
+ * 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 test;
+
+import java.io.File;
+import java.util.Locale;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Ignore;
+
+import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
+import br.gov.frameworkdemoiselle.internal.producer.EntityManagerFactoryProducer;
+import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
+import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
+import br.gov.frameworkdemoiselle.internal.proxy.QueryProxy;
+import br.gov.frameworkdemoiselle.internal.proxy.TypedQueryProxy;
+import br.gov.frameworkdemoiselle.template.JPACrud;
+import br.gov.frameworkdemoiselle.transaction.JPATransaction;
+
+@Ignore
+public final class Tests {
+
+	private Tests() {
+	}
+
+	public static WebArchive createDeployment(final Class<?> baseClass) {
+		return createDeployment().addPackages(true, baseClass.getPackage());
+	}
+
+	public static WebArchive createDeployment() {
+		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
+				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
+
+		return ShrinkWrap
+				.create(WebArchive.class)
+				.addClass(Tests.class)
+				.addClass(EntityManagerConfig.class)
+				.addClass(EntityManagerFactoryProducer.class)
+				.addClass(EntityManagerProducer.class)
+				.addClass(EntityManagerProxy.class)
+				.addClass(QueryProxy.class)
+				.addClass(TypedQueryProxy.class)
+				.addClass(JPACrud.class)
+				.addClass(JPATransaction.class)
+				.addAsResource(createFileAsset("src/main/resources/demoiselle-jpa-bundle.properties"),
+						"demoiselle-jpa-bundle.properties")
+				.addAsResource(createFileAsset("src/test/resources/logging.properties"), "logging.properties")
+				.addAsLibraries(libs)
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
+				.addAsLibraries(libs);
+	}
+
+	public static FileAsset createFileAsset(final String pathname) {
+		return new FileAsset(new File(pathname));
+	}
+
+	@Default
+	@Produces
+	public Locale create() {
+		return Locale.getDefault();
+	}
+}
@@ -0,0 +1,127 @@
+package transaction.manual;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.TransactionRequiredException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+import br.gov.frameworkdemoiselle.annotation.Name;
+import br.gov.frameworkdemoiselle.transaction.JPATransaction;
+import br.gov.frameworkdemoiselle.transaction.Transaction;
+import br.gov.frameworkdemoiselle.transaction.TransactionContext;
+
+@RunWith(Arquillian.class)
+public class JPATransactionTest {
+
+	private static final String PATH = "src/test/resources/transaction/manual";
+
+	@Inject
+	private TransactionContext transactionContext;
+
+	@Inject
+	@Name("pu1")
+	private EntityManager em1;
+
+	@Inject
+	@Name("pu2")
+	private EntityManager em2;
+
+	@Deployment(testable = true)
+	public static WebArchive createDeployment() {
+		WebArchive deployment = Tests.createDeployment(JPATransactionTest.class);
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
+
+		return deployment;
+	}
+
+	@Test
+	public void checkJPATransactionType() {
+		assertEquals(JPATransaction.class, transactionContext.getCurrentTransaction().getClass());
+	}
+
+	@Test
+	public void commitWithSuccess() {
+		Transaction transaction = transactionContext.getCurrentTransaction();
+
+		MyEntity1 entity1 = new MyEntity1();
+		entity1.setId(createId("id-1"));
+		entity1.setDescription("desc-1");
+
+		MyEntity2 entity2 = new MyEntity2();
+		entity2.setId(createId("id-2"));
+		entity2.setDescription("desc-2");
+
+		assertFalse(transaction.isActive());
+		transaction.begin();
+		assertTrue(transaction.isActive());
+
+		em1.persist(entity1);
+		em2.persist(entity2);
+		transaction.commit();
+		em1.clear();
+		em2.clear();
+
+		MyEntity1 persisted1 = em1.find(MyEntity1.class, createId("id-1"));
+		MyEntity2 persisted2 = em2.find(MyEntity2.class, createId("id-2"));
+
+		assertEquals("desc-1", persisted1.getDescription());
+		assertEquals("desc-2", persisted2.getDescription());
+	}
+
+	@Test(expected = TransactionRequiredException.class)
+	public void checkNoTransactionAutomaticallyLoaded() {
+		MyEntity1 entity = new MyEntity1();
+		entity.setId(createId("id-2"));
+
+		em1.persist(entity);
+		em1.flush();
+	}
+
+	@Test
+	public void rollbackWithSuccess() {
+		Transaction transaction = transactionContext.getCurrentTransaction();
+
+		MyEntity1 entity1 = new MyEntity1();
+		entity1.setId(createId("id-3"));
+
+		MyEntity2 entity2 = new MyEntity2();
+		entity2.setId(createId("id-4"));
+
+		assertFalse(transaction.isMarkedRollback());
+		transaction.begin();
+		assertTrue(transaction.isActive());
+
+		em1.persist(entity1);
+		em2.persist(entity2);
+		em1.flush();
+		em2.flush();
+		transaction.setRollbackOnly();
+
+		if (transaction.isMarkedRollback()) {
+			transaction.rollback();
+		}
+
+		em1.clear();
+		em2.clear();
+
+		MyEntity1 persisted1 = em1.find(MyEntity1.class, createId("id-3"));
+		MyEntity2 persisted2 = em2.find(MyEntity2.class, createId("id-4"));
+		assertNull(persisted1);
+		assertNull(persisted2);
+	}
+
+	private String createId(String id) {
+		return this.getClass().getName() + "_" + id;
+	}
+}
@@ -0,0 +1,29 @@
+package transaction.manual;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyEntity1 {
+
+	@Id
+	private String id;
+
+	private String description;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}
	@@ -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-archetype-parent</artifactId>	47	<artifactId>demoiselle-archetype-parent</artifactId>
48	- <version>2.4.0-BETA3-SNAPSHOT</version>	48	+ <version>2.4.0-BETA4-SNAPSHOT</version>
49	<relativePath>../../parent/archetype</relativePath>	49	<relativePath>../../parent/archetype</relativePath>
50	</parent>	50	</parent>
51		51
	@@ -40,12 +40,12 @@		@@ -40,12 +40,12 @@
40		40
41	<artifactId>demoiselle-framework-quickstart</artifactId>	41	<artifactId>demoiselle-framework-quickstart</artifactId>
42	<packaging>jdocbook</packaging>	42	<packaging>jdocbook</packaging>
43	- <version>2.4.0-BETA3-SNAPSHOT</version>	43	+ <version>2.4.0-BETA4-SNAPSHOT</version>
44		44
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</version>
49	<relativePath>../../../internal/parent/documentation</relativePath>	49	<relativePath>../../../internal/parent/documentation</relativePath>
50	</parent>	50	</parent>
51		51
	@@ -40,12 +40,12 @@		@@ -40,12 +40,12 @@
40		40
41	<artifactId>demoiselle-framework-reference</artifactId>	41	<artifactId>demoiselle-framework-reference</artifactId>
42	<packaging>jdocbook</packaging>	42	<packaging>jdocbook</packaging>
43	- <version>2.4.0-BETA3-SNAPSHOT</version>	43	+ <version>2.4.0-BETA4-SNAPSHOT</version>
44		44
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</version>
49	<relativePath>../../../internal/parent/documentation</relativePath>	49	<relativePath>../../../internal/parent/documentation</relativePath>
50	</parent>	50	</parent>
51		51
	@@ -44,7 +44,7 @@		@@ -44,7 +44,7 @@
44	<parent>	44	<parent>
45	<groupId>br.gov.frameworkdemoiselle</groupId>	45	<groupId>br.gov.frameworkdemoiselle</groupId>
46	<artifactId>demoiselle-framework-parent</artifactId>	46	<artifactId>demoiselle-framework-parent</artifactId>
47	- <version>2.4.0-BETA3-SNAPSHOT</version>	47	+ <version>2.4.0-BETA4-SNAPSHOT</version>
48	<relativePath>../../parent/framework</relativePath>	48	<relativePath>../../parent/framework</relativePath>
49	</parent>	49	</parent>
50		50
	@@ -72,7 +72,7 @@		@@ -72,7 +72,7 @@
72	<dependency>	72	<dependency>
73	<groupId>br.gov.frameworkdemoiselle</groupId>	73	<groupId>br.gov.frameworkdemoiselle</groupId>
74	<artifactId>demoiselle-framework-bom</artifactId>	74	<artifactId>demoiselle-framework-bom</artifactId>
75	- <version>2.4.0-BETA3-SNAPSHOT</version>	75	+ <version>2.4.0-BETA4-SNAPSHOT</version>
76	<scope>import</scope>	76	<scope>import</scope>
77	<type>pom</type>	77	<type>pom</type>
78	</dependency>	78	</dependency>
	@@ -98,20 +98,59 @@		@@ -98,20 +98,59 @@
98	<artifactId>cobertura-maven-plugin</artifactId>	98	<artifactId>cobertura-maven-plugin</artifactId>
99	</plugin>	99	</plugin>
100		100
101	- <!-- <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId>
102	- <version>${jacoco.version}</version> <executions> <execution> <goals> <goal>prepare-agent</goal>
103	- </goals> </execution> <execution> <id>report</id> <phase>prepare-package</phase>
104	- <goals> <goal>report</goal> </goals> </execution> </executions> </plugin> -->	101	+ <!--
		102	+ <plugin>
		103	+ <groupId>org.jacoco</groupId>
		104	+ <artifactId>jacoco-maven-plugin</artifactId>
		105	+ <version>${jacoco.version}</version>
		106	+ <executions>
		107	+ <execution>
		108	+ <goals>
		109	+ <goal>prepare-agent</goal>
		110	+ </goals>
		111	+ </execution>
		112	+ <execution>
		113	+ <id>report</id>
		114	+ <phase>prepare-package</phase>
		115	+ <goals>
		116	+ <goal>report</goal>
		117	+ </goals>
		118	+ </execution>
		119	+ </executions>
		120	+ </plugin>
		121	+ -->
105	</plugins>	122	</plugins>
106		123
107	- <!-- <pluginManagement> <plugins> <plugin> <groupId>org.eclipse.m2e</groupId>
108	- <artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> <configuration>
109	- <lifecycleMappingMetadata> <pluginExecutions> <pluginExecution> <pluginExecutionFilter>
110	- <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId>
111	- <versionRange>[${jacoco.version},)</versionRange> <goals> <goal>prepare-agent</goal>
112	- </goals> </pluginExecutionFilter> <action> <ignore></ignore> </action> </pluginExecution>
113	- </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin>
114	- </plugins> </pluginManagement> -->	124	+ <!--
		125	+ <pluginManagement>
		126	+ <plugins>
		127	+ <plugin>
		128	+ <groupId>org.eclipse.m2e</groupId>
		129	+ <artifactId>lifecycle-mapping</artifactId>
		130	+ <version>1.0.0</version>
		131	+ <configuration>
		132	+ <lifecycleMappingMetadata>
		133	+ <pluginExecutions>
		134	+ <pluginExecution>
		135	+ <pluginExecutionFilter>
		136	+ <groupId>org.jacoco</groupId>
		137	+ <artifactId>jacoco-maven-plugin</artifactId>
		138	+ <versionRange>[${jacoco.version},)</versionRange>
		139	+ <goals>
		140	+ <goal>prepare-agent</goal>
		141	+ </goals>
		142	+ </pluginExecutionFilter>
		143	+ <action>
		144	+ <ignore></ignore>
		145	+ </action>
		146	+ </pluginExecution>
		147	+ </pluginExecutions>
		148	+ </lifecycleMappingMetadata>
		149	+ </configuration>
		150	+ </plugin>
		151	+ </plugins>
		152	+ </pluginManagement>
		153	+ -->
115	</build>	154	</build>
116		155
117	<dependencies>	156	<dependencies>
	@@ -163,27 +202,44 @@		@@ -163,27 +202,44 @@
163	<scope>test</scope>	202	<scope>test</scope>
164	</dependency>	203	</dependency>
165	<dependency>	204	<dependency>
		205	+ <groupId>org.slf4j</groupId>
		206	+ <artifactId>slf4j-log4j12</artifactId>
		207	+ <scope>test</scope>
		208	+ </dependency>
		209	+
		210	+ <!--
		211	+ <dependency>
166	<groupId>javax.servlet</groupId>	212	<groupId>javax.servlet</groupId>
167	<artifactId>servlet-api</artifactId>	213	<artifactId>servlet-api</artifactId>
168	<scope>test</scope>	214	<scope>test</scope>
169	</dependency>	215	</dependency>
170		216
171	- <!-- <dependency> <groupId>org.jboss.arquillian.extension</groupId> <artifactId>arquillian-jacoco</artifactId>
172	- <version>1.0.0.Alpha5</version> <scope>test</scope> </dependency> <dependency>
173	- <groupId>org.jacoco</groupId> <artifactId>org.jacoco.core</artifactId> <version>${jacoco.version}</version>
174	- <scope>test</scope> </dependency> -->
175	-
176	- <!-- <dependency> <groupId>org.jboss.shrinkwrap.descriptors</groupId> <artifactId>shrinkwrap-descriptors-spi</artifactId>
177	- <version>2.0.0-alpha-4</version> <scope>test</scope> </dependency> -->
178	-
179	- <!-- <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId>
180	- <scope>test</scope> </dependency> -->
181	<dependency>	217	<dependency>
182	- <groupId>org.slf4j</groupId>
183	- <artifactId>slf4j-log4j12</artifactId>	218	+ <groupId>org.jboss.arquillian.extension</groupId>
		219	+ <artifactId>arquillian-jacoco</artifactId>
		220	+ <version>1.0.0.Alpha5</version>
		221	+ <scope>test</scope>
		222	+ </dependency>
		223	+ <dependency>
		224	+ <groupId>org.jacoco</groupId>
		225	+ <artifactId>org.jacoco.core</artifactId>
		226	+ <version>${jacoco.version}</version>
		227	+ <scope>test</scope>
		228	+ </dependency>
		229	+
		230	+ <dependency>
		231	+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
		232	+ <artifactId>shrinkwrap-descriptors-spi</artifactId>
		233	+ <version>2.0.0-alpha-4</version>
184	<scope>test</scope>	234	<scope>test</scope>
185	</dependency>	235	</dependency>
186		236
		237	+ <dependency>
		238	+ <groupId>javax.el</groupId>
		239	+ <artifactId>el-api</artifactId>
		240	+ <scope>test</scope>
		241	+ </dependency>
		242	+ -->
187	</dependencies>	243	</dependencies>
188		244
189	<repositories>	245	<repositories>
	@@ -42,6 +42,15 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;		@@ -42,6 +42,15 @@ 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	+/**
		46	+ * <p>
		47	+ * Should be used only in attributes of configuration classes (those annotated with @Configuration).
		48	+ * </p>
		49	+ * When an attribute in a configuration class is annotated with @Ignore, that attribute is not
		50	+ * </br>considerated in loading of configurations.
		51	+ *
		52	+ * @author SERPRO
		53	+ */
45	@Target(FIELD)	54	@Target(FIELD)
46	@Retention(RUNTIME)	55	@Retention(RUNTIME)
47	public @interface Ignore {	56	public @interface Ignore {
	@@ -49,6 +49,40 @@ import java.lang.annotation.Target;		@@ -49,6 +49,40 @@ import java.lang.annotation.Target;
49	import javax.enterprise.util.Nonbinding;	49	import javax.enterprise.util.Nonbinding;
50	import javax.inject.Qualifier;	50	import javax.inject.Qualifier;
51		51
		52	+/**
		53	+ * This annotation is used to make passible:
		54	+ *
		55	+ * <ul>
		56	+ * <li>map an attribute that belongs to a configuration class in a key with a different name of this attribute</li>
		57	+ * <li>map a Resource Bundle object to a file with different name of this object</li>
		58	+ * </ul>
		59	+ *
		60	+ * <p>
		61	+ * The examples below shows how these annotation could be used:
		62	+ * <p>
		63	+ *
		64	+ * <blockquote>
		65	+ *
		66	+ * <pre>
		67	+ * public class NameConfig {
		68	+ *
		69	+ * @Name("other.name.attrib")
		70	+ * private int nameOfAttribute;
		71	+ * ...
		72	+ * }
		73	+ *
		74	+ * public class NameResourceBundle {
		75	+ *
		76	+ * @Name("other.name.bundle")
		77	+ * @Inject
		78	+ * private ResourceBundle bundle;
		79	+ * ...
		80	+ * }
		81	+ * </pre>
		82	+ * </blockquote>
		83	+ *
		84	+ * @author SERPRO
		85	+ */
52	@Qualifier	86	@Qualifier
53	@Inherited	87	@Inherited
54	@Retention(RUNTIME)	88	@Retention(RUNTIME)
	@@ -40,9 +40,37 @@ import java.lang.reflect.Field;		@@ -40,9 +40,37 @@ import java.lang.reflect.Field;
40		40
41	import org.apache.commons.configuration.Configuration;	41	import org.apache.commons.configuration.Configuration;
42		42
		43	+/**
		44	+ * Interface that defining the way to extract the values of configurations attributes from property file.
		45	+ * It should be implemented if is wanted to extract values of a configuration attribute, in a different way or
		46	+ * for a type not yet offered by Demoiselle Framework.
		47	+ *
		48	+ * @author SERPRO
		49	+ */
43	public interface ConfigurationValueExtractor {	50	public interface ConfigurationValueExtractor {
44		51
		52	+ /**
		53	+ * Method that must appropriately extract the value from a property file and set this value to a
		54	+ * field in a configuration class.
		55	+ *
		56	+ * @param prefix
		57	+ * optional parte of property name that must be concatenated with <b>key</b> to form the whole
		58	+ * property name.
		59	+ * @param key
		60	+ * key of the property.
		61	+ * @param field
		62	+ * configuration field to be setted.
		63	+ * @param configuration
		64	+ * a configuration object.
		65	+ */
45	Object getValue(String prefix, String key, Field field, Configuration configuration) throws Exception;	66	Object getValue(String prefix, String key, Field field, Configuration configuration) throws Exception;
46		67
		68	+ /**
		69	+ * Checks if the extractor class is appropriate to extract values to the type of deffined by parameter
		70	+ * <b>field</b>.
		71	+ *
		72	+ * @param field
		73	+ * field to be checked.
		74	+ */
47	boolean isSupported(Field field);	75	boolean isSupported(Field field);
48	}	76	}
	@@ -57,6 +57,57 @@ import br.gov.frameworkdemoiselle.util.Beans;		@@ -57,6 +57,57 @@ import br.gov.frameworkdemoiselle.util.Beans;
57	import br.gov.frameworkdemoiselle.util.NameQualifier;	57	import br.gov.frameworkdemoiselle.util.NameQualifier;
58	import br.gov.frameworkdemoiselle.util.ResourceBundle;	58	import br.gov.frameworkdemoiselle.util.ResourceBundle;
59		59
		60	+/**
		61	+ * <p>
		62	+ * Intercepts some thrown exceptions, and calls the appropriate method. These interceptor works only in
		63	+ * classes annotated with <b>@Contoller</b>. Above we discribe which kind of exception is intercepted and
		64	+ * what is an appropriate method.
		65	+ * <p>
		66	+ * To be interceptable, the thrown exception must be from a type which is annotated with
		67	+ * <b>@ApplicationException</b>.
		68	+ * <p>
		69	+ * An appropriate method must be annotated with <b>@ExceptionHandler</b>, and receive as parameter some
		70	+ * exception that could be thrown for it's class (which have to be annotated with <b>@ApplicationException</b>).
		71	+ * So, when this method is called, it's receive the thrown exception as parameter. In the same class shouldn't
		72	+ * be more than one method annotated with <b>@ExceptionHandler</b> and receiving the same type of exception.
		73	+ * <p>
		74	+ * <p>
		75	+ * The examples below shows how these interceptor works:
		76	+ * <p>
		77	+ *
		78	+ * <blockquote>
		79	+ *
		80	+ * <pre>
		81	+ * @ApplicationException
		82	+ * public class CustomException extends RuntimeException {
		83	+ * }
		84	+ *
		85	+ * @Controller
		86	+ * public class CustomExceptionHandler {
		87	+ *
		88	+ * public void throwException() {
		89	+ * throw new CustomException();
		90	+ * }
		91	+ *
		92	+ * @ExceptionHandler
		93	+ * public void handler(CustomException exception) {
		94	+ * ...
		95	+ * }
		96	+ *
		97	+ * }
		98	+ * </pre>
		99	+ * </blockquote>
		100	+ *
		101	+ * <p>
		102	+ * When the method <b>throwException</b> throw a <b>CustomException</b>, once CustomException is annotated
		103	+ * with @ApplicationException and CustomExceptionHandle is annotated with @Controller, the interceptor will
		104	+ * looking for some method (in CustomExceptionHandle) annotated with @ExceptionHandle and that receive a
		105	+ * CustomException as parameter to call. In the case shown, the method <b>handler</b> is called when a
		106	+ * <b>CustomException</b> is thrown.
		107	+ * <p>
		108	+ *
		109	+ * @author SERPRO
		110	+ */
60	@Interceptor	111	@Interceptor
61	@Controller	112	@Controller
62	public class ExceptionHandlerInterceptor implements Serializable {	113	public class ExceptionHandlerInterceptor implements Serializable {
	@@ -68,7 +119,7 @@ public class ExceptionHandlerInterceptor implements Serializable {		@@ -68,7 +119,7 @@ public class ExceptionHandlerInterceptor implements Serializable {
68	private static transient Logger logger;	119	private static transient Logger logger;
69		120
70	private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();	121	private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();
71	-	122	+
72	private boolean handleException(final Exception cause, final Object target) throws Exception {	123	private boolean handleException(final Exception cause, final Object target) throws Exception {
73	getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName()));	124	getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName()));
74		125
	@@ -48,7 +48,7 @@ public class ManagementBootstrap implements Extension {		@@ -48,7 +48,7 @@ public class ManagementBootstrap implements Extension {
48		48
49	@SuppressWarnings("unchecked")	49	@SuppressWarnings("unchecked")
50	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event, BeanManager beanManager) {	50	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event, BeanManager beanManager) {
51	- ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());	51	+ ResourceBundle bundle = new ResourceBundleProducer().create("demoiselle-core-bundle", Locale.getDefault());
52		52
53	Management monitoringManager = Beans.getReference(Management.class);	53	Management monitoringManager = Beans.getReference(Management.class);
54	for (AnnotatedType<?> type : types) {	54	for (AnnotatedType<?> type : types) {
	@@ -77,7 +77,7 @@ public class ManagedType {		@@ -77,7 +77,7 @@ public class ManagedType {
77	private String description;	77	private String description;
78		78
79	public ManagedType(Class<?> type) {	79	public ManagedType(Class<?> type) {
80	- bundle = ResourceBundleProducer.create("demoiselle-core-bundle");	80	+ bundle = new ResourceBundleProducer().create("demoiselle-core-bundle");
81		81
82	if (type == null) {	82	if (type == null) {
83	throw new DemoiselleException(bundle.getString("management-null-class-defined"));	83	throw new DemoiselleException(bundle.getString("management-null-class-defined"));