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

Dancovich
2 parents ca57f3e4 94f5b741
Showing 19 changed files with 1772 additions and 87 deletions Show diff stats
documentation/reference/pt-BR/authorgroup.xml
documentation/reference/pt-BR/configuracao.xml
documentation/reference/pt-BR/excecao.xml
documentation/reference/pt-BR/security.xml
documentation/reference/pt-BR/transacao.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithArrayTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderWithListTest.java
impl/core/src/test/resources/configuration-with-array.properties
impl/core/src/test/resources/configuration-with-array.xml
impl/core/src/test/resources/configuration-with-list.properties
impl/core/src/test/resources/configuration-with-list.xml
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/template/JPACrud.java
impl/extension/jpa/src/main/resources/demoiselle-jpa-bundle.properties
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfigTest.java
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/template/JPACrudTest.java
@@ -38,4 +38,8 @@
 		<firstname>Emerson</firstname>
 		<surname>Oliveira</surname>
 	</author>
+	<author>
+		<firstname>Luciano</firstname>
+		<surname>Borges</surname>
+	</author>	
 </authorgroup>
@@ -47,6 +47,25 @@
 	</section>
  
 	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de configuração no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.ConfigurationInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section> 
+	
+	<section>
 		<title>As classes de configuração</title>
 		<para>
 			A primeira etapa para a utilização do mecanismo de configuração em uma aplicação consiste em criar uma classe específica
@@ -11,6 +11,25 @@
 		Oferecemos à você uma alternativa para resolver estes problemas, mas você estará livre para usá-la: isoladamente,
 		misturando com a forma verbosa ou até mesmo não usá-la.
 	</para>
+	
+	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de exceção no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section>
  
 	<section>
 		<title>Tratadores de exceção</title>
@@ -18,6 +18,26 @@
 	</para>
  
 	<section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir od interceptadores de segurança no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor</class>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section> 
+	
+	<section>
 		<title>Autenticação</title>
 		<para>
 			O mecanismo de autenticação busca verificar a identidade do usuário de um sistema. A forma mais conhecida, e comum,
@@ -201,20 +221,12 @@ public class MeuAuthorizer implements Authorizer {
  
 }]]></programlisting>
 		<para>
-			Feito isso deve-se definir no arquivo META-INF/beans.xml, as classes criadas:
+			Feito isso deve-se definir no arquivo <filename>demoiselle.properties</filename>, as classes criadas:
 		</para>
-		<programlisting role="XML"><![CDATA[<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	                       http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-
-	<alternatives> 
-		<class>projeto.MeuAuthenticator</class> 
-		<class>projeto.MeuAuthorizer</class> 
-	</alternatives> 
-
-</beans>]]></programlisting>
+		<programlisting>
+			frameworkdemoiselle.security.authenticator.class=projeto.MeuAuthenticator 
+			frameworkdemoiselle.security.authorizer.class=projeto.MeuAuthorizer 
+		</programlisting>
 		<para>
 			À partir desse momento, a aplicação já possui uma implementação de segurança definida.		
 		</para>
@@ -22,6 +22,25 @@
 		Neste capítulo apresentaremos para você como usar a nossa solução de controle de transação, as estratégias
 		prontas que oferecemos e a criação de sua própria estratégia.   
     </para>
+    
+    <section>
+    	<title>Configurando</title>
+    	<para>
+    	Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de transação no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
+    	</para>
+		<programlisting role="XML">
+		<![CDATA[
+		<beans xmlns="http://java.sun.com/xml/ns/javaee" 
+		       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+			                       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+			<interceptors>
+				<class>br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor</class>
+			</interceptors>
+		</beans>
+		]]>
+		</programlisting>
+    </section>
  
 	<section>
 		<title>Métodos transacionais</title>
@@ -55,6 +55,7 @@ import javax.enterprise.inject.spi.ProcessAnnotatedType;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Shutdown;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
 import br.gov.frameworkdemoiselle.internal.context.CustomContext;
 import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
 import br.gov.frameworkdemoiselle.internal.processor.ShutdownProcessor;
@@ -109,6 +110,8 @@ public class ShutdownBootstrap extends AbstractBootstrap {
 		shutdown(true);
 	}
  
+	private static boolean x = true;
+
 	/**
 	 * Before Shutdown it execute the methods annotateds with @Shutdown considering the priority order;
 	 */
@@ -120,18 +123,28 @@ public class ShutdownBootstrap extends AbstractBootstrap {
 		Collections.sort(processors);
 		Throwable failure = null;
  
-		for (CustomContext tempContext : tempContexts) {
-			addContext(tempContext, abdEvent);
+		if (x) {
+			for (CustomContext tempContext : tempContexts) {
+				addContext(tempContext, abdEvent);
+			}
+
+			x = false;
 		}
  
 		for (Iterator<ShutdownProcessor> iter = processors.iterator(); iter.hasNext();) {
 			ShutdownProcessor processor = iter.next();
  
 			try {
-				processor.process();
+				ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(processor.getAnnotatedMethod()
+						.getDeclaringType().getJavaClass().getCanonicalName());
  
-				if (remove) {
-					iter.remove();
+				if (Thread.currentThread().getContextClassLoader().equals(classLoader)) {
+
+					processor.process();
+
+					if (remove) {
+						iter.remove();
+					}
 				}
  
 			} catch (Throwable cause) {
@@ -139,7 +152,9 @@ public class ShutdownBootstrap extends AbstractBootstrap {
 			}
 		}
  
-		unloadTempContexts();
+		if (processors.isEmpty()) {
+			unloadTempContexts();
+		}
  
 		if (failure != null) {
 			throw new DemoiselleException(failure);
@@ -56,6 +56,7 @@ import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Startup;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
+import br.gov.frameworkdemoiselle.internal.context.CustomContext;
 import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
 import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor;
  
@@ -66,12 +67,14 @@ public class StartupBootstrap extends AbstractBootstrap {
  
 	private static final Class<? extends Annotation> annotationClass = Startup.class;
  
-	private static final List<ThreadLocalContext> tempContexts = new ArrayList<ThreadLocalContext>();
+	private static final List<CustomContext> tempContexts = new ArrayList<CustomContext>();
  
 	@SuppressWarnings("rawtypes")
 	private static final List<StartupProcessor> processors = Collections
 			.synchronizedList(new ArrayList<StartupProcessor>());
  
+	private static AfterBeanDiscovery abdEvent;
+
 	/**
 	 * Observes all methods annotated with @Startup and create an instance of StartupAction for them
 	 * 
@@ -96,10 +99,7 @@ public class StartupBootstrap extends AbstractBootstrap {
 		tempContexts.add(new ThreadLocalContext(SessionScoped.class));
 		tempContexts.add(new ThreadLocalContext(ConversationScoped.class));
 		tempContexts.add(new ThreadLocalContext(RequestScoped.class));
-
-		for (ThreadLocalContext tempContext : tempContexts) {
-			addContext(tempContext, event);
-		}
+		abdEvent = event;
 	}
  
 	/**
@@ -109,6 +109,8 @@ public class StartupBootstrap extends AbstractBootstrap {
 		startup(true);
 	}
  
+	private static boolean x = true;
+
 	/**
 	 * After the deployment validation it execute the methods annotateds with @Startup considering the priority order;
 	 */
@@ -120,6 +122,14 @@ public class StartupBootstrap extends AbstractBootstrap {
 		Collections.sort(processors);
 		Throwable failure = null;
  
+		if (x) {
+			for (CustomContext tempContext : tempContexts) {
+				addContext(tempContext, abdEvent);
+			}
+
+			x = false;
+		}
+
 		for (Iterator<StartupProcessor> iter = processors.iterator(); iter.hasNext();) {
 			StartupProcessor processor = iter.next();
  
@@ -140,7 +150,7 @@ public class StartupBootstrap extends AbstractBootstrap {
 			}
 		}
  
-		if (processors.isEmpty()){
+		if (processors.isEmpty()) {
 			unloadTempContexts();
 		}
  
@@ -150,7 +160,7 @@ public class StartupBootstrap extends AbstractBootstrap {
 	}
  
 	private static void unloadTempContexts() {
-		for (ThreadLocalContext tempContext : tempContexts) {
+		for (CustomContext tempContext : tempContexts) {
 			disableContext(tempContext);
 		}
 	}
@@ -40,6 +40,8 @@ import java.io.FileNotFoundException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,8 +51,10 @@ import java.util.Set;
 import javax.inject.Inject;
 import javax.validation.constraints.NotNull;
  
+import org.apache.commons.configuration.DataConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.configuration.XMLConfiguration;
 import org.slf4j.Logger;
  
 import br.gov.frameworkdemoiselle.annotation.Ignore;
@@ -109,7 +113,7 @@ public class ConfigurationLoader implements Serializable {
 			org.apache.commons.configuration.Configuration config = getConfiguration(resource, type);
  
 			String key = getKey(field, clazz, config);
-			Object value = getValue(key, field.getType(), config);
+			Object value = getValue(key, field, config);
  
 			validate(field, key, value, resource);
 			setValue(field, key, object, value);
@@ -218,12 +222,12 @@ public class ConfigurationLoader implements Serializable {
  
 				case PROPERTIES:
 					url = getResourceAsURL(resource + ".properties");
-					config = new PropertiesConfiguration(url);
+					config =  new DataConfiguration(new PropertiesConfiguration(url));
 					break;
  
 				case XML:
 					url = getResourceAsURL(resource + ".xml");
-					config = new PropertiesConfiguration(url);
+					config = new DataConfiguration(new XMLConfiguration(url));
 					break;
  
 				default:
@@ -239,41 +243,67 @@ public class ConfigurationLoader implements Serializable {
 		return config;
 	}
  
-	/**
-	 * Returns the value associated with the given configuration class and field type.
-	 * 
-	 * @param name
-	 * @param config
-	 * @param fieldClass
-	 * @return the value
-	 */
 	@SuppressWarnings("unchecked")
-	private <T> T getValue(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
+	private <T> T getValue(String key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value;
  
-		if (fieldClass.isArray() && fieldClass.getComponentType().equals(String.class)) {
-			value = config.getStringArray(key);
-
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
+		if (fieldClass.isArray()) {
+			value = getArray(key, field, config);
 		} else if (fieldClass.equals(Properties.class)) {
 			value = getProperty(key, config);
  
 		} else {
-			value = getBasic(key, fieldClass, config);
+			value = getBasic(key, field, config);
 		}
  
 		return (T) value;
 	}
+	
+	private <T> Object getArray(String key, Field field, org.apache.commons.configuration.Configuration config) {
+		Object value = null;
+
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
+		try {
+			Method method;
+			
+			String methodName = "get";
+			
+			methodName += Strings.firstToUpper(fieldClass.getSimpleName());
+			methodName = Strings.removeChars(methodName, '[', ']');
+			
+			methodName += "Array";
+
+			method = config.getClass().getMethod(methodName, String.class);
+			value = method.invoke(config, key);
+
+		} catch (Throwable cause) {
+			throw new ConfigurationException(bundle.getString("error-converting-to-type", fieldClass.getName()), cause);
+		}
+
+		return value;
+	}
  
-	private <T> Object getBasic(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
+	private <T> Object getBasic(String key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
+		Class<?> fieldClass = (Class<?>) field.getType();
+		
 		try {
 			Method method;
-			String methodName = "get" + Strings.firstToUpper(fieldClass.getSimpleName());
+			
+			String methodName = "get";
+			
+			methodName += discoveryGenericType(field);
+			
+			methodName += Strings.firstToUpper(fieldClass.getSimpleName());
  
 			if (!fieldClass.isPrimitive()) {
 				method = config.getClass().getMethod(methodName, String.class, fieldClass);
 				value = method.invoke(config, key, null);
+				
 			} else if (config.containsKey(key)) {
 				method = config.getClass().getMethod(methodName, String.class);
 				value = method.invoke(config, key);
@@ -286,6 +316,36 @@ public class ConfigurationLoader implements Serializable {
 		return value;
 	}
  
+	/**
+	 * Discovery the Generic's type.
+	 * 
+	 *  for example: the generic's type of List<Integer> list is an Integer type 
+	 * 
+	 * @param field
+	 * @return
+	 */
+	private String discoveryGenericType(Field field) {
+		
+		Type genericFieldType = field.getGenericType();
+		
+		if(genericFieldType instanceof ParameterizedType){
+		    ParameterizedType type = (ParameterizedType) genericFieldType;
+		    Type[] fieldArgumentTypes = type.getActualTypeArguments();
+		    for(Type fieldArgumentType : fieldArgumentTypes){
+		        @SuppressWarnings("rawtypes")
+				Class fieldArgumentClass = (Class) fieldArgumentType;
+		        
+		        if("String".equals(fieldArgumentClass.getSimpleName())) {
+		        	return "";
+		        }
+		        
+		        return fieldArgumentClass.getSimpleName();
+		    }
+		}
+		
+		return "";
+	}
+	
 	private Object getProperty(String key, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
@@ -638,4 +638,4 @@
 //		assertEquals("All LowerCase", config.conventionAllLowerCase);
 //	}
 //
 -//}
+//}
 \ No newline at end of file
@@ -0,0 +1,520 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.internal.configuration;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.easymock.PowerMock.mockStatic;
+
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.configuration.ConfigType;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(CoreBootstrap.class)
+public class ConfigurationLoaderWithArrayTest {
+
+	private ConfigurationLoader configurationLoader;
+
+	@Configuration(type = ConfigType.PROPERTIES , resource = "configuration-with-array")
+	public class ConfigurationPropertiesWithArray {
+		
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
+		 */
+		
+		protected BigDecimal[] bigDecimalArray;
+		protected BigInteger[] bigIntegerArray;
+		protected boolean[] booleanArray;
+		protected byte[] byteArray;
+		protected Calendar[] calendarArray;
+		protected Color[] colorArray;
+		protected Date[] dateArray;
+		protected double[] doubleArray;
+		protected float[] floatArray;
+		protected int[] integerArray;
+		protected Locale[] localeArray;
+		protected long[] longArray;
+		protected short[] shortArray;
+		protected URL[] urlArray;
+		protected String[] stringArray;
+		
+	}
+	
+	@Configuration(type = ConfigType.XML, resource = "configuration-with-array")
+	public class ConfigurationXMLWithArray {
+		
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
+		 */
+		
+		protected BigDecimal[] bigDecimalArray;
+		protected BigInteger[] bigIntegerArray;
+		protected boolean[] booleanArray;
+		protected byte[] byteArray;
+		protected Calendar[] calendarArray;
+		protected Color[] colorArray;
+		protected Date[] dateArray;
+		protected double[] doubleArray;
+		protected float[] floatArray;
+		protected int[] integerArray;
+		protected Locale[] localeArray;
+		protected long[] longArray;
+		protected short[] shortArray;
+		protected URL[] urlArray;
+		protected String[] stringArray;
+		
+	}
+	
+
+	@Before
+	public void setUp() throws Exception {
+		Logger logger;
+		ResourceBundle bundle;
+		logger = PowerMock.createMock(Logger.class);
+		bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		configurationLoader = new ConfigurationLoader();
+		Whitebox.setInternalState(this.configurationLoader, "bundle", bundle);
+		Whitebox.setInternalState(this.configurationLoader, "logger", logger);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithIntegerArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Integer integerValue = config.integerArray[0];
+		
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerArray.length);
+	}
+	
+	
+	@Test
+	public void testConfigurationPropertiesWithShortArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Short shortValue = config.shortArray[0];
+		
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithByteArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Byte byteValue = config.byteArray[0];
+		
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBooleanArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Boolean booleanValue = config.booleanArray[0];
+		
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithLongArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Long longValue = config.longArray[0];
+		
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithFloatArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Float floatValue = config.floatArray[0];
+		
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithDoubleArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Double doubleValue = config.doubleArray[0];
+		
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBigDecimalArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		BigDecimal bigDecimalValue = config.bigDecimalArray[0];
+		
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithBigIntegerArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		BigInteger bigIntegerValue = config.bigIntegerArray[0];
+		
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithCalendarArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Calendar calendarValue = config.calendarArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+		
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithDateArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Date dateValue = config.dateArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+		
+		Date date = new Date(calendar.getTimeInMillis());
+		
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithColorArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Color colorValue = config.colorArray[0];
+		
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithLocaleArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		Locale localeValue = config.localeArray[0];
+		Locale localeValue2 = config.localeArray[1];
+		
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithURLArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		URL urlValue = config.urlArray[0];
+		
+		URL otherURL = null;
+		
+		try {
+			otherURL = new URL("http://www.test.com");
+		}
+		catch(Exception e) {
+			
+		}
+		
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlArray.length);
+	}
+	
+	@Test
+	public void testConfigurationPropertiesWithStringArray() {
+		ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
+		
+		String stringValue = config.stringArray[0];
+		
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringArray.length);
+	}
+
+	private ConfigurationPropertiesWithArray prepareConfigurationPropertiesWithArray() {
+		ConfigurationPropertiesWithArray config = new ConfigurationPropertiesWithArray();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+	
+	@Test
+	public void testConfigurationXMLWithIntegerArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Integer integerValue = config.integerArray[0];
+		
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerArray.length);
+	}
+	
+	
+	@Test
+	public void testConfigurationXMLWithShortArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Short shortValue = config.shortArray[0];
+		
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithByteArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Byte byteValue = config.byteArray[0];
+		
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBooleanArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Boolean booleanValue = config.booleanArray[0];
+		
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithLongArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Long longValue = config.longArray[0];
+		
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithFloatArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Float floatValue = config.floatArray[0];
+		
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithDoubleArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Double doubleValue = config.doubleArray[0];
+		
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBigDecimalArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		BigDecimal bigDecimalValue = config.bigDecimalArray[0];
+		
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithBigIntegerArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		BigInteger bigIntegerValue = config.bigIntegerArray[0];
+		
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithCalendarArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Calendar calendarValue = config.calendarArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+		
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithDateArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Date dateValue = config.dateArray[0];
+		
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+		
+		Date date = new Date(calendar.getTimeInMillis());
+		
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithColorArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Color colorValue = config.colorArray[0];
+		
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithLocaleArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		Locale localeValue = config.localeArray[0];
+		Locale localeValue2 = config.localeArray[1];
+		
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithURLArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		URL urlValue = config.urlArray[0];
+		
+		URL otherURL = null;
+		
+		try {
+			otherURL = new URL("http://www.test.com");
+		}
+		catch(Exception e) {
+			
+		}
+		
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlArray.length);
+	}
+	
+	@Test
+	public void testConfigurationXMLWithStringArray() {
+		ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
+		
+		String stringValue = config.stringArray[0];
+		
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringArray.length);
+	}
+
+	private ConfigurationXMLWithArray prepareConfigurationXMLWithArray() {
+		ConfigurationXMLWithArray config = new ConfigurationXMLWithArray();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+}
@@ -0,0 +1,542 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.internal.configuration;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.easymock.PowerMock.mockStatic;
+
+import java.awt.Color;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.configuration.ConfigType;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(CoreBootstrap.class)
+public class ConfigurationLoaderWithListTest {
+
+	private ConfigurationLoader configurationLoader;
+
+	@Configuration(type = ConfigType.PROPERTIES, resource = "configuration-with-list")
+	public class ConfigurationPropertiesWithList {
+
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for List type
+		 */
+
+		protected List<BigDecimal> bigDecimalList;
+
+		protected List<BigInteger> bigIntegerList;
+
+		protected List<Boolean> booleanList;
+
+		protected List<Byte> byteList;
+
+		protected List<Calendar> calendarList;
+
+		protected List<Color> colorList;
+
+		protected List<Date> dateList;
+
+		protected List<Double> doubleList;
+
+		protected List<Float> floatList;
+
+		protected List<Integer> integerList;
+
+		protected List<Locale> localeList;
+
+		protected List<Long> longList;
+
+		protected List<Short> shortList;
+
+		protected List<URL> urlList;
+
+		protected List<String> stringList;
+	}
+
+	@Configuration(type = ConfigType.XML, resource = "configuration-with-list")
+	public class ConfigurationXMLWithList {
+
+		/*
+		 * All methods supported by org.apache.commons.configuration.DataConfiguration class for List type
+		 */
+
+		protected List<BigDecimal> bigDecimalList;
+
+		protected List<BigInteger> bigIntegerList;
+
+		protected List<Boolean> booleanList;
+
+		protected List<Byte> byteList;
+
+		protected List<Calendar> calendarList;
+
+		protected List<Color> colorList;
+
+		protected List<Date> dateList;
+
+		protected List<Double> doubleList;
+
+		protected List<Float> floatList;
+
+		protected List<Integer> integerList;
+
+		protected List<Locale> localeList;
+
+		protected List<Long> longList;
+
+		protected List<Short> shortList;
+
+		protected List<URL> urlList;
+
+		protected List<String> stringList;
+	}
+
+	@Before
+	public void setUp() throws Exception {
+		Logger logger;
+		ResourceBundle bundle;
+		logger = PowerMock.createMock(Logger.class);
+		bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		configurationLoader = new ConfigurationLoader();
+		Whitebox.setInternalState(this.configurationLoader, "bundle", bundle);
+		Whitebox.setInternalState(this.configurationLoader, "logger", logger);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithIntegerList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Integer integerValue = config.integerList.get(0);
+
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithShortList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Short shortValue = config.shortList.get(0);
+
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithByteList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Byte byteValue = config.byteList.get(0);
+
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBooleanList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Boolean booleanValue = config.booleanList.get(0);
+
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithLongList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Long longValue = config.longList.get(0);
+
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithFloatList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Float floatValue = config.floatList.get(0);
+
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithDoubleList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Double doubleValue = config.doubleList.get(0);
+
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBigDecimalList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		BigDecimal bigDecimalValue = config.bigDecimalList.get(0);
+
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithBigIntegerList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		BigInteger bigIntegerValue = config.bigIntegerList.get(0);
+
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithCalendarList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Calendar calendarValue = config.calendarList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithDateList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Date dateValue = config.dateList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+
+		Date date = new Date(calendar.getTimeInMillis());
+
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithColorList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Color colorValue = config.colorList.get(0);
+
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithLocaleList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		Locale localeValue = config.localeList.get(0);
+		Locale localeValue2 = config.localeList.get(1);
+
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithURLList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		URL urlValue = config.urlList.get(0);
+
+		URL otherURL = null;
+
+		try {
+			otherURL = new URL("http://www.test.com");
+		} catch (Exception e) {
+
+		}
+
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlList.size());
+	}
+
+	@Test
+	public void testConfigurationPropertiesWithStringList() {
+		ConfigurationPropertiesWithList config = prepareConfigurationPropertiesWithList();
+
+		String stringValue = config.stringList.get(0);
+
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringList.size());
+	}
+
+	private ConfigurationPropertiesWithList prepareConfigurationPropertiesWithList() {
+		ConfigurationPropertiesWithList config = new ConfigurationPropertiesWithList();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+
+	@Test
+	public void testConfigurationXMLWithIntegerList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Integer integerValue = config.integerList.get(0);
+
+		assertEquals(Integer.class, integerValue.getClass());
+		assertEquals(Integer.MAX_VALUE, integerValue.intValue());
+		assertEquals(4, config.integerList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithShortList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Short shortValue = config.shortList.get(0);
+
+		assertEquals(Short.class, shortValue.getClass());
+		assertEquals(Short.MAX_VALUE, shortValue.shortValue());
+		assertEquals(4, config.shortList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithByteList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Byte byteValue = config.byteList.get(0);
+
+		assertEquals(Byte.class, byteValue.getClass());
+		assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
+		assertEquals(8, config.byteList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBooleanList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Boolean booleanValue = config.booleanList.get(0);
+
+		assertEquals(Boolean.class, booleanValue.getClass());
+		assertEquals(2, config.booleanList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithLongList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Long longValue = config.longList.get(0);
+
+		assertEquals(Long.class, longValue.getClass());
+		assertEquals(Long.MAX_VALUE, longValue.longValue());
+		assertEquals(5, config.longList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithFloatList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Float floatValue = config.floatList.get(0);
+
+		assertEquals(Float.class, floatValue.getClass());
+		assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
+		assertEquals(5, config.floatList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithDoubleList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Double doubleValue = config.doubleList.get(0);
+
+		assertEquals(Double.class, doubleValue.getClass());
+		assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
+		assertEquals(3, config.doubleList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBigDecimalList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		BigDecimal bigDecimalValue = config.bigDecimalList.get(0);
+
+		assertEquals(BigDecimal.class, bigDecimalValue.getClass());
+		assertEquals(3, config.bigDecimalList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithBigIntegerList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		BigInteger bigIntegerValue = config.bigIntegerList.get(0);
+
+		assertEquals(BigInteger.class, bigIntegerValue.getClass());
+		assertEquals(3, config.bigIntegerList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithCalendarList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Calendar calendarValue = config.calendarList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
+
+		assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
+		assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
+		assertEquals(3, config.calendarList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithDateList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Date dateValue = config.dateList.get(0);
+
+		GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
+
+		Date date = new Date(calendar.getTimeInMillis());
+
+		assertEquals(Date.class, dateValue.getClass());
+		assertEquals(date.getTime(), dateValue.getTime());
+		assertEquals(3, config.dateList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithColorList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Color colorValue = config.colorList.get(0);
+
+		assertEquals(Color.class, colorValue.getClass());
+		assertEquals(Color.gray, colorValue);
+		assertEquals(3, config.colorList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithLocaleList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		Locale localeValue = config.localeList.get(0);
+		Locale localeValue2 = config.localeList.get(1);
+
+		assertEquals(Locale.class, localeValue.getClass());
+		assertEquals(Locale.ENGLISH, localeValue);
+		assertEquals("BR", localeValue2.getCountry());
+		assertEquals(3, config.localeList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithURLList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		URL urlValue = config.urlList.get(0);
+
+		URL otherURL = null;
+
+		try {
+			otherURL = new URL("http://www.test.com");
+		} catch (Exception e) {
+
+		}
+
+		assertEquals(URL.class, urlValue.getClass());
+		assertEquals(otherURL, urlValue);
+		assertEquals(3, config.urlList.size());
+	}
+
+	@Test
+	public void testConfigurationXMLWithStringList() {
+		ConfigurationXMLWithList config = prepareConfigurationXMLWithList();
+
+		String stringValue = config.stringList.get(0);
+
+		assertEquals(String.class, stringValue.getClass());
+		assertEquals("Test", stringValue);
+		assertEquals(3, config.stringList.size());
+	}
+
+	private ConfigurationXMLWithList prepareConfigurationXMLWithList() {
+		ConfigurationXMLWithList config = new ConfigurationXMLWithList();
+
+		mockStatic(CoreBootstrap.class);
+		expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
+		PowerMock.replay(CoreBootstrap.class);
+
+		configurationLoader.load(config);
+		return config;
+	}
+}
@@ -0,0 +1,50 @@
+# Demoiselle Framework
+# Copyright (C) 2010 SERPRO
+# ----------------------------------------------------------------------------
+# This file is part of Demoiselle Framework.
+# 
+# Demoiselle Framework is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License version 3
+# along with this program; if not,  see <http://www.gnu.org/licenses/>
+# or write to the Free Software Foundation, Inc., 51 Franklin Street,
+# Fifth Floor, Boston, MA  02110-1301, USA.
+# ----------------------------------------------------------------------------
+# Este arquivo é parte do Framework Demoiselle.
+# 
+# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+# do Software Livre (FSF).
+# 
+# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+# para maiores detalhes.
+# 
+# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+# "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+# ou escreva para a Fundação do Software Livre (FSF) Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+
+integer.array = 2147483647, 10993, 12330, 129399
+short.array = 32767, 123, 5512, 4212
+byte.array = 127, 12, 51, 123, 11, 5, 1, -12
+boolean.array = true, false
+long.array = 9223372036854775807, 0901920390123, 1235234523, 134230094, 66123413423
+float.array = 3.4028235E38, 34.244, 2412.423444, 513.234, 10000.000
+double.array = 1.7976931348623157E308, 1231234.00120349192348123, 1234123512341.9134828348238
+big.decimal.array = 16578.69899, 48787.548877788, 4487787.559
+big.integer.array = 1998987987897, 89789498171, 21474836475
+calendar.array = 2012-06-14 10:10:00, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+date.array = 2012-08-14 18:10:50, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+color.array = #808080, #cccccc, #ABCCCC
+locale.array = en, pt_br, ca
+url.array = http://www.test.com, https://test.of.test.com, ftp://192.168.0.1
+string.array = Test, One, Two
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+
+<configuration>
+
+	<integer>
+		<array>2147483647</array>
+		<array>10993</array>
+		<array>12330</array>
+		<array>129399</array>
+	</integer>
+	
+	<short>
+		<array>32767</array>
+		<array>123</array>
+		<array>5512</array>
+		<array>4212</array>
+	</short>
+	
+	<byte>
+		<array>127</array>
+		<array>12</array>
+		<array>51</array>
+		<array>123</array>
+		<array>11</array>
+		<array>5</array>
+		<array>1</array>
+		<array>-12</array>
+	</byte>
+	
+	<boolean>
+		<array>true</array>
+		<array>false</array>
+	</boolean>
+	
+	<long>
+		<array>9223372036854775807</array>
+		<array>0901920390123</array>
+		<array>1235234523</array>
+		<array>134230094</array>
+		<array>66123413423</array>
+	</long>
+	
+	<float>
+		<array>3.4028235E38</array>
+		<array>34.244</array>
+		<array>2412.423444</array>
+		<array>513.234</array>
+		<array>10000.000</array>
+	</float>
+	
+	<double>
+		<array>1.7976931348623157E308</array>
+		<array>1231234.00120349192348123</array>
+		<array>1234123512341.9134828348238</array>
+	</double>
+	
+	<big>
+		<decimal>
+			<array>16578.69899</array>
+			<array>48787.548877788</array>
+			<array>4487787.559</array>
+		</decimal>
+	</big>
+	
+	<big>
+		<integer>
+			<array>1998987987897</array>
+			<array>89789498171</array>
+			<array>21474836475</array>
+		</integer>
+	</big>
+	
+	<calendar>
+		<array>2012-06-14 10:10:00</array>
+		<array>2012-07-14 10:10:00</array>
+		<array>2012-06-15 18:10:00</array>
+	</calendar>
+	
+	<date>
+		<array>2012-08-14 18:10:50</array>
+		<array>2012-07-14 10:10:00</array>
+		<array>2012-06-15 18:10:00</array>
+	</date>
+	
+	<color>
+		<array>#808080</array>
+		<array>#cccccc</array>
+		<array> #ABCCCC</array>
+	</color>
+	
+	<locale>
+		<array>en</array>
+		<array>pt_br</array>
+		<array>ca</array>
+	</locale>
+	
+	<url>
+		<array>http://www.test.com</array>
+		<array>https://test.of.test.com</array>
+		<array>ftp://192.168.0.1</array>
+	</url>
+	
+	<string>
+		<array>Test</array>
+		<array>One</array>
+		<array>Two</array>
+	</string>
+
+</configuration>
 \ No newline at end of file
@@ -0,0 +1,50 @@
+# Demoiselle Framework
+# Copyright (C) 2010 SERPRO
+# ----------------------------------------------------------------------------
+# This file is part of Demoiselle Framework.
+# 
+# Demoiselle Framework is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License version 3
+# along with this program; if not,  see <http://www.gnu.org/licenses/>
+# or write to the Free Software Foundation, Inc., 51 Franklin Street,
+# Fifth Floor, Boston, MA  02110-1301, USA.
+# ----------------------------------------------------------------------------
+# Este arquivo é parte do Framework Demoiselle.
+# 
+# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+# do Software Livre (FSF).
+# 
+# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+# para maiores detalhes.
+# 
+# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+# "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+# ou escreva para a Fundação do Software Livre (FSF) Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+
+integer.list = 2147483647, 10993, 12330, 129399
+short.list = 32767, 123, 5512, 4212
+byte.list = 127, 12, 51, 123, 11, 5, 1, -12
+boolean.list = true, false
+long.list = 9223372036854775807, 0901920390123, 1235234523, 134230094, 66123413423
+float.list = 3.4028235E38, 34.244, 2412.423444, 513.234, 10000.000
+double.list = 1.7976931348623157E308, 1231234.00120349192348123, 1234123512341.9134828348238
+big.decimal.list = 16578.69899, 48787.548877788, 4487787.559
+big.integer.list = 1998987987897, 89789498171, 21474836475
+calendar.list = 2012-06-14 10:10:00, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+date.list = 2012-08-14 18:10:50, 2012-07-14 10:10:00, 2012-06-15 18:10:00
+color.list = #808080, #cccccc, #ABCCCC
+locale.list = en, pt_br, ca
+url.list = http://www.test.com, https://test.of.test.com, ftp://192.168.0.1
+string.list = Test, One, Two
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+
+<configuration>
+
+	<integer>
+		<list>2147483647</list>
+		<list>10993</list>
+		<list>12330</list>
+		<list>129399</list>
+	</integer>
+	
+	<short>
+		<list>32767</list>
+		<list>123</list>
+		<list>5512</list>
+		<list>4212</list>
+	</short>
+	
+	<byte>
+		<list>127</list>
+		<list>12</list>
+		<list>51</list>
+		<list>123</list>
+		<list>11</list>
+		<list>5</list>
+		<list>1</list>
+		<list>-12</list>
+	</byte>
+	
+	<boolean>
+		<list>true</list>
+		<list>false</list>
+	</boolean>
+	
+	<long>
+		<list>9223372036854775807</list>
+		<list>0901920390123</list>
+		<list>1235234523</list>
+		<list>134230094</list>
+		<list>66123413423</list>
+	</long>
+	
+	<float>
+		<list>3.4028235E38</list>
+		<list>34.244</list>
+		<list>2412.423444</list>
+		<list>513.234</list>
+		<list>10000.000</list>
+	</float>
+	
+	<double>
+		<list>1.7976931348623157E308</list>
+		<list>1231234.00120349192348123</list>
+		<list>1234123512341.9134828348238</list>
+	</double>
+	
+	<big>
+		<decimal>
+			<list>16578.69899</list>
+			<list>48787.548877788</list>
+			<list>4487787.559</list>
+		</decimal>
+	</big>
+	
+	<big>
+		<integer>
+			<list>1998987987897</list>
+			<list>89789498171</list>
+			<list>21474836475</list>
+		</integer>
+	</big>
+	
+	<calendar>
+		<list>2012-06-14 10:10:00</list>
+		<list>2012-07-14 10:10:00</list>
+		<list>2012-06-15 18:10:00</list>
+	</calendar>
+	
+	<date>
+		<list>2012-08-14 18:10:50</list>
+		<list>2012-07-14 10:10:00</list>
+		<list>2012-06-15 18:10:00</list>
+	</date>
+	
+	<color>
+		<list>#808080</list>
+		<list>#cccccc</list>
+		<list> #ABCCCC</list>
+	</color>
+	
+	<locale>
+		<list>en</list>
+		<list>pt_br</list>
+		<list>ca</list>
+	</locale>
+	
+	<url>
+		<list>http://www.test.com</list>
+		<list>https://test.of.test.com</list>
+		<list>ftp://192.168.0.1</list>
+	</url>
+	
+	<string>
+		<list>Test</list>
+		<list>One</list>
+		<list>Two</list>
+	</string>
+
+</configuration>
 \ No newline at end of file
@@ -39,6 +39,8 @@ package br.gov.frameworkdemoiselle.template;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
  
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
@@ -48,6 +50,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.Enumerated;
 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;
@@ -115,6 +118,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			PaginationContext context = paginationContext.get();
 			pagination = context.getPagination(getBeanClass());
 		}
+
 		return pagination;
 	}
  
@@ -130,6 +134,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 		if (cause instanceof TransactionRequiredException) {
 			String message = bundle.get().getString("no-transaction-active", "frameworkdemoiselle.transaction.class",
 					Configuration.DEFAULT_RESOURCE);
+
 			throw new DemoiselleException(message, cause);
  
 		} else {
@@ -162,31 +167,80 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 	}
  
 	@Override
-	@SuppressWarnings("unchecked")
 	public List<T> findAll() {
-		final String jpql = "select this from " + getBeanClass().getSimpleName() + " this";
-		final Query query = getEntityManager().createQuery(jpql);
-
-		final Pagination pagination = getPagination();
-		if (pagination != null) {
-			pagination.setTotalResults(this.countAll().intValue());
-			query.setFirstResult(pagination.getFirstResult());
-			query.setMaxResults(pagination.getPageSize());
+		return findByJPQL("select this from " + getBeanClass().getSimpleName() + " this");
+	}
+
+	/**
+	 * Search JPQL integrated into the context of paging
+	 * 
+	 * @param jpql
+	 *            - query in syntax JPQL
+	 * @return a list of entities
+	 */
+	protected List<T> findByJPQL(String jpql) {
+		TypedQuery<T> listQuery = getEntityManager().createQuery(jpql, getBeanClass());
+
+		if (getPagination() != null) {
+			String countQuery = createCountQuery(jpql);
+			Query query = getEntityManager().createQuery(countQuery);
+			Number cResults = (Number) query.getSingleResult();
+			getPagination().setTotalResults(cResults.intValue());
+			listQuery.setFirstResult(getPagination().getFirstResult());
+			listQuery.setMaxResults(getPagination().getPageSize());
 		}
  
-		List<T> lista = query.getResultList();
-		return lista;
+		return listQuery.getResultList();
 	}
  
 	/**
-	 * Retrieves the number of persisted objects for the current class type.
+	 * Search CriteriaQuery integrated into the context of paging
 	 * 
-	 * @return the row count
+	 * @param criteriaQuery
+	 *            - structure CriteriaQuery
+	 * @return a list of entities
 	 */
-	private Long countAll() {
-		final Query query = getEntityManager().createQuery(
-				"select count(this) from " + beanClass.getSimpleName() + " this");
-		return (Long) query.getSingleResult();
+	public List<T> findByCriteriaQuery(CriteriaQuery<T> criteriaQuery) {
+		TypedQuery<T> listQuery = getEntityManager().createQuery(criteriaQuery);
+
+		if (getPagination() != null) {
+			CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+			CriteriaQuery<Long> countQuery = builder.createQuery(Long.class);
+			countQuery.select(builder.count(countQuery.from(getBeanClass())));
+			countQuery.where(criteriaQuery.getRestriction());
+			getEntityManager().createQuery(countQuery);
+			getPagination().setTotalResults((int) (getEntityManager().createQuery(countQuery).getSingleResult() + 0));
+			listQuery.setFirstResult(getPagination().getFirstResult());
+			listQuery.setMaxResults(getPagination().getPageSize());
+		}
+
+		return listQuery.getResultList();
+	}
+
+	/**
+	 * Converts a query into a count query
+	 * 
+	 * @param query
+	 * @return
+	 */
+	private String createCountQuery(String query) {
+		Matcher matcher = Pattern.compile("[Ss][Ee][Ll][Ee][Cc][Tt](.+)[Ff][Rr][Oo][Mm]").matcher(query);
+
+		if (matcher.find()) {
+			String group = matcher.group(1).trim();
+			query = query.replaceFirst(group, "COUNT(" + group + ")");
+			matcher = Pattern.compile("[Oo][Rr][Dd][Ee][Rr](.+)").matcher(query);
+
+			if (matcher.find()) {
+				group = matcher.group(0);
+				query = query.replaceFirst(group, "");
+			}
+
+			return query;
+
+		} else {
+			throw new DemoiselleException(bundle.get().getString("malformed-jpql"));
+		}
 	}
  
 	/**
@@ -217,7 +271,6 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 	 * @return an instance of {@code CriteriaQuery}
 	 */
 	private CriteriaQuery<T> createCriteriaByExample(final T example) {
-
 		final CriteriaBuilder builder = getCriteriaBuilder();
 		final CriteriaQuery<T> query = builder.createQuery(getBeanClass());
 		final Root<T> entity = query.from(getBeanClass());
@@ -226,7 +279,6 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 		final Field[] fields = example.getClass().getDeclaredFields();
  
 		for (Field field : fields) {
-
 			if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Basic.class)
 					&& !field.isAnnotationPresent(Enumerated.class)) {
 				continue;
@@ -237,10 +289,13 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			try {
 				field.setAccessible(true);
 				value = field.get(example);
+
 			} catch (IllegalArgumentException e) {
 				continue;
+
 			} catch (IllegalAccessException e) {
 				continue;
+
 			}
  
 			if (value == null) {
@@ -250,6 +305,7 @@ public class JPACrud&lt;T, I&gt; implements Crud&lt;T, I&gt; {
 			final Predicate pred = builder.equal(entity.get(field.getName()), value);
 			predicates.add(pred);
 		}
+
 		return query.where(predicates.toArray(new Predicate[0])).select(entity);
 	}
  
@@ -42,4 +42,5 @@ can-not-get-persistence-unit-from-persistence=N\u00E3o foi poss\u00EDvel obter a
 more-than-one-persistence-unit-defined=Existe mais de uma unidade de persist\u00EAncia definida. Utilize @{0} no ponto de inje\u00E7\u00E3o ou defina o atributo "frameworkdemoiselle.persistence.unit.name" no arquivo demoiselle.properties.
 persistence-unit-name-found=Unidade de persist\u00EAncia "{0}" encontrada.
 entity-manager-closed=O gerenciador de entidades foi fechado.
-no-transaction-active=Nenhuma transa\u00E7\u00E3o est\u00E1 ativa, verifique a configura\u00E7\u00E3o "{0}" no arquivo "{1}" e defina a sua estrat\u00E9gia de transa\u00E7\u00E3o.
 \ No newline at end of file
+no-transaction-active=Nenhuma transa\u00E7\u00E3o est\u00E1 ativa, verifique a configura\u00E7\u00E3o "{0}" no arquivo "{1}" e defina a sua estrat\u00E9gia de transa\u00E7\u00E3o.
+malformed-jpql=Consulta JPQL mal formada para pagina\u00E7\u00E3o de dados.
@@ -70,7 +70,7 @@ public class EntityManagerConfigTest {
 	@Before
 	public void setUp() throws Exception {
 		Logger logger = PowerMock.createMock(Logger.class);
-		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());;
+		ResourceBundle bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
  
 		ConfigurationLoader configurationLoader = new ConfigurationLoader();
  
@@ -129,28 +129,37 @@ public class JPACrudTest {
 		this.contactDAO.delete(this.contact.getId());
 		verify(this.entityManager);
 	}
-
+	
+	private TypedQuery<Contact> makeTypedQuery() {
+		@SuppressWarnings("unchecked")
+		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
+		expect(typeQuery.setFirstResult(EasyMock.anyInt())).andReturn(null);
+		expect(typeQuery.setMaxResults(EasyMock.anyInt())).andReturn(null);
+		expect(typeQuery.getResultList()).andReturn(createContacts(1));
+		return typeQuery;
+	}
+	
 	@Test
 	public void testCountAll() {
  
 		Pagination pagination = new PaginationImpl();
+		pagination.setPageSize(10);
 		PaginationContext actualContext = PowerMock.createMock(PaginationContext.class);
 		expect(actualContext.getPagination(Contact.class)).andReturn(pagination);
 		@SuppressWarnings("unchecked")
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
  
 		Query query = EasyMock.createMock(Query.class);
-		expect(query.setFirstResult(EasyMock.anyInt())).andReturn(query);
-		expect(query.setMaxResults(EasyMock.anyInt())).andReturn(query);
 		expect(query.getSingleResult()).andReturn(10L);
+		
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);		
  
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(this.entityManager.createQuery("select count(this) from Contact this")).andReturn(query);
-		expect(query.getResultList()).andReturn(createContacts(1));
-
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		List<Contact> find = this.contactDAO.findAll();
  
@@ -171,11 +180,13 @@ public class JPACrudTest {
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
  
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
+		
 		Query query = EasyMock.createMock(Query.class);
  
 		expect(query.getSingleResult()).andThrow(new DemoiselleException(""));
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(this.entityManager.createQuery("select count(this) from Contact this")).andReturn(query);
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);	
  
 		replayAll(query, this.entityManager, paginationContext);
  
@@ -280,27 +291,31 @@ public class JPACrudTest {
  
 	@Test
 	public void testFindAll() {
-
+		
+		Pagination pagination = new PaginationImpl();
+		pagination.setPageSize(10);
 		PaginationContext actualContext = PowerMock.createMock(PaginationContext.class);
-		expect(actualContext.getPagination(Contact.class)).andReturn(null);
+		expect(actualContext.getPagination(Contact.class)).andReturn(pagination);
 		@SuppressWarnings("unchecked")
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		TypedQuery<Contact> typeQuery = makeTypedQuery();		
  
 		Query query = EasyMock.createMock(Query.class);
-		// expect(query.setFirstResult(EasyMock.anyInt())).andReturn(query);
-		// expect(query.setMaxResults(EasyMock.anyInt())).andReturn(query);
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(query.getResultList()).andReturn(createContacts(1));
+		expect(query.getSingleResult()).andReturn(10L);
+		
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);
+		expect(this.entityManager.createQuery("SELECT COUNT(THIS) FROM CONTACT THIS")).andReturn(query);		
  
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		List<Contact> find = this.contactDAO.findAll();
  
 		assertEquals(1, find.size());
 		assertTrue(find.iterator().next().getId().equals(1L));
-
+		
 		verifyAll();
 	}
  
@@ -313,12 +328,15 @@ public class JPACrudTest {
 		Instance<PaginationContext> paginationContext = PowerMock.createMock(Instance.class);
 		expect(paginationContext.get()).andReturn(actualContext);
 		setInternalState(this.contactDAO, "paginationContext", paginationContext);
+		
+		@SuppressWarnings("unchecked")
+		TypedQuery<Contact> typeQuery = EasyMock.createMock(TypedQuery.class);
+		expect(typeQuery.getResultList()).andThrow(new DemoiselleException(""));
  
 		Query query = EasyMock.createMock(Query.class);
-		expect(this.entityManager.createQuery("select this from Contact this")).andReturn(query);
-		expect(query.getResultList()).andThrow(new DemoiselleException(""));
+		expect(this.entityManager.createQuery("select this from Contact this", Contact.class)).andReturn(typeQuery);		
  
-		replayAll(query, this.entityManager, paginationContext);
+		replayAll(typeQuery, query, this.entityManager, paginationContext);
  
 		try {
 			this.contactDAO.findAll();
...	...	@@ -38,4 +38,8 @@
38	38	<firstname>Emerson</firstname>
39	39	<surname>Oliveira</surname>
40	40	</author>
	41	+ <author>
	42	+ <firstname>Luciano</firstname>
	43	+ <surname>Borges</surname>
	44	+ </author>
41	45	</authorgroup>
...	...
...	...	@@ -47,6 +47,25 @@
47	47	</section>
48	48
49	49	<section>
	50	+ <title>Configurando</title>
	51	+ <para>
	52	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de configuração no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	53	+ </para>
	54	+ <programlisting role="XML">
	55	+ <![CDATA[
	56	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	57	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	58	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	59	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	60	+ <interceptors>
	61	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.ConfigurationInterceptor</class>
	62	+ </interceptors>
	63	+ </beans>
	64	+ ]]>
	65	+ </programlisting>
	66	+ </section>
	67	+
	68	+ <section>
50	69	<title>As classes de configuração</title>
51	70	<para>
52	71	A primeira etapa para a utilização do mecanismo de configuração em uma aplicação consiste em criar uma classe específica
...	...
...	...	@@ -11,6 +11,25 @@
11	11	Oferecemos à você uma alternativa para resolver estes problemas, mas você estará livre para usá-la: isoladamente,
12	12	misturando com a forma verbosa ou até mesmo não usá-la.
13	13	</para>
	14	+
	15	+ <section>
	16	+ <title>Configurando</title>
	17	+ <para>
	18	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de exceção no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	19	+ </para>
	20	+ <programlisting role="XML">
	21	+ <![CDATA[
	22	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	23	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	24	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	25	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	26	+ <interceptors>
	27	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor</class>
	28	+ </interceptors>
	29	+ </beans>
	30	+ ]]>
	31	+ </programlisting>
	32	+ </section>
14	33
15	34	<section>
16	35	<title>Tratadores de exceção</title>
...	...
...	...	@@ -18,6 +18,26 @@
18	18	</para>
19	19
20	20	<section>
	21	+ <title>Configurando</title>
	22	+ <para>
	23	+ Para um correto funcionamento do Demoiselle é necessário inserir od interceptadores de segurança no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	24	+ </para>
	25	+ <programlisting role="XML">
	26	+ <![CDATA[
	27	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	28	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	29	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	30	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	31	+ <interceptors>
	32	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor</class>
	33	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor</class>
	34	+ </interceptors>
	35	+ </beans>
	36	+ ]]>
	37	+ </programlisting>
	38	+ </section>
	39	+
	40	+ <section>
21	41	<title>Autenticação</title>
22	42	<para>
23	43	O mecanismo de autenticação busca verificar a identidade do usuário de um sistema. A forma mais conhecida, e comum,
...	...	@@ -201,20 +221,12 @@ public class MeuAuthorizer implements Authorizer {
201	221
202	222	}]]></programlisting>
203	223	<para>
204		- Feito isso deve-se definir no arquivo META-INF/beans.xml, as classes criadas:
	224	+ Feito isso deve-se definir no arquivo <filename>demoiselle.properties</filename>, as classes criadas:
205	225	</para>
206		- <programlisting role="XML"><![CDATA[<?xml version="1.0"?>
207		-<beans xmlns="http://java.sun.com/xml/ns/javaee"
208		- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
209		- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
210		- http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
211		-
212		- <alternatives>
213		- <class>projeto.MeuAuthenticator</class>
214		- <class>projeto.MeuAuthorizer</class>
215		- </alternatives>
216		-
217		-</beans>]]></programlisting>
	226	+ <programlisting>
	227	+ frameworkdemoiselle.security.authenticator.class=projeto.MeuAuthenticator
	228	+ frameworkdemoiselle.security.authorizer.class=projeto.MeuAuthorizer
	229	+ </programlisting>
218	230	<para>
219	231	À partir desse momento, a aplicação já possui uma implementação de segurança definida.
220	232	</para>
...	...
...	...	@@ -22,6 +22,25 @@
22	22	Neste capítulo apresentaremos para você como usar a nossa solução de controle de transação, as estratégias
23	23	prontas que oferecemos e a criação de sua própria estratégia.
24	24	</para>
	25	+
	26	+ <section>
	27	+ <title>Configurando</title>
	28	+ <para>
	29	+ Para um correto funcionamento do Demoiselle é necessário inserir o interceptador de transação no arquivo <filename>src/main/WEB-INF/beans.xml</filename>.
	30	+ </para>
	31	+ <programlisting role="XML">
	32	+ <![CDATA[
	33	+ <beans xmlns="http://java.sun.com/xml/ns/javaee"
	34	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	35	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
	36	+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	37	+ <interceptors>
	38	+ <class>br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor</class>
	39	+ </interceptors>
	40	+ </beans>
	41	+ ]]>
	42	+ </programlisting>
	43	+ </section>
25	44
26	45	<section>
27	46	<title>Métodos transacionais</title>
...	...
...	...	@@ -55,6 +55,7 @@ import javax.enterprise.inject.spi.ProcessAnnotatedType;
55	55	import br.gov.frameworkdemoiselle.DemoiselleException;
56	56	import br.gov.frameworkdemoiselle.annotation.Shutdown;
57	57	import br.gov.frameworkdemoiselle.annotation.ViewScoped;
	58	+import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
58	59	import br.gov.frameworkdemoiselle.internal.context.CustomContext;
59	60	import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
60	61	import br.gov.frameworkdemoiselle.internal.processor.ShutdownProcessor;
...	...	@@ -109,6 +110,8 @@ public class ShutdownBootstrap extends AbstractBootstrap {
109	110	shutdown(true);
110	111	}
111	112
	113	+ private static boolean x = true;
	114	+
112	115	/**
113	116	* Before Shutdown it execute the methods annotateds with @Shutdown considering the priority order;
114	117	*/
...	...	@@ -120,18 +123,28 @@ public class ShutdownBootstrap extends AbstractBootstrap {
120	123	Collections.sort(processors);
121	124	Throwable failure = null;
122	125
123		- for (CustomContext tempContext : tempContexts) {
124		- addContext(tempContext, abdEvent);
	126	+ if (x) {
	127	+ for (CustomContext tempContext : tempContexts) {
	128	+ addContext(tempContext, abdEvent);
	129	+ }
	130	+
	131	+ x = false;
125	132	}
126	133
127	134	for (Iterator<ShutdownProcessor> iter = processors.iterator(); iter.hasNext();) {
128	135	ShutdownProcessor processor = iter.next();
129	136
130	137	try {
131		- processor.process();
	138	+ ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(processor.getAnnotatedMethod()
	139	+ .getDeclaringType().getJavaClass().getCanonicalName());
132	140
133		- if (remove) {
134		- iter.remove();
	141	+ if (Thread.currentThread().getContextClassLoader().equals(classLoader)) {
	142	+
	143	+ processor.process();
	144	+
	145	+ if (remove) {
	146	+ iter.remove();
	147	+ }
135	148	}
136	149
137	150	} catch (Throwable cause) {
...	...	@@ -139,7 +152,9 @@ public class ShutdownBootstrap extends AbstractBootstrap {
139	152	}
140	153	}
141	154
142		- unloadTempContexts();
	155	+ if (processors.isEmpty()) {
	156	+ unloadTempContexts();
	157	+ }
143	158
144	159	if (failure != null) {
145	160	throw new DemoiselleException(failure);
...	...
...	...	@@ -56,6 +56,7 @@ import br.gov.frameworkdemoiselle.DemoiselleException;
56	56	import br.gov.frameworkdemoiselle.annotation.Startup;
57	57	import br.gov.frameworkdemoiselle.annotation.ViewScoped;
58	58	import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader;
	59	+import br.gov.frameworkdemoiselle.internal.context.CustomContext;
59	60	import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
60	61	import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor;
61	62
...	...	@@ -66,12 +67,14 @@ public class StartupBootstrap extends AbstractBootstrap {
66	67
67	68	private static final Class<? extends Annotation> annotationClass = Startup.class;
68	69
69		- private static final List<ThreadLocalContext> tempContexts = new ArrayList<ThreadLocalContext>();
	70	+ private static final List<CustomContext> tempContexts = new ArrayList<CustomContext>();
70	71
71	72	@SuppressWarnings("rawtypes")
72	73	private static final List<StartupProcessor> processors = Collections
73	74	.synchronizedList(new ArrayList<StartupProcessor>());
74	75
	76	+ private static AfterBeanDiscovery abdEvent;
	77	+
75	78	/**
76	79	* Observes all methods annotated with @Startup and create an instance of StartupAction for them
77	80	*
...	...	@@ -96,10 +99,7 @@ public class StartupBootstrap extends AbstractBootstrap {
96	99	tempContexts.add(new ThreadLocalContext(SessionScoped.class));
97	100	tempContexts.add(new ThreadLocalContext(ConversationScoped.class));
98	101	tempContexts.add(new ThreadLocalContext(RequestScoped.class));
99		-
100		- for (ThreadLocalContext tempContext : tempContexts) {
101		- addContext(tempContext, event);
102		- }
	102	+ abdEvent = event;
103	103	}
104	104
105	105	/**
...	...	@@ -109,6 +109,8 @@ public class StartupBootstrap extends AbstractBootstrap {
109	109	startup(true);
110	110	}
111	111
	112	+ private static boolean x = true;
	113	+
112	114	/**
113	115	* After the deployment validation it execute the methods annotateds with @Startup considering the priority order;
114	116	*/
...	...	@@ -120,6 +122,14 @@ public class StartupBootstrap extends AbstractBootstrap {
120	122	Collections.sort(processors);
121	123	Throwable failure = null;
122	124
	125	+ if (x) {
	126	+ for (CustomContext tempContext : tempContexts) {
	127	+ addContext(tempContext, abdEvent);
	128	+ }
	129	+
	130	+ x = false;
	131	+ }
	132	+
123	133	for (Iterator<StartupProcessor> iter = processors.iterator(); iter.hasNext();) {
124	134	StartupProcessor processor = iter.next();
125	135
...	...	@@ -140,7 +150,7 @@ public class StartupBootstrap extends AbstractBootstrap {
140	150	}
141	151	}
142	152
143		- if (processors.isEmpty()){
	153	+ if (processors.isEmpty()) {
144	154	unloadTempContexts();
145	155	}
146	156
...	...	@@ -150,7 +160,7 @@ public class StartupBootstrap extends AbstractBootstrap {
150	160	}
151	161
152	162	private static void unloadTempContexts() {
153		- for (ThreadLocalContext tempContext : tempContexts) {
	163	+ for (CustomContext tempContext : tempContexts) {
154	164	disableContext(tempContext);
155	165	}
156	166	}
...	...
...	...	@@ -40,6 +40,8 @@ import java.io.FileNotFoundException;
40	40	import java.io.Serializable;
41	41	import java.lang.reflect.Field;
42	42	import java.lang.reflect.Method;
	43	+import java.lang.reflect.ParameterizedType;
	44	+import java.lang.reflect.Type;
43	45	import java.net.URL;
44	46	import java.util.HashSet;
45	47	import java.util.Iterator;
...	...	@@ -49,8 +51,10 @@ import java.util.Set;
49	51	import javax.inject.Inject;
50	52	import javax.validation.constraints.NotNull;
51	53
	54	+import org.apache.commons.configuration.DataConfiguration;
52	55	import org.apache.commons.configuration.PropertiesConfiguration;
53	56	import org.apache.commons.configuration.SystemConfiguration;
	57	+import org.apache.commons.configuration.XMLConfiguration;
54	58	import org.slf4j.Logger;
55	59
56	60	import br.gov.frameworkdemoiselle.annotation.Ignore;
...	...	@@ -109,7 +113,7 @@ public class ConfigurationLoader implements Serializable {
109	113	org.apache.commons.configuration.Configuration config = getConfiguration(resource, type);
110	114
111	115	String key = getKey(field, clazz, config);
112		- Object value = getValue(key, field.getType(), config);
	116	+ Object value = getValue(key, field, config);
113	117
114	118	validate(field, key, value, resource);
115	119	setValue(field, key, object, value);
...	...	@@ -218,12 +222,12 @@ public class ConfigurationLoader implements Serializable {
218	222
219	223	case PROPERTIES:
220	224	url = getResourceAsURL(resource + ".properties");
221		- config = new PropertiesConfiguration(url);
	225	+ config = new DataConfiguration(new PropertiesConfiguration(url));
222	226	break;
223	227
224	228	case XML:
225	229	url = getResourceAsURL(resource + ".xml");
226		- config = new PropertiesConfiguration(url);
	230	+ config = new DataConfiguration(new XMLConfiguration(url));
227	231	break;
228	232
229	233	default:
...	...	@@ -239,41 +243,67 @@ public class ConfigurationLoader implements Serializable {
239	243	return config;
240	244	}
241	245
242		- /**
243		- * Returns the value associated with the given configuration class and field type.
244		- *
245		- * @param name
246		- * @param config
247		- * @param fieldClass
248		- * @return the value
249		- */
250	246	@SuppressWarnings("unchecked")
251		- private <T> T getValue(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
	247	+ private <T> T getValue(String key, Field field, org.apache.commons.configuration.Configuration config) {
252	248	Object value;
253	249
254		- if (fieldClass.isArray() && fieldClass.getComponentType().equals(String.class)) {
255		- value = config.getStringArray(key);
256		-
	250	+ Class<?> fieldClass = (Class<?>) field.getType();
	251	+
	252	+ if (fieldClass.isArray()) {
	253	+ value = getArray(key, field, config);
257	254	} else if (fieldClass.equals(Properties.class)) {
258	255	value = getProperty(key, config);
259	256
260	257	} else {
261		- value = getBasic(key, fieldClass, config);
	258	+ value = getBasic(key, field, config);
262	259	}
263	260
264	261	return (T) value;
265	262	}
	263	+
	264	+ private <T> Object getArray(String key, Field field, org.apache.commons.configuration.Configuration config) {
	265	+ Object value = null;
	266	+
	267	+ Class<?> fieldClass = (Class<?>) field.getType();
	268	+
	269	+ try {
	270	+ Method method;
	271	+
	272	+ String methodName = "get";
	273	+
	274	+ methodName += Strings.firstToUpper(fieldClass.getSimpleName());
	275	+ methodName = Strings.removeChars(methodName, '[', ']');
	276	+
	277	+ methodName += "Array";
	278	+
	279	+ method = config.getClass().getMethod(methodName, String.class);
	280	+ value = method.invoke(config, key);
	281	+
	282	+ } catch (Throwable cause) {
	283	+ throw new ConfigurationException(bundle.getString("error-converting-to-type", fieldClass.getName()), cause);
	284	+ }
	285	+
	286	+ return value;
	287	+ }
266	288
267		- private <T> Object getBasic(String key, Class<T> fieldClass, org.apache.commons.configuration.Configuration config) {
	289	+ private <T> Object getBasic(String key, Field field, org.apache.commons.configuration.Configuration config) {
268	290	Object value = null;
269	291
	292	+ Class<?> fieldClass = (Class<?>) field.getType();
	293	+
270	294	try {
271	295	Method method;
272		- String methodName = "get" + Strings.firstToUpper(fieldClass.getSimpleName());
	296	+
	297	+ String methodName = "get";
	298	+
	299	+ methodName += discoveryGenericType(field);
	300	+
	301	+ methodName += Strings.firstToUpper(fieldClass.getSimpleName());
273	302
274	303	if (!fieldClass.isPrimitive()) {
275	304	method = config.getClass().getMethod(methodName, String.class, fieldClass);
276	305	value = method.invoke(config, key, null);
	306	+
277	307	} else if (config.containsKey(key)) {
278	308	method = config.getClass().getMethod(methodName, String.class);
279	309	value = method.invoke(config, key);
...	...	@@ -286,6 +316,36 @@ public class ConfigurationLoader implements Serializable {
286	316	return value;
287	317	}
288	318
	319	+ /**
	320	+ * Discovery the Generic's type.
	321	+ *
	322	+ * for example: the generic's type of List<Integer> list is an Integer type
	323	+ *
	324	+ * @param field
	325	+ * @return
	326	+ */
	327	+ private String discoveryGenericType(Field field) {
	328	+
	329	+ Type genericFieldType = field.getGenericType();
	330	+
	331	+ if(genericFieldType instanceof ParameterizedType){
	332	+ ParameterizedType type = (ParameterizedType) genericFieldType;
	333	+ Type[] fieldArgumentTypes = type.getActualTypeArguments();
	334	+ for(Type fieldArgumentType : fieldArgumentTypes){
	335	+ @SuppressWarnings("rawtypes")
	336	+ Class fieldArgumentClass = (Class) fieldArgumentType;
	337	+
	338	+ if("String".equals(fieldArgumentClass.getSimpleName())) {
	339	+ return "";
	340	+ }
	341	+
	342	+ return fieldArgumentClass.getSimpleName();
	343	+ }
	344	+ }
	345	+
	346	+ return "";
	347	+ }
	348	+
289	349	private Object getProperty(String key, org.apache.commons.configuration.Configuration config) {
290	350	Object value = null;
291	351
...	...
...	...	@@ -638,4 +638,4 @@
638	638	// assertEquals("All LowerCase", config.conventionAllLowerCase);
639	639	// }
640	640	//
641	641	-//}
	642	+//}
642	643	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,520 @@
	1	+/*
	2	+ * Demoiselle Framework
	3	+ * Copyright (C) 2010 SERPRO
	4	+ * ----------------------------------------------------------------------------
	5	+ * This file is part of Demoiselle Framework.
	6	+ *
	7	+ * Demoiselle Framework is free software; you can redistribute it and/or
	8	+ * modify it under the terms of the GNU Lesser General Public License version 3
	9	+ * as published by the Free Software Foundation.
	10	+ *
	11	+ * This program is distributed in the hope that it will be useful,
	12	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	+ * GNU General Public License for more details.
	15	+ *
	16	+ * You should have received a copy of the GNU Lesser General Public License version 3
	17	+ * along with this program; if not, see <http://www.gnu.org/licenses/>
	18	+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
	19	+ * Fifth Floor, Boston, MA 02110-1301, USA.
	20	+ * ----------------------------------------------------------------------------
	21	+ * Este arquivo é parte do Framework Demoiselle.
	22	+ *
	23	+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
	24	+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
	25	+ * do Software Livre (FSF).
	26	+ *
	27	+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
	28	+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
	29	+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
	30	+ * para maiores detalhes.
	31	+ *
	32	+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
	33	+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
	34	+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
	35	+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
	36	+ */
	37	+package br.gov.frameworkdemoiselle.internal.configuration;
	38	+
	39	+import static org.easymock.EasyMock.expect;
	40	+import static org.junit.Assert.assertEquals;
	41	+import static org.powermock.api.easymock.PowerMock.mockStatic;
	42	+
	43	+import java.awt.Color;
	44	+import java.math.BigDecimal;
	45	+import java.math.BigInteger;
	46	+import java.net.URL;
	47	+import java.util.Calendar;
	48	+import java.util.Date;
	49	+import java.util.GregorianCalendar;
	50	+import java.util.Locale;
	51	+
	52	+import org.junit.After;
	53	+import org.junit.Before;
	54	+import org.junit.Test;
	55	+import org.junit.runner.RunWith;
	56	+import org.powermock.api.easymock.PowerMock;
	57	+import org.powermock.core.classloader.annotations.PrepareForTest;
	58	+import org.powermock.modules.junit4.PowerMockRunner;
	59	+import org.powermock.reflect.Whitebox;
	60	+import org.slf4j.Logger;
	61	+
	62	+import br.gov.frameworkdemoiselle.configuration.ConfigType;
	63	+import br.gov.frameworkdemoiselle.configuration.Configuration;
	64	+import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
	65	+import br.gov.frameworkdemoiselle.util.ResourceBundle;
	66	+
	67	+@RunWith(PowerMockRunner.class)
	68	+@PrepareForTest(CoreBootstrap.class)
	69	+public class ConfigurationLoaderWithArrayTest {
	70	+
	71	+ private ConfigurationLoader configurationLoader;
	72	+
	73	+ @Configuration(type = ConfigType.PROPERTIES , resource = "configuration-with-array")
	74	+ public class ConfigurationPropertiesWithArray {
	75	+
	76	+ /*
	77	+ * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
	78	+ */
	79	+
	80	+ protected BigDecimal[] bigDecimalArray;
	81	+ protected BigInteger[] bigIntegerArray;
	82	+ protected boolean[] booleanArray;
	83	+ protected byte[] byteArray;
	84	+ protected Calendar[] calendarArray;
	85	+ protected Color[] colorArray;
	86	+ protected Date[] dateArray;
	87	+ protected double[] doubleArray;
	88	+ protected float[] floatArray;
	89	+ protected int[] integerArray;
	90	+ protected Locale[] localeArray;
	91	+ protected long[] longArray;
	92	+ protected short[] shortArray;
	93	+ protected URL[] urlArray;
	94	+ protected String[] stringArray;
	95	+
	96	+ }
	97	+
	98	+ @Configuration(type = ConfigType.XML, resource = "configuration-with-array")
	99	+ public class ConfigurationXMLWithArray {
	100	+
	101	+ /*
	102	+ * All methods supported by org.apache.commons.configuration.DataConfiguration class for array
	103	+ */
	104	+
	105	+ protected BigDecimal[] bigDecimalArray;
	106	+ protected BigInteger[] bigIntegerArray;
	107	+ protected boolean[] booleanArray;
	108	+ protected byte[] byteArray;
	109	+ protected Calendar[] calendarArray;
	110	+ protected Color[] colorArray;
	111	+ protected Date[] dateArray;
	112	+ protected double[] doubleArray;
	113	+ protected float[] floatArray;
	114	+ protected int[] integerArray;
	115	+ protected Locale[] localeArray;
	116	+ protected long[] longArray;
	117	+ protected short[] shortArray;
	118	+ protected URL[] urlArray;
	119	+ protected String[] stringArray;
	120	+
	121	+ }
	122	+
	123	+
	124	+ @Before
	125	+ public void setUp() throws Exception {
	126	+ Logger logger;
	127	+ ResourceBundle bundle;
	128	+ logger = PowerMock.createMock(Logger.class);
	129	+ bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
	130	+ configurationLoader = new ConfigurationLoader();
	131	+ Whitebox.setInternalState(this.configurationLoader, "bundle", bundle);
	132	+ Whitebox.setInternalState(this.configurationLoader, "logger", logger);
	133	+ }
	134	+
	135	+ @After
	136	+ public void tearDown() throws Exception {
	137	+ }
	138	+
	139	+ @Test
	140	+ public void testConfigurationPropertiesWithIntegerArray() {
	141	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	142	+
	143	+ Integer integerValue = config.integerArray[0];
	144	+
	145	+ assertEquals(Integer.class, integerValue.getClass());
	146	+ assertEquals(Integer.MAX_VALUE, integerValue.intValue());
	147	+ assertEquals(4, config.integerArray.length);
	148	+ }
	149	+
	150	+
	151	+ @Test
	152	+ public void testConfigurationPropertiesWithShortArray() {
	153	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	154	+
	155	+ Short shortValue = config.shortArray[0];
	156	+
	157	+ assertEquals(Short.class, shortValue.getClass());
	158	+ assertEquals(Short.MAX_VALUE, shortValue.shortValue());
	159	+ assertEquals(4, config.shortArray.length);
	160	+ }
	161	+
	162	+ @Test
	163	+ public void testConfigurationPropertiesWithByteArray() {
	164	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	165	+
	166	+ Byte byteValue = config.byteArray[0];
	167	+
	168	+ assertEquals(Byte.class, byteValue.getClass());
	169	+ assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
	170	+ assertEquals(8, config.byteArray.length);
	171	+ }
	172	+
	173	+ @Test
	174	+ public void testConfigurationPropertiesWithBooleanArray() {
	175	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	176	+
	177	+ Boolean booleanValue = config.booleanArray[0];
	178	+
	179	+ assertEquals(Boolean.class, booleanValue.getClass());
	180	+ assertEquals(2, config.booleanArray.length);
	181	+ }
	182	+
	183	+ @Test
	184	+ public void testConfigurationPropertiesWithLongArray() {
	185	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	186	+
	187	+ Long longValue = config.longArray[0];
	188	+
	189	+ assertEquals(Long.class, longValue.getClass());
	190	+ assertEquals(Long.MAX_VALUE, longValue.longValue());
	191	+ assertEquals(5, config.longArray.length);
	192	+ }
	193	+
	194	+ @Test
	195	+ public void testConfigurationPropertiesWithFloatArray() {
	196	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	197	+
	198	+ Float floatValue = config.floatArray[0];
	199	+
	200	+ assertEquals(Float.class, floatValue.getClass());
	201	+ assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
	202	+ assertEquals(5, config.floatArray.length);
	203	+ }
	204	+
	205	+ @Test
	206	+ public void testConfigurationPropertiesWithDoubleArray() {
	207	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	208	+
	209	+ Double doubleValue = config.doubleArray[0];
	210	+
	211	+ assertEquals(Double.class, doubleValue.getClass());
	212	+ assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
	213	+ assertEquals(3, config.doubleArray.length);
	214	+ }
	215	+
	216	+ @Test
	217	+ public void testConfigurationPropertiesWithBigDecimalArray() {
	218	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	219	+
	220	+ BigDecimal bigDecimalValue = config.bigDecimalArray[0];
	221	+
	222	+ assertEquals(BigDecimal.class, bigDecimalValue.getClass());
	223	+ assertEquals(3, config.bigDecimalArray.length);
	224	+ }
	225	+
	226	+ @Test
	227	+ public void testConfigurationPropertiesWithBigIntegerArray() {
	228	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	229	+
	230	+ BigInteger bigIntegerValue = config.bigIntegerArray[0];
	231	+
	232	+ assertEquals(BigInteger.class, bigIntegerValue.getClass());
	233	+ assertEquals(3, config.bigIntegerArray.length);
	234	+ }
	235	+
	236	+ @Test
	237	+ public void testConfigurationPropertiesWithCalendarArray() {
	238	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	239	+
	240	+ Calendar calendarValue = config.calendarArray[0];
	241	+
	242	+ GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
	243	+
	244	+ assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
	245	+ assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
	246	+ assertEquals(3, config.calendarArray.length);
	247	+ }
	248	+
	249	+ @Test
	250	+ public void testConfigurationPropertiesWithDateArray() {
	251	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	252	+
	253	+ Date dateValue = config.dateArray[0];
	254	+
	255	+ GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
	256	+
	257	+ Date date = new Date(calendar.getTimeInMillis());
	258	+
	259	+ assertEquals(Date.class, dateValue.getClass());
	260	+ assertEquals(date.getTime(), dateValue.getTime());
	261	+ assertEquals(3, config.dateArray.length);
	262	+ }
	263	+
	264	+ @Test
	265	+ public void testConfigurationPropertiesWithColorArray() {
	266	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	267	+
	268	+ Color colorValue = config.colorArray[0];
	269	+
	270	+ assertEquals(Color.class, colorValue.getClass());
	271	+ assertEquals(Color.gray, colorValue);
	272	+ assertEquals(3, config.colorArray.length);
	273	+ }
	274	+
	275	+ @Test
	276	+ public void testConfigurationPropertiesWithLocaleArray() {
	277	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	278	+
	279	+ Locale localeValue = config.localeArray[0];
	280	+ Locale localeValue2 = config.localeArray[1];
	281	+
	282	+ assertEquals(Locale.class, localeValue.getClass());
	283	+ assertEquals(Locale.ENGLISH, localeValue);
	284	+ assertEquals("BR", localeValue2.getCountry());
	285	+ assertEquals(3, config.localeArray.length);
	286	+ }
	287	+
	288	+ @Test
	289	+ public void testConfigurationPropertiesWithURLArray() {
	290	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	291	+
	292	+ URL urlValue = config.urlArray[0];
	293	+
	294	+ URL otherURL = null;
	295	+
	296	+ try {
	297	+ otherURL = new URL("http://www.test.com");
	298	+ }
	299	+ catch(Exception e) {
	300	+
	301	+ }
	302	+
	303	+ assertEquals(URL.class, urlValue.getClass());
	304	+ assertEquals(otherURL, urlValue);
	305	+ assertEquals(3, config.urlArray.length);
	306	+ }
	307	+
	308	+ @Test
	309	+ public void testConfigurationPropertiesWithStringArray() {
	310	+ ConfigurationPropertiesWithArray config = prepareConfigurationPropertiesWithArray();
	311	+
	312	+ String stringValue = config.stringArray[0];
	313	+
	314	+ assertEquals(String.class, stringValue.getClass());
	315	+ assertEquals("Test", stringValue);
	316	+ assertEquals(3, config.stringArray.length);
	317	+ }
	318	+
	319	+ private ConfigurationPropertiesWithArray prepareConfigurationPropertiesWithArray() {
	320	+ ConfigurationPropertiesWithArray config = new ConfigurationPropertiesWithArray();
	321	+
	322	+ mockStatic(CoreBootstrap.class);
	323	+ expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
	324	+ PowerMock.replay(CoreBootstrap.class);
	325	+
	326	+ configurationLoader.load(config);
	327	+ return config;
	328	+ }
	329	+
	330	+ @Test
	331	+ public void testConfigurationXMLWithIntegerArray() {
	332	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	333	+
	334	+ Integer integerValue = config.integerArray[0];
	335	+
	336	+ assertEquals(Integer.class, integerValue.getClass());
	337	+ assertEquals(Integer.MAX_VALUE, integerValue.intValue());
	338	+ assertEquals(4, config.integerArray.length);
	339	+ }
	340	+
	341	+
	342	+ @Test
	343	+ public void testConfigurationXMLWithShortArray() {
	344	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	345	+
	346	+ Short shortValue = config.shortArray[0];
	347	+
	348	+ assertEquals(Short.class, shortValue.getClass());
	349	+ assertEquals(Short.MAX_VALUE, shortValue.shortValue());
	350	+ assertEquals(4, config.shortArray.length);
	351	+ }
	352	+
	353	+ @Test
	354	+ public void testConfigurationXMLWithByteArray() {
	355	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	356	+
	357	+ Byte byteValue = config.byteArray[0];
	358	+
	359	+ assertEquals(Byte.class, byteValue.getClass());
	360	+ assertEquals(Byte.MAX_VALUE, byteValue.byteValue());
	361	+ assertEquals(8, config.byteArray.length);
	362	+ }
	363	+
	364	+ @Test
	365	+ public void testConfigurationXMLWithBooleanArray() {
	366	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	367	+
	368	+ Boolean booleanValue = config.booleanArray[0];
	369	+
	370	+ assertEquals(Boolean.class, booleanValue.getClass());
	371	+ assertEquals(2, config.booleanArray.length);
	372	+ }
	373	+
	374	+ @Test
	375	+ public void testConfigurationXMLWithLongArray() {
	376	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	377	+
	378	+ Long longValue = config.longArray[0];
	379	+
	380	+ assertEquals(Long.class, longValue.getClass());
	381	+ assertEquals(Long.MAX_VALUE, longValue.longValue());
	382	+ assertEquals(5, config.longArray.length);
	383	+ }
	384	+
	385	+ @Test
	386	+ public void testConfigurationXMLWithFloatArray() {
	387	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	388	+
	389	+ Float floatValue = config.floatArray[0];
	390	+
	391	+ assertEquals(Float.class, floatValue.getClass());
	392	+ assertEquals(Float.MAX_VALUE, floatValue.floatValue(), 1);
	393	+ assertEquals(5, config.floatArray.length);
	394	+ }
	395	+
	396	+ @Test
	397	+ public void testConfigurationXMLWithDoubleArray() {
	398	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	399	+
	400	+ Double doubleValue = config.doubleArray[0];
	401	+
	402	+ assertEquals(Double.class, doubleValue.getClass());
	403	+ assertEquals(Double.MAX_VALUE, doubleValue.doubleValue(), 1);
	404	+ assertEquals(3, config.doubleArray.length);
	405	+ }
	406	+
	407	+ @Test
	408	+ public void testConfigurationXMLWithBigDecimalArray() {
	409	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	410	+
	411	+ BigDecimal bigDecimalValue = config.bigDecimalArray[0];
	412	+
	413	+ assertEquals(BigDecimal.class, bigDecimalValue.getClass());
	414	+ assertEquals(3, config.bigDecimalArray.length);
	415	+ }
	416	+
	417	+ @Test
	418	+ public void testConfigurationXMLWithBigIntegerArray() {
	419	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	420	+
	421	+ BigInteger bigIntegerValue = config.bigIntegerArray[0];
	422	+
	423	+ assertEquals(BigInteger.class, bigIntegerValue.getClass());
	424	+ assertEquals(3, config.bigIntegerArray.length);
	425	+ }
	426	+
	427	+ @Test
	428	+ public void testConfigurationXMLWithCalendarArray() {
	429	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	430	+
	431	+ Calendar calendarValue = config.calendarArray[0];
	432	+
	433	+ GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.JUNE, 14, 10, 10);
	434	+
	435	+ assertEquals(Calendar.class, calendarValue.getClass().getSuperclass());
	436	+ assertEquals(calendar.getTimeInMillis(), calendarValue.getTimeInMillis());
	437	+ assertEquals(3, config.calendarArray.length);
	438	+ }
	439	+
	440	+ @Test
	441	+ public void testConfigurationXMLWithDateArray() {
	442	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	443	+
	444	+ Date dateValue = config.dateArray[0];
	445	+
	446	+ GregorianCalendar calendar = new GregorianCalendar(2012, Calendar.AUGUST, 14, 18, 10, 50);
	447	+
	448	+ Date date = new Date(calendar.getTimeInMillis());
	449	+
	450	+ assertEquals(Date.class, dateValue.getClass());
	451	+ assertEquals(date.getTime(), dateValue.getTime());
	452	+ assertEquals(3, config.dateArray.length);
	453	+ }
	454	+
	455	+ @Test
	456	+ public void testConfigurationXMLWithColorArray() {
	457	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	458	+
	459	+ Color colorValue = config.colorArray[0];
	460	+
	461	+ assertEquals(Color.class, colorValue.getClass());
	462	+ assertEquals(Color.gray, colorValue);
	463	+ assertEquals(3, config.colorArray.length);
	464	+ }
	465	+
	466	+ @Test
	467	+ public void testConfigurationXMLWithLocaleArray() {
	468	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	469	+
	470	+ Locale localeValue = config.localeArray[0];
	471	+ Locale localeValue2 = config.localeArray[1];
	472	+
	473	+ assertEquals(Locale.class, localeValue.getClass());
	474	+ assertEquals(Locale.ENGLISH, localeValue);
	475	+ assertEquals("BR", localeValue2.getCountry());
	476	+ assertEquals(3, config.localeArray.length);
	477	+ }
	478	+
	479	+ @Test
	480	+ public void testConfigurationXMLWithURLArray() {
	481	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	482	+
	483	+ URL urlValue = config.urlArray[0];
	484	+
	485	+ URL otherURL = null;
	486	+
	487	+ try {
	488	+ otherURL = new URL("http://www.test.com");
	489	+ }
	490	+ catch(Exception e) {
	491	+
	492	+ }
	493	+
	494	+ assertEquals(URL.class, urlValue.getClass());
	495	+ assertEquals(otherURL, urlValue);
	496	+ assertEquals(3, config.urlArray.length);
	497	+ }
	498	+
	499	+ @Test
	500	+ public void testConfigurationXMLWithStringArray() {
	501	+ ConfigurationXMLWithArray config = prepareConfigurationXMLWithArray();
	502	+
	503	+ String stringValue = config.stringArray[0];
	504	+
	505	+ assertEquals(String.class, stringValue.getClass());
	506	+ assertEquals("Test", stringValue);
	507	+ assertEquals(3, config.stringArray.length);
	508	+ }
	509	+
	510	+ private ConfigurationXMLWithArray prepareConfigurationXMLWithArray() {
	511	+ ConfigurationXMLWithArray config = new ConfigurationXMLWithArray();
	512	+
	513	+ mockStatic(CoreBootstrap.class);
	514	+ expect(CoreBootstrap.isAnnotatedType(config.getClass())).andReturn(true);
	515	+ PowerMock.replay(CoreBootstrap.class);
	516	+
	517	+ configurationLoader.load(config);
	518	+ return config;
	519	+ }
	520	+}
...	...